Changeset 4904 in ntrip for trunk

Timestamp:

Feb 9, 2013, 10:20:20 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/ephemeris.cpp (modified) (5 diffs)
• RTCM3/ephemeris.h (modified) (1 diff)
• bncapp.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/ephemeris.cpp

@@ -375 +375 @@
 // Set Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-void t_ephGlo::set(const glonassephemeris* ee) {
+void t_ephGlo::set(const glonassephemeris* ee, bool& timeChanged) {
 
   _receptDateTime = currentDateAndTimeGPS();
@@ -387 +387 @@
   // Check the day once more 
   // -----------------------
+  timeChanged = false;
   {
     const double secPerDay  = 24 * 3600.0;
@@ -398 +399 @@
     bncTime hTime(ww, (double) tow);
 
-    bool changed = false;
     if      (hTime - currentTime >  secPerDay/2.0) {
-      changed = true;
+      timeChanged = true;
       tow -= int(secPerDay);
       if (tow < 0) {
@@ -408 +408 @@
     }
     else if (hTime - currentTime < -secPerDay/2.0) {
-      changed = true;
+      timeChanged = true;
       tow += int(secPerDay);
       if (tow > secPerWeek) {
@@ -416 +416 @@
     }
 
-    if (changed && ((bncApp*) qApp)->mode() == bncApp::batchPostProcessing) {
+    if (timeChanged && ((bncApp*) qApp)->mode() == bncApp::batchPostProcessing) {
       bncTime newHTime(ww, (double) tow);
       cout << "GLONASS " << ee->almanac_number <<  " Time Changed at " 

trunk/BNC/src/RTCM3/ephemeris.h

@@ -141 +141 @@
   virtual int  RTCM3(unsigned char *);
 
-  void set(const glonassephemeris* ee);
+  void set(const glonassephemeris* ee, bool& timeChanged);
 
   int  slotNum() const {return int(_frequency_number);}

trunk/BNC/src/bncapp.cpp

@@ -515 +515 @@
 
   t_ephGlo eph;
-  eph.set(ep);
+  bool timeChanged;
+  eph.set(ep, timeChanged);
 
   QString strV2 = eph.toString(2.11);

trunk/BNC/src/bncephuser.cpp

@@ -111 +111 @@
     bncTime toc(ww, tow);
     if (eLast->TOC() < toc) {
-      delete static_cast<t_ephGlo*>(_eph.value(prn)->prev);
-      _eph.value(prn)->prev = _eph.value(prn)->last;
-      _eph.value(prn)->last = new t_ephGlo();
-      static_cast<t_ephGlo*>(_eph.value(prn)->last)->set(&gloeph);
+      t_ephGlo* ephGlo = new t_ephGlo();
+      bool timeChanged;
+      ephGlo->set(&gloeph, timeChanged);
+      if (timeChanged) {
+        delete ephGlo;
+      }
+      else {
+        delete static_cast<t_ephGlo*>(_eph.value(prn)->prev);
+        _eph.value(prn)->prev = _eph.value(prn)->last;
+        _eph.value(prn)->last = ephGlo;
+      }
     }
   }
   else {
     t_ephGlo* eLast = new t_ephGlo();
-    eLast->set(&gloeph);
-    _eph.insert(prn, new t_ephPair(eLast));
+    bool timeChanged;
+    eLast->set(&gloeph, timeChanged);
+    if (timeChanged) {
+      delete eLast;
+    }
+    else {
+      _eph.insert(prn, new t_ephPair(eLast));
+    }
   }
   ephBufferChanged();