Changeset 1368 in ntrip

Timestamp:

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

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (6 diffs)
• bncsocket.cpp (modified) (2 diffs)
• bncsocket.h (modified) (1 diff)

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
         // ----------------

trunk/BNC/bncsocket.cpp

@@ -17 +17 @@
 #include <iostream>
 #include <iomanip>
-
-#include <string.h>
 
 #include "bncsocket.h"
@@ -145 +143 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-qint64 bncSocket::read(char* data, qint64 maxlen) {
-  if      (_http) {
-    strncpy(data, _buffer.data(), maxlen);
-    _buffer = _buffer.right(_buffer.size()-maxlen);
-    return maxlen; 
-  }
-  else if (_socket) {
-    return _socket->read(data, maxlen);
-  }
-  else {
-    return -1;
+QByteArray bncSocket::read(qint64 maxSize) {
+  if      (_http) {
+    QByteArray ret = _buffer.left(maxSize);
+    _buffer = _buffer.right(_buffer.size()-maxSize);
+    return ret; 
+  }
+  else if (_socket) {
+    return _socket->read(maxSize);
+  }
+  else {
+    return "";
   }
 }

trunk/BNC/bncsocket.h

@@ -17 +17 @@
   QByteArray readLine();
   void       waitForReadyRead(int msecs = 30000);
-  qint64     read(char *data, qint64 maxlen);
+  QByteArray read(qint64 maxSize);
   QAbstractSocket::SocketState state() const;