Changeset 6448 in ntrip

Timestamp:

Dec 26, 2014, 4:38:26 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• GPSDecoder.cpp (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)
• bncrinex.h (modified) (1 diff)

trunk/BNC/src/GPSDecoder.cpp

@@ -81 +81 @@
   if (_rnx) {
     long iSec    = long(floor(obs._time.gpssec()+0.5));
-    long obsTime = obs._time.gpsw() * 7*24*3600 + iSec;
     if (_rnx->samplingRate() == 0 || iSec % _rnx->samplingRate() == 0) {
       _rnx->deepCopy(obs);
     }
-    _rnx->dumpEpoch(format, obsTime);
+    _rnx->dumpEpoch(format, obs._time);
   }
 } 

trunk/BNC/src/bncrinex.cpp

@@ -387 +387 @@
 // Write One Epoch into the RINEX File
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::dumpEpoch(const QByteArray& format, long maxTime) {
+void bncRinex::dumpEpoch(const QByteArray& format, const bncTime& maxTime) {
 
   // Select observations older than maxTime
@@ -395 +395 @@
   while (mIt.hasNext()) {
     t_satObs obs = mIt.next();
-    if (obs._time.gpsw() * 7*24*3600 + obs._time.gpssec() < maxTime - 0.05) {
+    if (obs._time < maxTime) {
       obsList.push_back(obs);
       mIt.remove();

trunk/BNC/src/bncrinex.h

@@ -42 +42 @@
    int  samplingRate() const {return _samplingRate;}
    void deepCopy(t_satObs obs);
-   void dumpEpoch(const QByteArray& format, long maxTime);
+   void dumpEpoch(const QByteArray& format, const bncTime& maxTime);
    void setReconnectFlag(bool flag){_reconnectFlag = flag;}