Changeset 8510 in ntrip for trunk

Timestamp:

Oct 23, 2018, 5:44:54 PM (6 years ago)

Author:

stuerze

Message:

minor changes

File:

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

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -424 +424 @@
 
       while (true) {
-        rtnClk.ReSize(3);
-        for (int ii = 0; ii < 3; ii++) {
-          rtnClk[ii] = 0.0;
-        }
-        rtnClkSig.ReSize(3);
-        for (int ii = 0; ii < 3; ii++) {
-          rtnClkSig[ii] = 0.0;
-        }
-        rtnVel.ReSize(3);
-        rtnCoM.ReSize(3);
         QString key;
         int numVal = 0;
@@ -453 +443 @@
         }
         else if (key == "Clk") {
+          rtnClk.ReSize(3);
+          for (int ii = 0; ii < 3; ii++) {
+            rtnClk[ii] = 0.0;
+          }
           in >> numVal;
           for (int ii = 0; ii < numVal; ii++) {
@@ -459 +453 @@
         }
         else if (key == "ClkSig") {
+          rtnClkSig.ReSize(3);
+          for (int ii = 0; ii < 3; ii++) {
+            rtnClkSig[ii] = 0.0;
+          }
           in >> numVal;
           for (int ii = 0; ii < numVal; ii++) {
@@ -465 +463 @@
         }
         else if (key == "Vel") {
+          rtnVel.ReSize(3);
           in >> numVal;
           for (int ii = 0; ii < numVal; ii++) {
@@ -471 +470 @@
         }
         else if (key == "CoM") {
+          rtnCoM.ReSize(3);
           in >> numVal;
           for (int ii = 0; ii < numVal; ii++) {
@@ -2338 +2338 @@
 
   if (_rnx) {
-    double clkRnxSig     = rtnClkSig[0] / t_CST::c;           // [s]
-    double clkRnxRateSig = rtnClkSig[1] / t_CST::c;           // [s/s = -]
-    double clkRnxAccSig  = rtnClkSig[2] / t_CST::c;           // [s/s² ) -/s]
+    double clkRnxSig, clkRnxRateSig, clkRnxAccSig;
+    int s = rtnClkSig.size();
+    switch (s) {
+      case 1:
+        clkRnxSig     = rtnClkSig[0] / t_CST::c;    // [s]
+        clkRnxRateSig = 0.0;                        // [s/s = -]
+        clkRnxAccSig  = 0.0;                        // [s/s² ) -/s]
+        break;
+      case 2:
+        clkRnxSig     = rtnClkSig[0] / t_CST::c;     // [s]
+        clkRnxRateSig = rtnClkSig[1] / t_CST::c;     // [s/s = -]
+        clkRnxAccSig  = 0.0;                         // [s/s² ) -/s]
+        break;
+      case 3:
+        clkRnxSig     = rtnClkSig[0] / t_CST::c;     // [s]
+        clkRnxRateSig = rtnClkSig[1] / t_CST::c;     // [s/s = -]
+        clkRnxAccSig  = rtnClkSig[2] / t_CST::c;     // [s/s² ) -/s]
+        break;
+    }
     _rnx->write(GPSweek, GPSweeks, prn, clkRnx, clkRnxRate, clkRnxAcc,
                 clkRnxSig, clkRnxRateSig, clkRnxAccSig);