Changeset 1155 in ntrip

Timestamp:

Oct 7, 2008, 12:52:45 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (1 diff)
• bncutils.cpp (modified) (2 diffs)

trunk/BNC/bncapp.cpp

@@ -119 +119 @@
 
   _corrs = new QMultiMap<long, QString>;
+
+  _currentDateAndTimeGPS = 0;
 }
 

trunk/BNC/bncapp.h

@@ -42 +42 @@
     void setPortCorr(int port);
     void setCaster(bncCaster* caster) {_caster = caster;}
+    QDateTime* _currentDateAndTimeGPS;
   public slots:
     void slotMessage(const QByteArray msg);

trunk/BNC/bncutils.cpp

@@ -48 +48 @@
 
 #include "bncutils.h"
+#include "bncapp.h"
 
 using namespace std;
@@ -82 +83 @@
 void currentGPSWeeks(int& week, double& sec) {
 
-  QDateTime currDateTime = QDateTime::currentDateTime().toUTC();
+  QDateTime currDateTime;
+  int leapsecond = 0;
+
+  if ( ((bncApp*) qApp)->_currentDateAndTimeGPS ) {
+    currDateTime = *(((bncApp*) qApp)->_currentDateAndTimeGPS);
+  }
+  else {
+    currDateTime = QDateTime::currentDateTime().toUTC();
+    if (currDateTime.date().year() >= 2009) {
+      leapsecond = 15;
+    }
+    else {
+      leapsecond = 14;
+    }
+  }
+
   QDate     currDate = currDateTime.date();
   QTime     currTime = currDateTime.time();
-
-  int leapsecond = 14;
-  if (currDate.year() >= 2009) {leapsecond = 15;}
 
   week = int( (double(currDate.toJulianDay()) - 2444244.5) / 7 );