Changeset 3748 in ntrip

Timestamp:

Mar 30, 2012, 11:21:04 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

• bncpostprocess.cpp (modified) (2 diffs)
• rnxnavfile.cpp (modified) (1 diff)
• rnxnavfile.h (modified) (2 diffs)

trunk/BNC/rinex/bncpostprocess.cpp

@@ -124 +124 @@
   }
 
-  // Read Ephemerides
-  // ----------------
-  t_eph* eph = 0;
-  while ( (eph = _rnxNavFile->getNextEph()) != 0 ) {
-    if (_pppClient->putNewEph(eph) != success) {
-      delete eph; eph = 0;
-    }
-  }
-
   // Read/Process Observations
   // -------------------------
@@ -140 +131 @@
     ++nEpo;
 
+    // Get Corrections
+    // ---------------
     if (_corrFile) {
       _corrFile->syncRead(epo->tt);
+    }
+
+    // Get Ephemerides
+    // ----------------
+    t_eph* eph = 0;
+    while ( (eph = _rnxNavFile->getNextEph(epo->tt)) != 0 ) {
+      if (_pppClient->putNewEph(eph) != success) {
+        delete eph; eph = 0;
+      }
     }
 

trunk/BNC/rinex/rnxnavfile.cpp

@@ -161 +161 @@
 // Read Next Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-t_eph* t_rnxNavFile::getNextEph() {
-  if (!_ephs.empty()) {
+t_eph* t_rnxNavFile::getNextEph(const bncTime& tt) {
+  while (!_ephs.empty()) {
     t_eph* eph = _ephs.front();
-    _ephs.pop();
-    return eph;
+    bncTime ephTime(eph->GPSweek(), eph->GPSweeks());
+    double dt = ephTime - tt;
+    if (dt < 4*3600.0) {
+      _ephs.pop();
+      return eph;
+    }
+    else {
+      return 0;
+    }
   }
   return 0;

trunk/BNC/rinex/rnxnavfile.h

@@ -29 +29 @@
 #include <QtCore>
 #include "bncconst.h"
+#include "bnctime.h"
 
 class t_pppOpt;
@@ -51 +52 @@
   t_rnxNavFile(QString fileName);
   ~t_rnxNavFile();
-  t_eph* getNextEph();
+  t_eph* getNextEph(const bncTime& tt);
   float version() const {return _header.version();}
   bool  glonass() const {return _header.glonass();}