Changeset 2260 in ntrip

Timestamp:

Jan 16, 2010, 12:01:04 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNS/bnseph.cpp (modified) (2 diffs)

trunk/BNS/bnseph.cpp

@@ -20 +20 @@
 #include "bnsutils.h" 
 #include "bnssettings.h" 
+#include "bnctime.h" 
+extern "C" {
+#include "RTCM/rtcm3torinex.h"
+}
 
 #define PI          3.1415926535898
@@ -493 +497 @@
       
       if (year < 100) year += 2000;
+
+      bncTime tHlp; 
+      tHlp.set(int(year), int(month), int(day), 
+               int(hour), int(minute), second);
       
-      QDateTime* dateTime = new QDateTime(QDate(int(year), int(month), int(day)), 
-                                          QTime(int(hour), int(minute), int(second)), Qt::UTC);
-
-      GPSweekFromDateAndTime(*dateTime, _GPSweek, _GPSweeks); 
- 
-      delete dateTime;
-
-      //// beg test
-      //// _gps_utc = 14.0;
-      //// end test
-
+      _GPSweek  = tHlp.gpsw();
+      _GPSweeks = tHlp.gpssec();
+
+      // Correct UTC -> GPS;
+      // -------------------
+      _gps_utc = gnumleap(int(year), int(month), int(day));
       _GPSweeks += _gps_utc;
+      if (_GPSweeks > 86400.0) {
+        _GPSweek  += 1;
+        _GPSweeks -= 86400.0;
+      }
     }
     else if (ii == 2) {