Changeset 5120 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Apr 14, 2013, 6:26:22 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

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

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -72 +72 @@
   _GPSweeks = -1.0;
 
-  connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
-          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
+  connect(this, SIGNAL(newCorrLine(QString, QString, bncTime)), 
+          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, bncTime)));
 
   connect(this, SIGNAL(newMessage(QByteArray,bool)), 
@@ -254 +254 @@
   bncTime currTime(currWeek, currSec);
 
-  bncTime corrTime(GPSweek, GPSweeks);
-
-  double dt = currTime - corrTime;
+  bncTime coTime(GPSweek, GPSweeks);
+
+  double dt = currTime - coTime;
   const double MAXDT = 10 * 60.0;
   if (fabs(dt) > MAXDT) {
@@ -263 +263 @@
   }
   else {
-    long coTime = GPSweek * 7*24*3600 + long(floor(_GPSweeks+0.5));
     emit newCorrLine(line, _staID, coTime);
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -50 +50 @@
                      std::ofstream*& out);
  signals:
-  void newCorrLine(QString line, QString staID, long coTime);
+  void newCorrLine(QString line, QString staID, bncTime coTime);
   void newMessage(QByteArray msg, bool showOnScreen);