Changeset 3553 in ntrip

Timestamp:

Dec 23, 2011, 8:37:51 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (5 diffs)
• bnccomb.h (modified) (2 diffs)

trunk/BNC/combination/bnccomb.cpp

@@ -257 +257 @@
     delete _params[iPar-1];
   }
-  QListIterator<bncTime> itTime(_buffer.keys());
+  QListIterator<unsigned long> itTime(_buffer.keys());
   while (itTime.hasNext()) {
     _buffer.remove(itTime.next());
@@ -339 +339 @@
   // Process previous Epoch(s)
   // -------------------------
-  QListIterator<bncTime> itTime(_buffer.keys());
+  QListIterator<unsigned long> itTime(_buffer.keys());
   while (itTime.hasNext()) {
-    bncTime epoTime = itTime.next();
-    if (epoTime < newCorr->tt - moduloTime) {
-      _resTime = epoTime;
+    unsigned long epoTime = itTime.next();
+    if (epoTime < (newCorr->tt - moduloTime).longSec()) {
+      _resTime = _buffer[epoTime].tt();
       processEpoch();
     }
@@ -350 +350 @@
   // Merge or add the correction
   // ---------------------------
-  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt].corrs;
+  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt.longSec()].corrs;
   cmbCorr* existingCorr = 0;
   QVectorIterator<cmbCorr*> itCorr(corrs);
@@ -450 +450 @@
     if (_masterMissingEpochs < 10) {
       out << "Missing Master, Epoch skipped" << endl;
-      _buffer.remove(_resTime);
+      _buffer.remove(_resTime.longSec());
       emit newMessage(_log, false);
       return;
@@ -511 +511 @@
   // Delete Data, emit Message
   // -------------------------
-  _buffer.remove(_resTime);
+  _buffer.remove(_resTime.longSec());
   emit newMessage(_log, false);
 }

trunk/BNC/combination/bnccomb.h

@@ -73 +73 @@
       }
     }
+    bncTime tt() const {
+      if (corrs.size() > 0) {
+        return corrs[0]->tt;
+      }
+      else {
+        return bncTime();
+      }
+    }
     QVector<cmbCorr*> corrs;
   };
@@ -90 +98 @@
   t_irc checkOrbits(QTextStream& out);
 
-  QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
+  QVector<cmbCorr*>& corrs() {return _buffer[_resTime.longSec()].corrs;}
 
   QList<cmbAC*>           _ACs;
   bncTime                 _resTime;
   QVector<cmbParam*>      _params;
-  QMap<bncTime, cmbEpoch> _buffer;
+  QMap<unsigned long, cmbEpoch> _buffer;
   bncRtnetDecoder*        _rtnetDecoder;
   SymmetricMatrix         _QQ;