Changeset 5129 in ntrip

Timestamp:

Apr 17, 2013, 9:44:33 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (5 diffs)

trunk/BNC/src/bnccore.cpp

@@ -658 +658 @@
   // ---------------------------------
   if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime) {
-    ///    if (!_bncComb) {
+    if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
                       QString().sprintf(" %f sec",
@@ -664 +664 @@
       messagePrivate(line.toAscii());
       emit( newMessage(line.toAscii(), true) );
-      ///    }
+    }
     return;
   }

trunk/BNC/src/combination/bnccomb.cpp

@@ -296 +296 @@
   newCorr->acName = acName;
   if (!newCorr->readLine(line) == success) {
-    ///    emit newMessage("bncComb: cannot read correction: " + staID.toAscii() + " " + line.toAscii(), true);
     delete newCorr;
     return;
@@ -333 +332 @@
   // -----------------
   if (int(newCorr->tClk.gpssec()) % _cmbSampl != 0.0) {
-    emit newMessage("bncComb: correction out of sampling rate "  + staID.toAscii() + " " + line.toAscii(), true);
     delete newCorr;
     return;
@@ -349 +347 @@
   //--------------------
   if (_eph.find(newCorr->prn) == _eph.end()) {
-    emit newMessage("bncComb: eph not found (1) "  + staID.toAscii() + " " + line.toAscii(), true);
+    emit newMessage("bncComb: eph not found "  + newCorr->prn.toAscii(), true);
     delete newCorr;
     return;
@@ -364 +362 @@
     }
     else {
-      emit newMessage("bncComb: eph not found (2) "  + staID.toAscii() + " " + line.toAscii(), true);
+      emit newMessage("bncComb: eph not found "  + newCorr->prn.toAscii() + 
+                      QString(" %1").arg(newCorr->iod).toAscii(), true);
       delete newCorr;
       return;
@@ -372 +371 @@
   // Process previous Epoch(s)
   // -------------------------
+  const double waitTime = 1.5 * _cmbSampl;
   QListIterator<bncTime> itTime(_buffer.keys());
   while (itTime.hasNext()) {
     bncTime epoTime = itTime.next();
-    if (epoTime < newCorr->tClk - _cmbSampl) {
+    if (epoTime < newCorr->tClk - waitTime) {
       _resTime = epoTime;
       processEpoch();