Changeset 923 in ntrip for trunk

Timestamp:

May 18, 2008, 4:10:42 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (3 diffs)
• bns.h (modified) (1 diff)

trunk/BNS/bns.cpp

@@ -365 +365 @@
           }
           if (sd) {
-            processSatellite(ep, GPSweek, GPSweeks, prn, xx, sd);
+            processSatellite(oldEph, ep, GPSweek, GPSweeks, prn, xx, sd);
           }
         }
@@ -385 +385 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bns::processSatellite(t_eph* ep, int GPSweek, double GPSweeks, 
+void t_bns::processSatellite(int oldEph, t_eph* ep, int GPSweek, double GPSweeks, 
                              const QString& prn, const ColumnVector& xx, 
                              struct ClockOrbit::SatData* sd) {
@@ -411 +411 @@
   if (_outStream) {
     QString line;
-    line.sprintf("%d %.1f %s   %3d   %8.3f   %8.3f %8.3f %8.3f\n", 
-                 GPSweek, GPSweeks, ep->prn().toAscii().data(),
+    char oldCh = (oldEph ? '!' : ' ');
+    line.sprintf("%c %d %.1f %s  %3d  %10.3f  %8.3f %8.3f %8.3f\n", 
+                 oldCh, GPSweek, GPSweeks, ep->prn().toAscii().data(),
                  ep->IOD(), dClk, rsw(1), rsw(2), rsw(3));
     *_outStream << line;
     _outStream->flush();
   }
-  if (_rnx) {
-    _rnx->write(GPSweek, GPSweeks, prn, xx);
-  }
-  if (_sp3) {
-    _sp3->write(GPSweek, GPSweeks, prn, xx);
+  if (!oldEph) {
+    if (_rnx) {
+      _rnx->write(GPSweek, GPSweeks, prn, xx);
+    }
+    if (_sp3) {
+      _sp3->write(GPSweek, GPSweeks, prn, xx);
+    }
   }
 }

trunk/BNS/bns.h

@@ -55 +55 @@
   void openCaster();
   void readEpoch();
-  void processSatellite(t_eph* ep, int GPSweek, double GPSweeks, 
+  void processSatellite(int oldEph, t_eph* ep, int GPSweek, double GPSweeks, 
                         const QString& prn, const ColumnVector& xx, 
                         struct ClockOrbit::SatData* sd);