Changeset 3764 in ntrip for trunk/BNC/rinex/rnxnavfile.cpp

Timestamp:

Apr 1, 2012, 6:52:25 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/rinex/rnxnavfile.cpp (modified) (2 diffs)

trunk/BNC/rinex/rnxnavfile.cpp

@@ -162 +162 @@
                                 const QMap<QString, int>* corrIODs) {
 
+  // Get Ephemeris according to IOD
+  // ------------------------------
   if (corrIODs) {
     QMapIterator<QString, int> itIOD(*corrIODs);
@@ -180 +182 @@
   }
 
-//  while (!_ephs.empty()) {
-//    t_eph* eph = _ephs.front();
-//    bncTime ephTime(eph->GPSweek(), eph->GPSweeks());
-//    double dt = ephTime - tt;
-//    if (dt < 2*3600.0) {
-//      _ephs.pop();
-//      return eph;
-//    }
-//    else {
-//      return 0;
-//    }
-//  }
+  // Get Ephemeris according to time
+  // -------------------------------
+  else {
+    vector<t_eph*>::iterator it = _ephs.begin();
+    while (it != _ephs.end()) {
+      t_eph* eph = *it;
+
+      bncTime ephTime(eph->GPSweek(), eph->GPSweeks());
+      double dt = ephTime - tt;
+
+      if (dt < 2*3600.0) {
+        it = _ephs.erase(it);
+        return eph;
+      }
+      ++it;
+    }
+  }
 
   return 0;