Changeset 2776 in ntrip

Timestamp:

Dec 12, 2010, 4:58:27 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (4 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/bncpppclient.cpp

@@ -69 +69 @@
   }
 
+  _useGalileo = true; // TODO
+
   if (settings.value("pppSPP").toString() == "PPP") {
     _pppMode = true;
@@ -84 +86 @@
   connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
           this, SLOT(slotNewEphGlonass(glonassephemeris)));
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGalileo(galileoephemeris)),
+          this, SLOT(slotNewEphGalileo(galileoephemeris)));
 
   connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
@@ -122 +127 @@
   QMutexLocker locker(&_mutex);
 
-  if (obs.satSys != 'G' && !_useGlonass) {
+  if      (obs.satSys == 'R' && !_useGlonass) {
+    return;
+  }
+  else if (obs.satSys == 'E' && !_useGalileo) {
+    return;
+  }
+  else if (obs.satSys != 'G') {
     return;
   }
@@ -554 +565 @@
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncPPPclient::slotNewEphGalileo(galileoephemeris galeph) {
+  QMutexLocker locker(&_mutex);
+
+  QString prn = QString("E%1").arg(galeph.satellite, 2, 10, QChar('0'));
+
+  if (_eph.contains(prn)) {
+    t_ephGal* eLast = static_cast<t_ephGal*>(_eph.value(prn)->last);
+    if ( (eLast->GPSweek() <  galeph.Week) || 
+         (eLast->GPSweek() == galeph.Week &&  
+          eLast->TOC()     <  galeph.TOC) ) {
+      delete static_cast<t_ephGal*>(_eph.value(prn)->prev);
+      _eph.value(prn)->prev = _eph.value(prn)->last;
+      _eph.value(prn)->last = new t_ephGal();
+      static_cast<t_ephGal*>(_eph.value(prn)->last)->set(&galeph);
+    }
+  }
+  else {
+    t_ephGal* eLast = new t_ephGal();
+    eLast->set(&galeph);
+    _eph.insert(prn, new t_ephPair());
+    _eph[prn]->last = eLast;
+  }
+}

trunk/BNC/bncpppclient.h

@@ -125 +125 @@
   void slotNewEphGPS(gpsephemeris gpseph);
   void slotNewEphGlonass(glonassephemeris gloeph);
+  void slotNewEphGalileo(galileoephemeris galeph);
   void slotNewCorrections(QList<QString> corrList);
 
@@ -173 +174 @@
   bncModel*               _model;
   bool                    _useGlonass;
+  bool                    _useGalileo;
   bool                    _pppMode;
   QMap<QString, slipInfo> _slips;