Changeset 5121 in ntrip for trunk

Timestamp:

Apr 14, 2013, 6:44:43 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (3 diffs)
• bnccore.h (modified) (1 diff)
• combination/bnccomb.cpp (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -651 +651 @@
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
-  if (!_lastDumpCoSec.valid()) {
-    _lastDumpCoSec = coTime - 1.0;
+  if (!_lastCorrDumpTime.valid()) {
+    _lastCorrDumpTime = coTime - 1.0;
   }
 
   // An old correction - throw it away
   // ---------------------------------
-  if (_waitCoTime > 0.0 && coTime <= _lastDumpCoSec) {
+  if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime) {
     ///    if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
                       QString().sprintf(" %f sec",
-                      _lastDumpCoSec - coTime + _waitCoTime);
+                      _lastCorrDumpTime - coTime + _waitCoTime);
       messagePrivate(line.toAscii());
       emit( newMessage(line.toAscii(), true) );
@@ -675 +675 @@
     dumpCorrs();
   }
-  else if (coTime - _waitCoTime > _lastDumpCoSec) {
-    dumpCorrs(_lastDumpCoSec + 1, coTime - _waitCoTime);
-    _lastDumpCoSec = coTime - _waitCoTime;
+  else if (coTime - _waitCoTime > _lastCorrDumpTime) {
+    dumpCorrs(_lastCorrDumpTime + 1, coTime - _waitCoTime);
+    _lastCorrDumpTime = coTime - _waitCoTime;
   }
 }
@@ -684 +684 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) {
-  for (bncTime sec = minTime; sec <= maxTime; sec = sec + 1.0) {
-    QList<QString> allCorrs = _corrs->values(sec);
-    dumpCorrs(allCorrs);
-    _corrs->remove(sec);
+  QList<QString> allCorrs;
+  QMutableMapIterator<bncTime, QString> it(*_corrs);
+  while (it.hasNext()) {
+    it.next();
+    const bncTime& corrTime = it.key();
+    if (minTime <= corrTime && corrTime <= maxTime) {
+      allCorrs << it.value();
+      it.remove();
+    }
   }
 }

trunk/BNC/src/bnccore.h

@@ -127 +127 @@
     QList<QTcpSocket*>* _socketsNMEA;
     bncCaster*          _caster;
-    bncTime             _lastDumpCoSec;
+    bncTime             _lastCorrDumpTime;
     double              _waitCoTime;
     QMultiMap<bncTime, QString>* _corrs;

trunk/BNC/src/combination/bnccomb.cpp

@@ -339 +339 @@
   // ----------------------
   if (_resTime.valid() && newCorr->tClk <= _resTime) {
+    emit newMessage("bncComb: old correction: " + newCorr->prn.toAscii(), true);
     delete newCorr;
     return;