Changeset 2523 in ntrip

Timestamp:

Aug 3, 2010, 1:13:59 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncrawfile.cpp (modified) (3 diffs)
• bncrawfile.h (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -387 +387 @@
       }
       else if (_rawFile) {
-        data = _rawFile->read();
+        data = _rawFile->readChunk();
 
         if (data.isEmpty()) {

trunk/BNC/bncrawfile.cpp

@@ -52 +52 @@
   _format     = format;
   _staID      = fileName.mid(fileName.lastIndexOf(QDir::separator())+1,5);  
-  _inpOutFlag = ioFlg;
+  _inpFile    = 0;
   _outFile    = 0;
+  _version    = 0;
 
-  // Initialize
-  // ----------
-  if (_inpOutFlag == input) {
+  // Initialize for Input
+  // --------------------
+  if (ioFlg == input) {
+    _inpFile = new QFile(_fileName);
+    _inpFile->open(QIODevice::ReadOnly);
+    QString line = _inpFile->readLine();
+    QStringList lst1 = line.split(' ');
+    _version = lst1.value(0).toInt();
+
+    line = _inpFile->readLine();
     bncApp* app = (bncApp*) qApp;
-    // TODO: set date and time
+    app->_currentDateAndTimeGPS = 
+                   new QDateTime(QDateTime::fromString(line, Qt::ISODate));
+  }
+
+  // Initialize for Output
+  // ---------------------
+  else {
+    _outFile = new QFile(_fileName);
+    _outFile->open(QIODevice::WriteOnly);
+    QByteArray header = "1 Version of BNC raw file\n" +
+                        currentDateAndTimeGPS().toString(Qt::ISODate).toAscii();
+    _outFile->write(header);
   }
 }
@@ -73 +92 @@
 void bncRawFile::writeRawData(const QByteArray& data, const QByteArray& staID,
                               const QByteArray& format) {
-
-  if ( !_outFile && !_fileName.isEmpty() ) {
-    _outFile = new QFile(_fileName);
-    _outFile->open(QIODevice::WriteOnly);
-    QByteArray header = "1 Version of BNC raw file\n" +
-                        currentDateAndTimeGPS().toString(Qt::ISODate).toAscii();
-    _outFile->write(header);
-  }
-
   if (_outFile) {
     QString chunkHeader = 
@@ -94 +104 @@
 // Raw Input
 ////////////////////////////////////////////////////////////////////////////
-QByteArray bncRawFile::read() {
+QByteArray bncRawFile::readChunk() {
 
   return "";

trunk/BNC/bncrawfile.h

@@ -43 +43 @@
   QByteArray format() const {return _format;}
   QByteArray staID() const {return _staID;}
-  QByteArray read();
+  QByteArray readChunk();
   void writeRawData(const QByteArray& data, const QByteArray& staID,
                     const QByteArray& format);
@@ -50 +50 @@
   QByteArray _format;
   QByteArray _staID;
+  QFile*     _inpFile;
   QFile*     _outFile;
-  inpOutFlag _inpOutFlag; // whether used for input or output
+  int        _version;
 };
 #endif