Changeset 222 in ntrip for trunk/BNC/bnccaster.cpp

Timestamp:

Oct 7, 2006, 11:57:05 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bnccaster.cpp (modified) (5 diffs)

trunk/BNC/bnccaster.cpp

@@ -15 +15 @@
  *
  * -----------------------------------------------------------------------*/
+
+#include <math.h>
 
 #include "bnccaster.h"
@@ -91 +93 @@
 void bncCaster::slotNewObs(const QByteArray& staID, Observation* obs) {
 
-  long newTime = obs->GPSWeek * 7*24*3600 + obs->GPSWeeks;
+  long iSec    = long(floor(obs->GPSWeeks+0.5));
+  long newTime = obs->GPSWeek * 7*24*3600 + iSec;
 
   // Rename the Station
@@ -103 +106 @@
   }
   bncRinex* rnx = _rinexWriters.find(obs->StatID).value();
-  if (_samplingRate == 0 || obs->GPSWeeks % _samplingRate == 0) {
+  if (_samplingRate == 0 || iSec % _samplingRate == 0) {
     rnx->deepCopy(obs);
   }
@@ -121 +124 @@
          !settings.value("outPort").toString().isEmpty() ) { 
       emit( newMessage(QString("Station %1: old epoch %2 thrown away")
-                       .arg(staID.data()).arg(obs->GPSWeeks).toAscii()) );
+                       .arg(staID.data()).arg(iSec).toAscii()) );
     }
     delete obs;
@@ -192 +195 @@
             *_out << begEpoch << endl;;
           }
-          *_out <<       obs->StatID    << " "
-                << (int) obs->SVPRN     << " "
-                << (int) obs->GPSWeek   << " "
-                <<       obs->GPSWeeks  << " "
-                <<       obs->sec       << " "
-                <<       obs->pCodeIndicator << " "
-                <<       obs->cumuLossOfCont << " "
-                <<       obs->C1        << " "
-                <<       obs->P2        << " "
-                <<       obs->L1        << " "
-                <<       obs->L2        << endl;
+          *_out <<  obs->StatID    << " "
+                <<  obs->SVPRN     << " "
+                <<  obs->GPSWeek   << " "
+                <<  obs->GPSWeeks  << " "
+                <<  obs->C1        << " "
+                <<  obs->P1        << " "
+                <<  obs->P2        << " "
+                <<  obs->L1        << " "
+                <<  obs->L2        << endl;
           if (!it.hasNext()) {
             *_out << endEpoch << endl;