Changeset 5387 in ntrip for trunk/BNC

Timestamp:

Sep 8, 2013, 7:12:20 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (2 diffs)
• bnccore.h (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -657 +657 @@
   // First time, set the _lastCorrDumpTime
   // -------------------------------------
-  if (!_lastCorrDumpTime.valid()) {
-    _lastCorrDumpTime = coTime - 1.0;
+  if (!_lastCorrDumpTime[staID].valid()) {
+    _lastCorrDumpTime[staID] = coTime - 1.0;
   }
 
   // An old correction - throw it away
   // ---------------------------------
-  if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime) {
+  if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime[staID]) {
     if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
                       QString().sprintf(" %f sec",
-                      _lastCorrDumpTime - coTime + _waitCoTime);
+                      _lastCorrDumpTime[staID] - coTime + _waitCoTime);
       messagePrivate(line.toAscii());
       emit( newMessage(line.toAscii(), true) );
@@ -681 +681 @@
     dumpCorrs();
   }
-  else if (coTime - _waitCoTime > _lastCorrDumpTime) {
-    dumpCorrs(_lastCorrDumpTime + 1, coTime - _waitCoTime);
-    _lastCorrDumpTime = coTime - _waitCoTime;
+  else if (coTime - _waitCoTime > _lastCorrDumpTime[staID]) {
+    dumpCorrs(_lastCorrDumpTime[staID] + 1, coTime - _waitCoTime);
+    _lastCorrDumpTime[staID] = coTime - _waitCoTime;
   }
 }

trunk/BNC/src/bnccore.h

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