Changeset 6497 in ntrip for trunk

Timestamp:

Dec 29, 2014, 1:29:53 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (modified) (8 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -215 +215 @@
 void RTCM3coDecoder::sendResults() {
 
-  QList<t_orbCorr>&      orbCorrections = _orbCorrections[_lastTime];
-  QList<t_clkCorr>&      clkCorrections = _clkCorrections[_lastTime];
-  QList<t_satCodeBias>&  codeBiases     = _codeBiases[_lastTime];
-  QList<t_satPhaseBias>& phaseBiases    = _phaseBiases[_lastTime];
-  t_vTec&                vTec           = _vTecMap[_lastTime];
-
   // Orbit and clock corrections of all satellites
   // ---------------------------------------------
@@ -255 +249 @@
       orbCorr._dotXr[2] = _clkOrb.Sat[ii].Orbit.DotDeltaCrossTrack;
 
-      orbCorrections.push_back(orbCorr);
+      _orbCorrections[_lastTime].push_back(orbCorr);
 
       _IODs[orbCorr._prn] = _clkOrb.Sat[ii].IOD;
@@ -279 +273 @@
       if (_IODs.contains(clkCorr._prn)) {
         clkCorr._iod = _IODs[clkCorr._prn];
-        clkCorrections.push_back(clkCorr);
+        _clkCorrections[_lastTime].push_back(clkCorr);
       }
     }
@@ -296 +290 @@
         if (_IODs.contains(clkCorr._prn)) {
           clkCorr._iod = _IODs[clkCorr._prn];
-          clkCorrections.push_back(clkCorr);
+          _clkCorrections[_lastTime].push_back(clkCorr);
         }
       }
@@ -328 +322 @@
       }
     }
-    codeBiases.push_back(satCodeBias);
+    _codeBiases[_lastTime].push_back(satCodeBias);
   }
 
@@ -362 +356 @@
       }
     }
-    phaseBiases.push_back(satPhaseBias);
+    _phaseBiases[_lastTime].push_back(satPhaseBias);
   }
 
@@ -368 +362 @@
   // -----------------
   if (_vTEC.NumLayers > 0) {
-    vTec._time  = _lastTime;
-    vTec._staID = _staID.toAscii().data();
+    _vTecMap[_lastTime]._time  = _lastTime;
+    _vTecMap[_lastTime]._staID = _staID.toAscii().data();
     for (unsigned ii = 0; ii < _vTEC.NumLayers; ii++) {
       const VTEC::IonoLayers& ionoLayer = _vTEC.Layers[ii];
@@ -382 +376 @@
         }
       }
-      vTec._layers.push_back(layer);
-    }
-  }
-
-  // Remove Empty Lists
-  // ------------------
-  if (orbCorrections.size() == 0) {
-    _orbCorrections.remove(_lastTime);
-  }
-  if (clkCorrections.size() == 0) {
-    _clkCorrections.remove(_lastTime);
-  }
-  if (codeBiases.size() == 0) {
-    _codeBiases.remove(_lastTime);
-  }
-  if (phaseBiases.size() == 0) {
-    _phaseBiases.remove(_lastTime);
-  }
-  if (vTec._layers.size() == 0) {
-    _vTecMap.remove(_lastTime);
+      _vTecMap[_lastTime]._layers.push_back(layer);
+    }
   }