Changeset 8373 in ntrip for branches/BNC_2.12

Timestamp:

Jun 13, 2018, 2:46:20 PM (6 years ago)

Author:

stuerze

Message:

minor changes to allow 10 Hz observation data processing (latency checker) and resampling (RINEX files, feed engine)

Location:

branches/BNC_2.12/src

Files:

• GPSDecoder.cpp (modified) (2 diffs)
• bnccaster.cpp (modified) (1 diff)
• bnctime.cpp (modified) (3 diffs)
• latencychecker.cpp (modified) (1 diff)
• rinex/reqcedit.cpp (modified) (1 diff)

branches/BNC_2.12/src/GPSDecoder.cpp

@@ -45 +45 @@
 #include "bncsettings.h"
 #include "bncrinex.h"
+#include "bncutils.h"
 
 using namespace std;
@@ -80 +81 @@
 void GPSDecoder::dumpRinexEpoch(const t_satObs& obs, const QByteArray& format) {
   if (_rnx) {
-    long iSec    = long(floor(obs._time.gpssec()+0.5));
-    if (_rnx->samplingRate() == 0 || iSec % _rnx->samplingRate() == 0) {
+    int sec = int(nint(obs._time.gpssec()*10));
+    if (_rnx->samplingRate() == 0 || sec % (_rnx->samplingRate()*10) == 0) {
       _rnx->deepCopy(obs);
     }

branches/BNC_2.12/src/bnccaster.cpp

@@ -303 +303 @@
     if (epoTime <= maxTime) {
       const QList<t_satObs>& allObs = itEpo.value();
-      int sec = int(nint(epoTime.gpssec()));
-      if ( (_out || _sockets) && (_samplingRate == 0 || sec % _samplingRate == 0) ) {
-
+      int sec = int(nint(epoTime.gpssec()*10));
+      if ( (_out || _sockets) && (_samplingRate == 0 || sec % (_samplingRate*10) == 0) ) {
         QListIterator<t_satObs> it(allObs);
         bool firstObs = true;

branches/BNC_2.12/src/bnctime.cpp

@@ -37 +37 @@
   int  deltad;
   int  dow = 0;
-  while ( gpssec >= 86400 ) {
-    gpssec-=86400;
+  while ( gpssec >= 86400.0 ) {
+    gpssec-=86400.0;
     dow++;
   }
-  while ( gpssec <  0 ) {
-    gpssec+=86400;
+  while ( gpssec <  0.0 ) {
+    gpssec+=86400.0;
     dow--;
   }
@@ -59 +59 @@
   gpssec += 14.0;
   gpsw   += 1356.0;
-  while ( gpssec >= 86400 ) {
-    gpssec-=86400;
+  while ( gpssec >= 86400.0 ) {
+    gpssec-=86400.0;
     dow++;
   }
-  while ( gpssec <  0 ) {
-    gpssec+=86400;
+  while ( gpssec <  0.0 ) {
+    gpssec+=86400.0;
     dow--;
   }
@@ -142 +142 @@
   _sec = daysec;
   _mjd = mjd;
-  while ( _sec >= 86400 ) {
-    _sec-=86400;
+  while ( _sec >= 86400.0 ) {
+    _sec-=86400.0;
     _mjd++;
   }
-  while ( _sec <  0 ) {
-    _sec+=86400;
+  while ( _sec <  0.0 ) {
+    _sec+=86400.0;
     _mjd--;
   }

branches/BNC_2.12/src/latencychecker.cpp

@@ -327 +327 @@
       const t_satObs& obs = it.next();
       bool wrongObservationEpoch = checkForWrongObsEpoch(obs._time);
-      l._newSec = static_cast<int>(obs._time.gpssec());
+      l._newSec = static_cast<int>(nint(obs._time.gpssec()*10));
       if (l._newSec > l._oldSec && !wrongObservationEpoch) {
-        if (l._newSec % _miscIntr < l._oldSec % _miscIntr) {
+        if (l._newSec % _miscIntr < l._oldSec % (_miscIntr * 10)) {
+ 
           if (l._numLat > 0) {
             if (l._meanDiff > 0.0) {

branches/BNC_2.12/src/rinex/reqcedit.cpp

@@ -336 +336 @@
         }
 
-        if (_samplingRate == 0 ||
-            fmod(round(epo->tt.gpssec()), _samplingRate) == 0) {
+        int sec = int(nint(epo->tt.gpssec()*10));
+        if (_samplingRate == 0 || sec % (_samplingRate*10) == 0) {
           applyLLI(obsFile, epo);
           outObsFile.writeEpoch(epo);