Changeset 2519 in ntrip for trunk/BNC/bncgetthread.cpp

Timestamp:

Aug 3, 2010, 12:10:19 PM (14 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncgetthread.cpp (modified) (7 diffs)

trunk/BNC/bncgetthread.cpp

@@ -75 +75 @@
 // Constructor 1
 ////////////////////////////////////////////////////////////////////////////
-bncGetThread::bncGetThread(const QByteArray& rawInpFileName, 
-                           const QByteArray& format) {
-
-  _rawInpFile = new QFile(rawInpFileName);
-  _rawInpFile->open(QIODevice::ReadOnly);
-  _format     = format;
-  _staID      = rawInpFileName.mid(
-                       rawInpFileName.lastIndexOf(QDir::separator())+1,5);  
-
-  _rawOutput = false;
-
+bncGetThread::bncGetThread(bncRawFile* rawFile) {
+
+  _rawFile      = rawFile;
+  _format       = rawFile->format();
+  _staID        = rawFile->staID();
+  _rawOutput    = false;
   _ntripVersion = "N";
 
@@ -99 +94 @@
                            const QByteArray& nmea, 
                            const QByteArray& ntripVersion, const QByteArray& extraStaID) {
-  _rawInpFile   = 0;
+  _rawFile      = 0;
   _mountPoint   = mountPoint;
   _staID        = (extraStaID.size() == 0 ? mountPoint.path().mid(1).toAscii() : extraStaID);
@@ -305 +300 @@
            _format.indexOf("RTCM 3") != -1 ) {
     emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
-    bool inputFromFile = false;
-    if (_rawInpFile != 0) {
-      inputFromFile = true;
-    }
-    _decoder = new RTCM3Decoder(_staID, inputFromFile);
+    _decoder = new RTCM3Decoder(_staID, bool(_rawFile != 0));
     connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));
@@ -348 +339 @@
   delete _decoder;
   delete _rnx;
-  delete _rawInpFile;
+  delete _rawFile;
   delete _serialOutFile;
   delete _serialPort;
@@ -395 +386 @@
         _query->waitForReadyRead(data);
       }
-      else if (_rawInpFile) {
-        const qint64 maxBytes = 1024;
-        data = _rawInpFile->read(maxBytes);
-
-        //// beg test
-        msleep(10);
-        //// end test
+      else if (_rawFile) {
+        data = _rawFile->read();
 
         if (data.isEmpty()) {
@@ -457 +443 @@
         // Check observation epoch
         // -----------------------
-        if (!_rawInpFile && !dynamic_cast<gpssDecoder*>(_decoder)) {
+        if (!_rawFile && !dynamic_cast<gpssDecoder*>(_decoder)) {
           int week;
           double sec;
@@ -525 +511 @@
   // Start a new query
   // -----------------
-  if (!_rawInpFile) {
+  if (!_rawFile) {
 
     sleep(_nextSleep);