Changeset 1153 in ntrip

Timestamp:

Oct 7, 2008, 12:28:51 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (3 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncutils.cpp (modified) (1 diff)
• bncutils.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -63 +63 @@
 ////////////////////////////////////////////////////////////////////////////
 RTCM3Decoder::RTCM3Decoder(const QString& staID) : GPSDecoder() {
-
-  const int LEAPSECONDS = 14; /* only needed for approx. time */
 
   QSettings settings;
@@ -95 +93 @@
   _Parser.rinex3 = 0;
 
-  time_t tim;
-  tim = time(0) - ((10*365+2+5)*24*60*60 + LEAPSECONDS);
-
   memset(&_Parser, 0, sizeof(_Parser));
-  _Parser.GPSWeek = tim/(7*24*60*60);
-  _Parser.GPSTOW  = tim%(7*24*60*60);
+
+  double secGPS;
+  currentGPSWeeks(_Parser.GPSWeek, secGPS);
+  _Parser.GPSTOW = int(secGPS);
 
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
@@ -142 +139 @@
             double sec;
             _newSecGPS = _coDecoder->_epochList[ii];
-            leapsecGPSWeeks(week, sec);
+            currentGPSWeeks(week, sec);
             double dt = fabs(sec - _newSecGPS);
             const double secPerWeek = 7.0 * 24.0 * 3600.0;

trunk/BNC/bncgetthread.cpp

@@ -646 +646 @@
             int week;
             double sec;
-            leapsecGPSWeeks(week, sec);
+            currentGPSWeeks(week, sec);
             const double secPerWeek = 7.0 * 24.0 * 3600.0;
             

trunk/BNC/bncutils.cpp

@@ -86 +86 @@
   QTime     currTime = currDateTime.time();
 
-  week = int( (double(currDate.toJulianDay()) - 2444244.5) / 7 );
-
-  sec = (currDate.dayOfWeek() % 7) * 24.0 * 3600.0 + 
-        currTime.hour()                   * 3600.0 + 
-        currTime.minute()                 *   60.0 + 
-        currTime.second()                          +
-        currTime.msec()                   / 1000.0;
-}
-void leapsecGPSWeeks(int& week, double& sec) {
-
-  QDateTime currDateTime = QDateTime::currentDateTime().toUTC();
-  QDate     currDate = currDateTime.date();
-  QTime     currTime = currDateTime.time();
-
   int leapsecond = 14;
   if (currDate.year() >= 2009) {leapsecond = 15;}

trunk/BNC/bncutils.h

@@ -34 +34 @@
 
 void currentGPSWeeks(int& week, double& sec);
-void leapsecGPSWeeks(int& week, double& sec);
 
 #endif