Changeset 566 in ntrip for trunk

Timestamp:

Nov 7, 2007, 8:57:44 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (5 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncrinex.cpp (modified) (4 diffs)
• bncwindow.cpp (modified) (1 diff)
• bnczerodecoder.cpp (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -147 +147 @@
 
   if (_logStream) {
-    *_logStream << QDate::currentDate().toString("yy-MM-dd ").toAscii().data();
-    *_logStream << QTime::currentTime().toString("hh:mm:ss ").toAscii().data();
+    *_logStream << QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
     *_logStream << msg.data() << endl;
     _logStream->flush();
@@ -238 +237 @@
   if (!_ephPath.isEmpty()) {
 
-    QDateTime datTim = QDateTime::currentDateTime();
+    QDateTime datTim = QDateTime::currentDateTime().toUTC();
 
     QString hlp = (_rinexVers == 3) ? "MIX_" : "GPS_";
@@ -327 +326 @@
         *_ephStreamGPS << line;
         
-        QString hlp = QDateTime::currentDateTime().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
+        QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
         *_ephStreamGPS << _pgmName.toAscii().data() 
                        << _userName.toAscii().data() 
@@ -349 +348 @@
         *_ephStreamGPS << line;
          
-        QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
+        QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
         *_ephStreamGPS << _pgmName.toAscii().data() 
                        << _userName.toAscii().data() 
@@ -366 +365 @@
         *_ephStreamGlonass << line;
         
-        QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
+        QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
         *_ephStreamGlonass << _pgmName.toAscii().data() 
                            << _userName.toAscii().data() 

trunk/BNC/bncgetthread.cpp

@@ -195 +195 @@
     if (lon < -180.)  {lon=(lon+360.); flagE="E";}
     if (lat < 0.)  {lat=lat*(-1.); flagN="S";}
-    QTime ttime(QTime::currentTime());
+    QTime ttime(QDateTime::currentDateTime().toUTC().time());
     int lat_deg = (int)lat;  
     double lat_min=(lat-lat_deg)*60.;

trunk/BNC/bncrinex.cpp

@@ -223 +223 @@
   // --------------------
   else {
-    QDate currDate = QDate::currentDate();
+    QDate currDate = QDateTime::currentDateTime().toUTC().date();
     if ( !_skeletonDate.isValid() || _skeletonDate != currDate ) {
       if ( downloadSkeleton() == success) {
@@ -362 +362 @@
       if      (line.indexOf("PGM / RUN BY / DATE") != -1) {
         if (_rinexVers == 3) {
-          QString hlp = QDateTime::currentDateTime().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
+          QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
           _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
                << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
         }
         else {
-          QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
+          QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
           _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
                << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
@@ -405 +405 @@
     if (_rinexVers == 3) {
       _out << "     3.00           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
-      QString hlp = QDateTime::currentDateTime().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
+      QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
       _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
            << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
@@ -411 +411 @@
     else {
       _out << "     2.11           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
-      QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
+      QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
       _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
            << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;

trunk/BNC/bncwindow.cpp

@@ -594 +594 @@
  
   QString txt = _log->toPlainText() + "\n" + 
-     QDate::currentDate().toString("yy-MM-dd ") +
-     QTime::currentTime().toString("hh:mm:ss ") + msg;
+     QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ") + msg;
   _log->clear();
   _log->append(txt.right(maxBufferSize));

trunk/BNC/bnczerodecoder.cpp

@@ -71 +71 @@
 //////////////////////////////////////////////////////////////////////// 
 void bncZeroDecoder::reopen() {
-  QDate currDate = QDate::currentDate();
+  QDate currDate = QDateTime::currentDateTime().toUTC().date();
   if (!_out || _fileDate != currDate) {
     delete _out;