Changeset 6442 in ntrip for trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

Timestamp:

Dec 26, 2014, 12:03:26 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (modified) (4 diffs)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -73 +73 @@
   }
   else {
-    _usedEph = new QMap<QString, t_eph*>;
+    _usedEph = new QMap<QString, const t_eph*>;
   }
 
@@ -348 +348 @@
     in >> prn;
 
-    t_eph* eph = 0;
-    const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(prn);
-    if (ephPair) {
-
-      eph = ephPair->last;
+    const t_eph* ephLast = _ephUser->ephLast(prn);
+    const t_eph* ephPrev = _ephUser->ephPrev(prn);
+    const t_eph* eph     = ephLast;
+
+    if (eph) {
 
       // Use previous ephemeris if the last one is too recent
       // ----------------------------------------------------
       const int MINAGE = 60; // seconds
-      if (ephPair->prev && eph->receptDateTime().isValid() &&
+      if (ephPrev && eph->receptDateTime().isValid() &&
           eph->receptDateTime().secsTo(currentDateAndTimeGPS()) < MINAGE) {
-        eph = ephPair->prev;
+        eph = ephPrev;
       }
 
@@ -371 +371 @@
           eph = 0;
           if (_usedEph->contains(prn)) {
-            t_eph* usedEph = _usedEph->value(prn);
-            if      (usedEph == ephPair->last) {
-              eph = ephPair->last;
-            }
-            else if (usedEph == ephPair->prev) {
-              eph = ephPair->prev;
+            const t_eph* usedEph = _usedEph->value(prn);
+            if      (usedEph == ephLast) {
+              eph = ephLast;
+            }
+            else if (usedEph == ephPrev) {
+              eph = ephPrev;
             }
           }
@@ -638 +638 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void bncRtnetUploadCaster::processSatellite(t_eph* eph, int GPSweek,
+void bncRtnetUploadCaster::processSatellite(const t_eph* eph, int GPSweek,
                                             double GPSweeks, const QString& prn,
                                             const ColumnVector& rtnAPC,