Changeset 2530 in ntrip

Timestamp:

Aug 3, 2010, 8:01:55 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (1 diff)
• bncrawfile.cpp (modified) (1 diff)
• bncutils.cpp (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -759 +759 @@
          << setw(8)  << setprecision(3) << _neu[0]              << " "
          << setw(8)  << setprecision(3) << _neu[1]              << " "
-         << setw(8)  << setprecision(3) << _neu[2];
+         << setw(8)  << setprecision(3) << _neu[2]              << endl << endl;
     emit newMessage(QByteArray(strC.str().c_str()), true);
   }

trunk/BNC/bncrawfile.cpp

@@ -109 +109 @@
   if (_inpFile) {
     QString     line = _inpFile->readLine();
-    QStringList lst  = line.split(' ');
-    
-    bncApp* app = (bncApp*) qApp;
-    delete app->_currentDateAndTimeGPS;
-    app->_currentDateAndTimeGPS = 
-      new QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate));
-
-    _staID  = lst.value(1).toAscii();
-    _format = lst.value(2).toAscii();
-    int nBytes = lst.value(3).toInt();
-
-    data = _inpFile->read(nBytes);
-
-    _inpFile->read(1); // read '\n' character
+    if (!line.isEmpty()) {
+      QStringList lst  = line.split(' ');
+      
+      bncApp* app = (bncApp*) qApp;
+      delete app->_currentDateAndTimeGPS;
+      app->_currentDateAndTimeGPS = 
+        new QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate));
+      
+      _staID  = lst.value(1).toAscii();
+      _format = lst.value(2).toAscii();
+      int nBytes = lst.value(3).toInt();
+      
+      data = _inpFile->read(nBytes);
+      
+      _inpFile->read(1); // read '\n' character
+    }
   }
 

trunk/BNC/bncutils.cpp

@@ -116 +116 @@
 ////////////////////////////////////////////////////////////////////////////
 QDateTime currentDateAndTimeGPS() {
-  int    GPSWeek;
-  double GPSWeeks;
-  currentGPSWeeks(GPSWeek, GPSWeeks);
-  return dateAndTimeFromGPSweek(GPSWeek, GPSWeeks);
+  if ( ((bncApp*) qApp)->_currentDateAndTimeGPS ) {
+    return *(((bncApp*) qApp)->_currentDateAndTimeGPS);
+  }
+  else {
+    int    GPSWeek;
+    double GPSWeeks;
+    currentGPSWeeks(GPSWeek, GPSWeeks);
+    return dateAndTimeFromGPSweek(GPSWeek, GPSWeeks);
+  }
 }