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

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src/GPSS

Files:

• hassDecoder.cpp (modified) (4 diffs)
• hassDecoder.h (modified) (1 diff)

trunk/BNC/src/GPSS/hassDecoder.cpp

@@ -46 +46 @@
   _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)));
 }
 
@@ -92 +92 @@
     // Correction Time
     // ---------------
-    bncTime tt; 
-    tt.setmjd(daySec, mjd);
+    bncTime coTime; coTime.setmjd(daySec, mjd);
 
-    _GPSweeks = tt.gpssec();
-    long coTime = tt.gpsw() * 7*24*3600 + long(floor(_GPSweeks+0.5));
+    _GPSweeks = coTime.gpssec();
 
     // Transform Correction
@@ -118 +116 @@
     ColumnVector xc(4);
     ColumnVector vv(3);
-    eph->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
+    eph->position(coTime.gpsw(), coTime.gpssec(), xc.data(), vv.data());
 
     ColumnVector rao(3);
@@ -146 +144 @@
                      "   %10.5f %10.5f %10.5f %10.5f"
                      "   %10.5f",
-                     messageType, updateInterval, tt.gpsw(), _GPSweeks,
+                     messageType, updateInterval, coTime.gpsw(), _GPSweeks,
                      prn.toAscii().data(), IOD, 
                      dClk, rao[0], rao[1], rao[2],

trunk/BNC/src/GPSS/hassDecoder.h

@@ -16 +16 @@
 
  signals:
-  void newCorrLine(QString line, QString staID, long coTime);
+  void newCorrLine(QString line, QString staID, bncTime coTime);
 
  private: