Changeset 8272 in ntrip for branches

Timestamp:

Feb 5, 2018, 11:25:25 AM (7 years ago)

Author:

stuerze

Message:

a small bug regarding latency checker should be solved now

Location:

branches/BNC_2.12/src

Files:

• bncgetthread.h (modified) (1 diff)
• latencychecker.cpp (modified) (6 diffs)

branches/BNC_2.12/src/bncgetthread.h

@@ -137 +137 @@
    t_serialNMEA               _serialNMEA;
    bool                       _rawOutput;
+   bool                       _latencycheck;
    QMap<QString, long>        _prnLastEpo;
    QMap<char, QVector<QString> > _rnxTypes;

branches/BNC_2.12/src/latencychecker.cpp

@@ -321 +321 @@
 
   if (_miscIntr > 0 ) {
-    t_latency& l = _lObs; l._type =  "Observations";
+    t_latency& l = _lObs; 
+    l._type =  "Observations";
     QListIterator<t_satObs> it(obsList);
     while (it.hasNext()) {
@@ -393 +394 @@
         }
         l._numLat += 1;
-        l._oldSec    = l._newSec;
         l._followSec = true;
       }
+      l._oldSec    = l._newSec;
     }
     _lObs = l;
@@ -440 +441 @@
   if (_miscIntr > 0) {
     l._newSec = corrGPSEpochTime;
-    int week;
-    double sec;
-    currentGPSWeeks(week, sec);
-    double dt = fabs(sec - l._newSec);
-    const double secPerWeek = 7.0 * 24.0 * 3600.0;
-    if (dt > 0.5 * secPerWeek) {
-      if (sec > l._newSec) {
-        sec  -= secPerWeek;
-      } else {
-        sec  += secPerWeek;
-      }
-    }
     if (l._newSec > l._oldSec) {
       if (int(l._newSec) % _miscIntr < int(l._oldSec) % _miscIntr) {
@@ -494 +483 @@
         }
       }
+
+      // Compute the observations latency
+      // --------------------------------      
+      int week;
+      double sec;
+      currentGPSWeeks(week, sec);
+      double dt = fabs(sec - l._newSec);
+      const double secPerWeek = 7.0 * 24.0 * 3600.0;
+      if (dt > 0.5 * secPerWeek) {
+        if (sec > l._newSec) {
+          sec  -= secPerWeek;
+        } else {
+          sec  += secPerWeek;
+        }
+      }
       l._curLat   = sec - l._newSec;
       l._sumLat  += l._curLat;
@@ -504 +508 @@
       }
       l._numLat += 1;
-      l._oldSec = l._newSec;
       l._followSec = true;
       setCurrentLatency(l._curLat);
+    }
+    l._oldSec = l._newSec;
     }
     switch (type) {
@@ -534 +539 @@
          break;
      }
-  }
 }