Changeset 884 in ntrip for trunk/BNS/bns.cpp

Timestamp:

May 8, 2008, 3:36:12 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNS/bns.cpp (modified) (9 diffs)

trunk/BNS/bns.cpp

@@ -39 +39 @@
   _bnseph = new t_bnseph(parent);
 
-  connect(_bnseph, SIGNAL(newEph(gpsEph*)), this, SLOT(slotNewEph(gpsEph*)));
+  connect(_bnseph, SIGNAL(newEph(t_eph*)), this, SLOT(slotNewEph(t_eph*)));
   connect(_bnseph, SIGNAL(newMessage(QByteArray)),
           this, SLOT(slotMessage(const QByteArray)));
@@ -229 +229 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bns::slotNewEph(gpsEph* ep) {
+void t_bns::slotNewEph(t_eph* ep) {
 
   QMutexLocker locker(&_mutex);
 
   t_ephPair* pair;
-  if ( !_ephList.contains(ep->prn) ) {
+  if ( !_ephList.contains(ep->prn()) ) {
     pair = new t_ephPair();
-    _ephList.insert(ep->prn, pair);
-  }
-  else {
-    pair = _ephList[ep->prn];
+    _ephList.insert(ep->prn(), pair);
+  }
+  else {
+    pair = _ephList[ep->prn()];
   }
 
@@ -246 +246 @@
   }
   else {
-    if (ep->GPSweek >  pair->eph->GPSweek ||
-        (ep->GPSweek == pair->eph->GPSweek && ep->TOC > pair->eph->TOC)) {
+    if (ep->isNewerThan(pair->eph)) {
       delete pair->oldEph;
       pair->oldEph = pair->eph;
@@ -328 +327 @@
         QString      prn;
         ColumnVector xx(4);
-        gpsEph*      ep = 0;
+        t_eph*       ep = 0;
 
         if (oldEph == 0) {
@@ -344 +343 @@
           if ( _ephList.contains(prn) ) {
             t_ephPair* pair = _ephList[prn];
-            prn = pair->eph->prn;
+            prn = pair->eph->prn();
             xx  = pair->xx;
             ep  = pair->oldEph;
@@ -379 +378 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bns::processSatellite(gpsEph* ep, int GPSweek, double GPSweeks, 
+void t_bns::processSatellite(t_eph* ep, int GPSweek, double GPSweeks, 
                              const QString& prn, const ColumnVector& xx, 
                              struct ClockOrbit::SatData* sd) {
@@ -386 +385 @@
   ColumnVector vv(3);
 
-  satellitePosition(GPSweek, GPSweeks, ep, xB(1), xB(2), xB(3), xB(4), 
-                    vv(1), vv(2), vv(3));
+  ep->position(GPSweek, GPSweeks, xB, vv);
 
   ColumnVector dx   = xx.Rows(1,3) - xB.Rows(1,3);
@@ -397 +395 @@
   if (sd) {
     sd->ID                    = prn.mid(1).toInt();
-    sd->IOD                   = int(ep->IODE);
+    sd->IOD                   = ep->IOD();
     sd->Clock.DeltaA0         = dClk;
     sd->Orbit.DeltaRadial     = rsw(1);
@@ -406 +404 @@
   if (_outStream) {
     QString line;
-    line.sprintf("%d %.1f %s   %3d %3d   %8.3f   %8.3f %8.3f %8.3f\n", 
-                 GPSweek, GPSweeks, ep->prn.toAscii().data(),
-                 int(ep->IODC), int(ep->IODE), dClk, rsw(1), rsw(2), rsw(3));
-     *_outStream << line;
+    line.sprintf("%d %.1f %s   %3d   %8.3f   %8.3f %8.3f %8.3f\n", 
+                 GPSweek, GPSweeks, ep->prn().toAscii().data(),
+                 ep->IOD(), dClk, rsw(1), rsw(2), rsw(3));
+    *_outStream << line;
     _outStream->flush();
   }