Changeset 3670 in ntrip for trunk

Timestamp:

Feb 11, 2012, 6:27:02 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncephuser.cpp

@@ -148 +148 @@
     eLast->set(&galeph);
     _eph.insert(prn, new t_ephPair(eLast));
+  }
+  ephBufferChanged();
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncEphUser::putNewEph(t_eph* newEph) {
+
+  QMutexLocker locker(&_mutex);
+
+  if (!newEph) {
+    return;
+  }
+
+  QString prn = newEph->prn();
+
+  if (_eph.contains(prn)) {
+    t_eph* eLast = _eph.value(prn)->last;
+    if (newEph->isNewerThan(eLast)) {
+      delete _eph.value(prn)->prev;
+      _eph.value(prn)->prev = _eph.value(prn)->last;
+      _eph.value(prn)->last = newEph;
+    }
+  }
+  else {
+    _eph.insert(prn, new t_ephPair(newEph));
   }
   ephBufferChanged();

trunk/BNC/bncephuser.h

@@ -105 +105 @@
   }
 
+  void putNewEph(t_eph* eph);
+
  public slots:
   void slotNewEphGPS(gpsephemeris gpseph);

trunk/BNC/bncpostprocess.cpp

@@ -86 +86 @@
     _pppClient  = new bncPPPclient("POST", _opt, false);
 
-    connect(this, SIGNAL(newEphGPS(gpsephemeris)),
-            _pppClient, SLOT(slotNewEphGPS(gpsephemeris)), Qt::DirectConnection);
-    
-    connect(this, SIGNAL(newEphGlonass(glonassephemeris)),
-            _pppClient, SLOT(slotNewEphGlonass(glonassephemeris)), Qt::DirectConnection);
-    
-    connect(this, SIGNAL(newEphGalileo(galileoephemeris)),
-            _pppClient, SLOT(slotNewEphGalileo(galileoephemeris)), Qt::DirectConnection);
-
     connect(this, SIGNAL(newCorrections(QList<QString>)),
             _pppClient, SLOT(slotNewCorrections(QList<QString>)));
@@ -108 +99 @@
   t_eph* eph;
   while (_rnxNavFile->getNextEph(eph) == success) {
+    _pppClient->putNewEph(eph);
   }