Changeset 219 in ntrip for trunk

Timestamp:

Oct 6, 2006, 6:05:23 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2.cpp (modified) (1 diff)
• bncutils.cpp (modified) (1 diff)
• bncutils.h (modified) (1 diff)

trunk/BNC/RTCM/RTCM2.cpp

@@ -1086 +1086 @@
             obs->SVPRN          = _ObsBlock.PRN[iSat];
             obs->GPSWeek        = epochWeek;
-            obs->GPSWeeks       = (int) epochSecs;
+            obs->GPSWeeks       = int(floor(epochSecs+0.5));
             obs->sec            = _ObsBlock.secs;
             obs->pCodeIndicator = 0;

trunk/BNC/bncutils.cpp

@@ -85 +85 @@
                      + gmt->tm_hour ) / 24.0;
 
-  double mjd = MJD(1900+gmt->tm_year, gmt->tm_mon+1, gmt->tm_mday+1+dayFrac);
-
-  cout << 1900+gmt->tm_year << " " << gmt->tm_mon+1 << " " << gmt->tm_mday+1 
-       << " " << gmt->tm_hour
-       << " " << gmt->tm_min
-       << " " << gmt->tm_sec << endl;
+  double mjd = MJD(1900+gmt->tm_year, gmt->tm_mon+1, gmt->tm_mday+dayFrac);
 
   MJD_GPSWeeks(mjd, week, sec);

trunk/BNC/bncutils.h

@@ -10 +10 @@
 QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
 
-void gpsWeekAndSec(int& week, double& sec);
+double MJD(int year, int month, double day);
+void MJD_GPSWeeks(double mjd, int& week, double& second);
+void currentGPSWeeks(int& week, double& sec);
 
 #endif