Changeset 8649 in ntrip for branches/BNC_2.12/src

Timestamp:

Mar 29, 2019, 1:19:51 PM (5 years ago)

Author:

stuerze

Message:

minor changes

File:

• branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp (modified) (2 diffs)

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

@@ -420 +420 @@
         eph->checkState() != t_eph::unhealthy &&
         eph->checkState() != t_eph::outdated) {
+      QMap<QString, double> codeBiases;
+      QList<phaseBiasSignal> phaseBiasList;
+      phaseBiasesSat pbSat;
+
+      while (true) {
+        QString key;
+        int numVal = 0;
+        in >> key;
+        if (in.status() != QTextStream::Ok) {
+          break;
+        }
+        if (key == "APC") {
+          in >> numVal;
+          rtnAPC.ReSize(3); rtnAPC = 0.0;
+          for (int ii = 0; ii < numVal; ii++) {
+            in >> rtnAPC[ii];
+          }
+        }
+        else if (key == "Ura") {
+          in >> numVal;
+          if (numVal == 1)
+            in >> rtnUra;
+        }
+        else if (key == "Clk") {
+          in >> numVal;
+          rtnClk.ReSize(3); rtnClk = 0.0;
+          for (int ii = 0; ii < numVal; ii++) {
+            in >> rtnClk[ii];
+          }
+        }
+        else if (key == "ClkSig") {
+          in >> numVal;
+          rtnClkSig.ReSize(3); rtnClkSig = 0.0;
+          for (int ii = 0; ii < numVal; ii++) {
+            in >> rtnClkSig[ii];
+          }
+        }
+        else if (key == "Vel") {
+          in >> numVal;
+          rtnVel.ReSize(3); rtnVel = 0.0;
+          for (int ii = 0; ii < numVal; ii++) {
+            in >> rtnVel[ii];
+          }
+        }
+        else if (key == "CoM") {
+          in >> numVal;
+          rtnCoM.ReSize(3); rtnCoM = 0.0;
+          for (int ii = 0; ii < numVal; ii++) {
+            in >> rtnCoM[ii];
+          }
+        }
+        else if (key == "CodeBias") {
+          in >> numVal;
+          for (int ii = 0; ii < numVal; ii++) {
+            QString type;
+            double value;
+            in >> type >> value;
+            codeBiases[type] = value;
+          }
+        }
+        else if (key == "YawAngle") {
+          in >> numVal >> pbSat.yawAngle;
+          if      (pbSat.yawAngle < 0.0) {
+            pbSat.yawAngle += (2*M_PI);
+          }
+          else if (pbSat.yawAngle > 2*M_PI) {
+            pbSat.yawAngle -= (2*M_PI);
+          }
+        }
+        else if (key == "YawRate") {
+          in >> numVal >> pbSat.yawRate;
+        }
+        else if (key == "PhaseBias") {
+          in >> numVal;
+          for (int ii = 0; ii < numVal; ii++) {
+            phaseBiasSignal pb;
+            in >> pb.type >> pb.bias >> pb.integerIndicator
+              >> pb.wlIndicator >> pb.discontinuityCounter;
+            phaseBiasList.append(pb);
+          }
+        }
+        else {
+          emit(newMessage("                      RTNET format error: "
+                          +  lines[ii].toAscii(), false));
+        }
+      }
 
       struct ClockOrbit::SatData* sd = 0;
-            if (prn.system() == 'G') {
+      if (prn.system() == 'G') {
         sd = co.Sat + co.NumberOfSat[CLOCKORBIT_SATGPS];
         ++co.NumberOfSat[CLOCKORBIT_SATGPS];
@@ -460 +546 @@
           sd->ID = prnStr.mid(1).toInt(); // to prevent G00, R00 entries
           sd->IOD = eph->IOD();
-        }
-      }
-
-      QMap<QString, double> codeBiases;
-      QList<phaseBiasSignal> phaseBiasList;
-      phaseBiasesSat pbSat;
-
-      while (true) {
-        QString key;
-        int numVal = 0;
-        in >> key;
-        if (in.status() != QTextStream::Ok) {
-          break;
-        }
-        if (key == "APC") {
-          in >> numVal;
-          rtnAPC.ReSize(3); rtnAPC = 0.0;
-          for (int ii = 0; ii < numVal; ii++) {
-            in >> rtnAPC[ii];
-          }
-        }
-        else if (key == "Ura") {
-          in >> numVal;
-          if (numVal == 1)
-            in >> rtnUra;
-        }
-        else if (key == "Clk") {
-          in >> numVal;
-          rtnClk.ReSize(3); rtnClk = 0.0;
-          for (int ii = 0; ii < numVal; ii++) {
-            in >> rtnClk[ii];
-          }
-        }
-        else if (key == "ClkSig") {
-          in >> numVal;
-          rtnClkSig.ReSize(3); rtnClkSig = 0.0;
-          for (int ii = 0; ii < numVal; ii++) {
-            in >> rtnClkSig[ii];
-          }
-        }
-        else if (key == "Vel") {
-          in >> numVal;
-          rtnVel.ReSize(3); rtnVel = 0.0;
-          for (int ii = 0; ii < numVal; ii++) {
-            in >> rtnVel[ii];
-          }
-        }
-        else if (key == "CoM") {
-          in >> numVal;
-          rtnCoM.ReSize(3); rtnCoM = 0.0;
-          for (int ii = 0; ii < numVal; ii++) {
-            in >> rtnCoM[ii];
-          }
-        }
-        else if (key == "CodeBias") {
-          in >> numVal;
-          for (int ii = 0; ii < numVal; ii++) {
-            QString type;
-            double value;
-            in >> type >> value;
-            codeBiases[type] = value;
-          }
-        }
-        else if (key == "YawAngle") {
-          in >> numVal >> pbSat.yawAngle;
-          if      (pbSat.yawAngle < 0.0) {
-            pbSat.yawAngle += (2*M_PI);
-          }
-          else if (pbSat.yawAngle > 2*M_PI) {
-            pbSat.yawAngle -= (2*M_PI);
-          }
-        }
-        else if (key == "YawRate") {
-          in >> numVal >> pbSat.yawRate;
-        }
-        else if (key == "PhaseBias") {
-          in >> numVal;
-          for (int ii = 0; ii < numVal; ii++) {
-            phaseBiasSignal pb;
-            in >> pb.type >> pb.bias >> pb.integerIndicator
-              >> pb.wlIndicator >> pb.discontinuityCounter;
-            phaseBiasList.append(pb);
-          }
-        }
-        else {
-          emit(newMessage("                      RTNET format error: "
-                          +  lines[ii].toAscii(), false));
         }
       }