Changeset 6474 in ntrip for trunk

Timestamp:

Dec 28, 2014, 3:41:28 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3coDecoder.h (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -71 +71 @@
   _out = 0;
 
-  qRegisterMetaType<bncTime>("bncTime");
   qRegisterMetaType< QList<t_orbCorr> >("QList<t_orbCorr>");
   qRegisterMetaType< QList<t_clkCorr> >("QList<t_clkCorr>");
+  qRegisterMetaType< QList<t_satCodeBias> >("QList<t_satCodeBias>");
 
   connect(this, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
@@ -317 +317 @@
       frqCodeBias._rnxType2ch = codeTypeToRnxType(sysCh, biasEntry.Type);
       frqCodeBias._value      = biasEntry.Bias;
-      satCodeBias._bias.push_back(frqCodeBias);
+      if (!frqCodeBias._rnxType2ch.empty()) {
+        satCodeBias._bias.push_back(frqCodeBias);
+      }
     }
     codeBiases.push_back(satCodeBias);
@@ -340 +342 @@
       t_clkCorr::writeEpoch(_out, itClk.value());
       itClk.remove();
+    } 
+  }
+  QMutableMapIterator<bncTime, QList<t_satCodeBias> > itCB(_codeBiases);
+  while (itCB.hasNext()) {
+    itCB.next();
+    if (itCB.key() < _lastTime) {
+      emit newCodeBiases(itCB.value());
+      //      t_satCodeBias::writeEpoch(_out, itCB.value());
+      itCB.remove();
     } 
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -46 +46 @@
   void newOrbCorrections(QList<t_orbCorr>);
   void newClkCorrections(QList<t_clkCorr>);
+  void newCodeBiases(QList<t_satCodeBias>);
   void newMessage(QByteArray msg, bool showOnScreen);
   void providerIDChanged(QString staID);