Changeset 10888 in ntrip for trunk/BNC/src/orbComp/sp3Comp.cpp

Timestamp:

Apr 16, 2026, 10:16:16 PM (4 days ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/orbComp/sp3Comp.cpp (modified) (5 diffs)

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -225 +225 @@
     for (map<t_prn, double>::iterator it = dc.begin(); it != dc.end(); it++) {
       const t_prn& prn = it->first;
-      stringstream all;
-      if (prn.system() == 'C') {
-        if (prn.number() <= 16) {
-          all << "C-2";
-        }
-        else {
-          all << "C-3";
-        }
-      } else {
-        all << prn.system();
-      }
+      stringstream all; all << prn.system();
+      (prn.system() == 'C' && prn.number() <= 16) ?
+          all << 98 : all << 99;
       if (satIndex(clkSats, prn) != -1) {
         int  index = epochs.size() + satIndex(clkSats, prn);
@@ -388 +380 @@
     for (map<t_prn, ColumnVector>::const_iterator it = dr.begin(); it != dr.end(); it++) {
       const t_prn&  prn = it->first;
-      stringstream all;
-      if (prn.system() == 'C') {
-        if (prn.number() <= 16) {
-          all << "C-2";
-        }
-        else {
-          all << "C-3";
-        }
-      } else {
-        all << prn.system();
-      }
-
+      stringstream all; all << prn.system();
+      (prn.system() == 'C' && prn.number() <= 16) ?
+          all << 98 : all << 99;
       if (!excludeSat(prn)) {
         const ColumnVector& rao = it->second;
@@ -451 +434 @@
     const string& prn  = it->first;
     t_stat&       stat = it->second;
-    stringstream all;
-    if (prn[0] == 'C') {
-      int num = stoi(prn.substr(1,2));
-      if (num <= 16) {
-        all << "C-2";
-      }
-      else {
-        all << "C-3";
-      }
-    } else {
-      all << prn[0];
-    }
+    char sys = prn[0];
+    int  num = stoi(prn.substr(1,2));
+    stringstream all; all << sys;
+    if (num >= 98)  {
+      all << num;
+    }
+    else {
+      if (sys == 'C' &&  num <= 16) {
+          all << 98;
+        }
+        else {
+          all << 99;
+        }
+    }
+
     if (stat._nr > 0) {
       stat._rao[0] = sqrt(stat._rao[0] / stat._nr);
@@ -474 +460 @@
       }
       else {
-        (_summaryOnly) ? out << "     "    << QString("%1").arg(all.str().c_str(),3,' ').toStdString().c_str() << " ":
-                         out << "!     "  <<  QString("%1").arg(all.str().c_str(),3,' ').toStdString().c_str() << " ";
+        QString sys;
+        if (all.str() == "C98") {
+          sys = "C-2";
+        }
+        if (all.str() == "C99") {
+          sys = "C-3";
+        }
+        if (all.str()[0] != 'C') {
+          sys = all.str()[0];
+        }
+        (_summaryOnly) ? out << "     "    << QString("%1").arg(sys,3,' ').toStdString().c_str() << " ":
+                         out << "!     "  <<  QString("%1").arg(sys,3,' ').toStdString().c_str() << " ";
       }
       out << setw(10) << setprecision(1) << stat._rao[0]   * 1e3 << ' '
@@ -491 +487 @@
             << setw(10) << setprecision(2) << stat._dcRedSig / t_CST::c * 1e9 << ' '
             << setw( 9) << stat._nc << " ";
-        if (prn != "G" && prn != "R" && prn != "E" && prn != "C-2" &&  prn != "C-3") {
+        if (prn != "G99" && prn != "R99" && prn != "E99" && prn != "C98" &&  prn != "C99") {
           out << setw( 9) << setprecision(2) << stat._offset / t_CST::c * 1e9;
         }