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

Timestamp:

Dec 27, 2008, 11:42:31 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

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

trunk/BNC/bncgetthread.cpp

@@ -503 +503 @@
         _socket->waitForReadyRead(_timeOut);
         nBytes = _socket->bytesAvailable();
+        cout << "nBytes " << nBytes << endl;
       }
       else if (_rawInpFile) {
@@ -512 +513 @@
         emit newBytes(_staID, nBytes);
 
-        char* data = new char[nBytes];
+        QByteArray data;
 
         if (_socket) {
-          _socket->read(data, nBytes);
+          data = _socket->read(nBytes);
         }
         else if (_rawInpFile) {
-          nBytes = _rawInpFile->read(data, nBytes);
-          if (nBytes <= 0) {
+          data = _rawInpFile->read(nBytes);
+          if (data.isEmpty()) {
             cout << "no more data" << endl;
             ::exit(0);
@@ -526 +527 @@
 
         if (_rawOutFile) {
-          _rawOutFile->write(data, nBytes);
+          _rawOutFile->write(data);
           _rawOutFile->flush();
         }
 
         if (_serialPort) {
-          _serialPort->write(data, nBytes);
+          _serialPort->write(data);
           ////          _serialPort->flush();
         }
@@ -537 +538 @@
         if (_inspSegm<1) {
           vector<string> errmsg;
-          _decoder->Decode(data, nBytes, errmsg);
+          _decoder->Decode(data.data(), data.size(), errmsg);
 #ifdef DEBUG_RTCM2_2021
           for (unsigned ii = 0; ii < errmsg.size(); ii++) {
@@ -553 +554 @@
             if (decode) { 
               vector<string> errmsg;
-              if ( _decoder->Decode(data, nBytes, errmsg) == success ) { 
+              if ( _decoder->Decode(data.data(), data.size(), errmsg) == success ) { 
                 numSucc += 1;
               } 
@@ -648 +649 @@
         }
 
-        delete [] data;
-
-        
         // RTCM scan output
         // ----------------