Changeset 3299 in ntrip for trunk/BNC/combination

Timestamp:

Jun 16, 2011, 5:11:50 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -225 +225 @@
   }
 
-  // Reject delayed corrections
-  // --------------------------
-  if (_processedBeforeTime.valid() && newCorr->tt < _processedBeforeTime) {
+  // Remember last correction time
+  // -----------------------------
+  if (!_lastCorrTime.valid() || _lastCorrTime < newCorr->tt) {
+    _lastCorrTime = newCorr->tt;
+  }
+
+  bncTime processTime = _lastCorrTime - 1.5 * moduloTime;
+
+  // Delete old corrections
+  // ----------------------
+  if (newCorr->tt < processTime) {
     delete newCorr;
     return;
@@ -255 +263 @@
   // Process all older Epochs (if there are any)
   // -------------------------------------------
-  const double waitTime = moduloTime;
-  _processedBeforeTime = newCorr->tt - waitTime;
-
   QList<cmbEpoch*> epochsToProcess;
-
   QMapIterator<QString, cmbAC*> itAC(_ACs);
   while (itAC.hasNext()) {
     itAC.next();
     cmbAC* AC = itAC.value();
-
     QMutableListIterator<cmbEpoch*> itEpo(AC->epochs);
     while (itEpo.hasNext()) {
       cmbEpoch* epoch = itEpo.next();
-      if (epoch->time < _processedBeforeTime) {
+      if (epoch->time <= processTime) {
         epochsToProcess.append(epoch);
         itEpo.remove();

trunk/BNC/combination/bnccomb.h

@@ -79 +79 @@
 
   QMap<QString, cmbAC*> _ACs;   // Analytical Centers (key is mountpoint)
-  bncTime               _processedBeforeTime;
+  bncTime               _lastCorrTime;
   QVector<cmbParam*>    _params;
   bncRtnetDecoder*      _rtnetDecoder;