Changeset 6876 in ntrip

Timestamp:

Jun 2, 2015, 6:21:50 PM (9 years ago)

Author:

stuerze

Message:

some fixes (not all) in rtnetupload interface

File:

• trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (modified) (22 diffs)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -356 +356 @@
   for (int ii = 1; ii < lines.size(); ii++) {
 
-    QString      prn;  // prn or key VTEC, IND (phase bias indicators)
+    QString      key;  // prn or key VTEC, IND (phase bias indicators)
     ColumnVector rtnAPC;
     ColumnVector rtnVel;
     ColumnVector rtnCoM;
     double       rtnClk;
+    t_prn        prn;
 
     QTextStream in(lines[ii].toAscii());
 
-    in >> prn;
+    in >> key;
 
     // non-satellite specific parameters
-    if      (prn.contains("IND", Qt::CaseSensitive)) {
+    if      (key.contains("IND", Qt::CaseSensitive)) {
       in >> dispInd >> mwInd;
       continue;
     }
-    if (prn.contains("VTEC", Qt::CaseSensitive)) {
+    if (key.contains("VTEC", Qt::CaseSensitive)) {
       in >> vtec.UpdateInterval >> vtec.NumLayers;
       for (unsigned ll = 0; ll < vtec.NumLayers; ll++) {
@@ -393 +394 @@
       continue;
     }
-
-    const t_eph* ephLast = _ephUser->ephLast(prn);
-    const t_eph* ephPrev = _ephUser->ephPrev(prn);
+    char sys   = key.mid(0,1).at(0).toAscii();
+    int number = key.mid(1,2).toInt();
+    int flags  = 0;
+    if (sys == 'E') { flags = 1;} // I/NAV
+    prn.set(sys, number, flags);
+    QString prnInternalStr = QString::fromStdString(prn.toInternalString());
+    QString prnStr         = QString::fromStdString(prn.toString());
+    const t_eph* ephLast = _ephUser->ephLast(prnInternalStr);
+    const t_eph* ephPrev = _ephUser->ephPrev(prnInternalStr);
     const t_eph* eph     = ephLast;
 
@@ -412 +419 @@
       if (_usedEph) {
         if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
-          (*_usedEph)[prn] = eph;
+          (*_usedEph)[prnInternalStr] = eph;
         }
         else {
           eph = 0;
-          if (_usedEph->contains(prn)) {
-            const t_eph* usedEph = _usedEph->value(prn);
+          if (_usedEph->contains(prnInternalStr)) {
+            const t_eph* usedEph = _usedEph->value(prnInternalStr);
             if      (usedEph == ephLast) {
               eph = ephLast;
@@ -501 +508 @@
 
       struct ClockOrbit::SatData* sd = 0;
-      if      (prn[0] == 'G') {
+      if      (prn.system() == 'G') {
         sd = co.Sat + co.NumberOfSat[CLOCKORBIT_SATGPS];
         ++co.NumberOfSat[CLOCKORBIT_SATGPS];
       }
-      else if (prn[0] == 'R') {
+      else if (prn.system() == 'R') {
         sd = co.Sat + CLOCKORBIT_NUMGPS
             + co.NumberOfSat[CLOCKORBIT_SATGLONASS];
         ++co.NumberOfSat[CLOCKORBIT_SATGLONASS];
       }
-      else if (prn[0] == 'E') {
+      else if (prn.system() == 'E') {
         sd = co.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
             + co.NumberOfSat[CLOCKORBIT_SATGALILEO];
         ++co.NumberOfSat[CLOCKORBIT_SATGALILEO];
       }
-      else if (prn[0] == 'J') {
+      else if (prn.system() == 'J') {
         sd = co.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + co.NumberOfSat[CLOCKORBIT_SATQZSS];
         ++co.NumberOfSat[CLOCKORBIT_SATQZSS];
       }
-      else if (prn[0] == 'S') {
+      else if (prn.system() == 'S') {
         sd = co.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS
@@ -526 +533 @@
         ++co.NumberOfSat[CLOCKORBIT_SATSBAS];
       }
-      else if (prn[0] == 'C') {
+      else if (prn.system() == 'C') {
         sd = co.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS
@@ -534 +541 @@
       if (sd) {
         QString outLine;
-        processSatellite(eph, epoTime.gpsw(), epoTime.gpssec(), prn,
+        processSatellite(eph, epoTime.gpsw(), epoTime.gpssec(), prnStr,
                          rtnAPC, rtnClk, rtnVel, rtnCoM, sd, outLine);
       }
@@ -541 +548 @@
       // -----------
       struct CodeBias::BiasSat* biasSat = 0;
-      if      (prn[0] == 'G') {
+      if      (prn.system() == 'G') {
         biasSat = bias.Sat + bias.NumberOfSat[CLOCKORBIT_SATGPS];
         ++bias.NumberOfSat[CLOCKORBIT_SATGPS];
       }
-      else if (prn[0] == 'R') {
+      else if (prn.system() == 'R') {
         biasSat = bias.Sat + CLOCKORBIT_NUMGPS
             + bias.NumberOfSat[CLOCKORBIT_SATGLONASS];
         ++bias.NumberOfSat[CLOCKORBIT_SATGLONASS];
       }
-      else if (prn[0] == 'E') {
+      else if (prn.system() == 'E') {
         biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
             + bias.NumberOfSat[CLOCKORBIT_SATGALILEO];
         ++bias.NumberOfSat[CLOCKORBIT_SATGALILEO];
       }
-      else if (prn[0] == 'J') {
+      else if (prn.system() == 'J') {
         biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + bias.NumberOfSat[CLOCKORBIT_SATQZSS];
         ++bias.NumberOfSat[CLOCKORBIT_SATQZSS];
       }
-      else if (prn[0] == 'S') {
+      else if (prn.system() == 'S') {
         biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS
@@ -566 +573 @@
         ++bias.NumberOfSat[CLOCKORBIT_SATSBAS];
       }
-      else if (prn[0] == 'C') {
+      else if (prn.system() == 'C') {
         biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS
@@ -574 +581 @@
 
       if (biasSat) {
-        biasSat->ID = prn.mid(1).toInt();
+        biasSat->ID = prn.number();
         biasSat->NumberOfCodeBiases = 0;
-        if      (prn[0] == 'G') {
+        if      (prn.system() == 'G') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -660 +667 @@
           }
         }
-        else if (prn[0] == 'R') {
+        else if (prn.system() == 'R') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -690 +697 @@
           }
         }
-        else if (prn[0] == 'E') {
+        else if (prn.system() == 'E') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -768 +775 @@
           }
         }
-        else if (prn[0] == 'J') {
+        else if (prn.system() == 'J') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -852 +859 @@
           }
         }
-        else if (prn[0] == 'S') {
+        else if (prn.system() == 'S') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -882 +889 @@
           }
         }
-        else if (prn[0] == 'C') {
+        else if (prn.system() == 'C') {
           QMapIterator<QString, double> it(codeBiases);
           while (it.hasNext()) {
@@ -946 +953 @@
       // ------------
       struct PhaseBias::PhaseBiasSat* phasebiasSat = 0;
-      if      (prn[0] == 'G') {
+      if      (prn.system() == 'G') {
         phasebiasSat = phasebias.Sat + phasebias.NumberOfSat[CLOCKORBIT_SATGPS];
         ++phasebias.NumberOfSat[CLOCKORBIT_SATGPS];
       }
-      else if (prn[0] == 'R') {
+      else if (prn.system() == 'R') {
         phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS
             + phasebias.NumberOfSat[CLOCKORBIT_SATGLONASS];
         ++phasebias.NumberOfSat[CLOCKORBIT_SATGLONASS];
       }
-      else if (prn[0] == 'E') {
+      else if (prn.system() == 'E') {
         phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
             + phasebias.NumberOfSat[CLOCKORBIT_SATGALILEO];
         ++phasebias.NumberOfSat[CLOCKORBIT_SATGALILEO];
       }
-      else if (prn[0] == 'J') {
+      else if (prn.system() == 'J') {
         phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + phasebias.NumberOfSat[CLOCKORBIT_SATQZSS];
         ++phasebias.NumberOfSat[CLOCKORBIT_SATQZSS];
       }
-      else if (prn[0] == 'S') {
+      else if (prn.system() == 'S') {
         phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS
@@ -971 +978 @@
         ++phasebias.NumberOfSat[CLOCKORBIT_SATSBAS];
       }
-      else if (prn[0] == 'C') {
+      else if (prn.system() == 'C') {
         phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
             + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS
@@ -981 +988 @@
         phasebias.DispersiveBiasConsistencyIndicator = dispInd;
         phasebias.MWConsistencyIndicator = mwInd;
-        phasebiasSat->ID = prn.mid(1).toInt();
+        phasebiasSat->ID = prn.number();
         phasebiasSat->NumberOfPhaseBiases = 0;
         phasebiasSat->YawAngle = pbSat.yA;
         phasebiasSat->YawRate = pbSat.yR;
-        if      (prn[0] == 'G') {
+        if      (prn.system() == 'G') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {
@@ -1108 +1115 @@
           }
         }
-        if      (prn[0] == 'R') {
+        if      (prn.system() == 'R') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {
@@ -1150 +1157 @@
           }
         }
-        if      (prn[0] == 'E') {
+        if      (prn.system() == 'E') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {
@@ -1264 +1271 @@
           }
         }
-        if      (prn[0] == 'J') {
+        if      (prn.system() == 'J') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {
@@ -1387 +1394 @@
           }
         }
-        if      (prn[0] == 'S') {
+        if      (prn.system() == 'S') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {
@@ -1429 +1436 @@
           }
         }
-        if      (prn[0] == 'C') {
+        if      (prn.system() == 'C') {
           QListIterator<phaseBiasSignal> it(phaseBiasList);
           while (it.hasNext()) {