Changeset 5133 in ntrip for trunk/BNC

Timestamp:

Apr 18, 2013, 5:15:00 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/ephemeris.cpp (modified) (2 diffs)
• RTCM3/ephemeris.h (modified) (1 diff)
• bnccore.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/ephemeris.cpp

@@ -375 +375 @@
 // Set Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-void t_ephGlo::set(const glonassephemeris* ee, bool& timeChanged) {
+void t_ephGlo::set(const glonassephemeris* ee) {
 
   _receptDateTime = currentDateAndTimeGPS();
@@ -387 +387 @@
   // Check the day once more 
   // -----------------------
-  timeChanged = false;
+  bool timeChanged = false;
   {
     const double secPerDay  = 24 * 3600.0;

trunk/BNC/src/RTCM3/ephemeris.h

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

trunk/BNC/src/bnccore.cpp

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

trunk/BNC/src/bncephuser.cpp

@@ -77 +77 @@
   QMutexLocker locker(&_mutex);
 
-  QString prn = QString("G%1").arg(gpseph.satellite, 2, 10, QChar('0'));
+  t_ephGPS* eNew = new t_ephGPS(); eNew->set(&gpseph);
+
+  const QString& prn = eNew->prn();
 
   if (_eph.contains(prn)) {
     t_ephGPS* eLast = static_cast<t_ephGPS*>(_eph.value(prn)->last);
-    bncTime toc(gpseph.GPSweek, gpseph.TOC);
-    if (eLast->TOC() < toc) {
-      delete static_cast<t_ephGPS*>(_eph.value(prn)->prev);
+    if (eNew->isNewerThan(eLast)) {
+      delete _eph.value(prn)->prev;
       _eph.value(prn)->prev = _eph.value(prn)->last;
-      _eph.value(prn)->last = new t_ephGPS();
-      static_cast<t_ephGPS*>(_eph.value(prn)->last)->set(&gpseph);
+      _eph.value(prn)->last = eNew;
+      ephBufferChanged();
+    }
+    else {
+      delete eNew;
     }
   }
   else {
-    t_ephGPS* eLast = new t_ephGPS();
-    eLast->set(&gpseph);
-    _eph.insert(prn, new t_ephPair(eLast));
-  }
-  ephBufferChanged();
+    _eph.insert(prn, new t_ephPair(eNew));
+    ephBufferChanged();
+  }
 }
 
@@ -102 +104 @@
   QMutexLocker locker(&_mutex);
 
-  QString prn = QString("R%1").arg(gloeph.almanac_number, 2, 10, QChar('0'));
+  t_ephGlo* eNew = new t_ephGlo(); eNew->set(&gloeph);
+
+  const QString& prn = eNew->prn();
 
   if (_eph.contains(prn)) {
-    int ww  = gloeph.GPSWeek;
-    int tow = gloeph.GPSTOW; 
-    updatetime(&ww, &tow, gloeph.tb*1000, 0);  // Moscow -> GPS
     t_ephGlo* eLast = static_cast<t_ephGlo*>(_eph.value(prn)->last);
-    bncTime toc(ww, tow);
-    if (eLast->TOC() < toc) {
-      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;
-      }
+    if (eNew->isNewerThan(eLast)) {
+      delete _eph.value(prn)->prev;
+      _eph.value(prn)->prev = _eph.value(prn)->last;
+      _eph.value(prn)->last = eNew;
+      ephBufferChanged();
+    }
+    else {
+      delete eNew;
     }
   }
   else {
-    t_ephGlo* eLast = new t_ephGlo();
-    bool timeChanged;
-    eLast->set(&gloeph, timeChanged);
-    if (timeChanged) {
-      delete eLast;
-    }
-    else {
-      _eph.insert(prn, new t_ephPair(eLast));
-    }
-  }
-  ephBufferChanged();
+    _eph.insert(prn, new t_ephPair(eNew));
+    ephBufferChanged();
+  }
 }