Changeset 7008 in ntrip

Timestamp:

Jul 2, 2015, 5:43:53 PM (9 years ago)

Author:

stuerze

Message:

minor changes in combination

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (6 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -116 +116 @@
   }
   else if (type == offACSat) {
-    outStr = "Sat Offset " + AC + " " + prn;
+    outStr = "Sat Offset " + AC + " " + prn.mid(0,3);
   }
   else if (type == clkSat) {
-    outStr = "Clk Corr " + prn;
+    outStr = "Clk Corr " + prn.mid(0,3);
   }
 
@@ -196 +196 @@
       _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC->name, ""));
       for (unsigned iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
-        QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
+        QString prn = QString("G%1_0").arg(iGps, 2, 10, QChar('0'));
         _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
                                        AC->name, prn));
@@ -203 +203 @@
         _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC->name, ""));
         for (unsigned iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
-          QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
+          QString prn = QString("R%1_0").arg(iGlo, 2, 10, QChar('0'));
           _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
                                          AC->name, prn));
@@ -210 +210 @@
     }
     for (unsigned iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
-      QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
+      QString prn = QString("G%1_0").arg(iGps, 2, 10, QChar('0'));
       _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
     }
     if (_useGlonass) {
       for (unsigned iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
-        QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
+        QString prn = QString("R%1_0").arg(iGlo, 2, 10, QChar('0'));
         _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
       }
@@ -278 +278 @@
     t_orbCorr& orbCorr = orbCorrections[ii];
     QString    staID(orbCorr._staID.c_str());
-    QString    prn(orbCorr._prn.toString().c_str());
+    QString    prn(orbCorr._prn.toInternalString().c_str());
 
     // Find/Check the AC Name
@@ -350 +350 @@
     // --------------------
     if (_resTime.valid() && clkCorr._time <= _resTime) {
-      emit newMessage("bncComb: old correction: " + acName.toAscii() + " " + prn.toAscii(), true);
+      emit newMessage("bncComb: old correction: " + acName.toAscii() + " " + prn.mid(0,3).toAscii(), true);
       continue;
     }