Changeset 2526 in ntrip

Timestamp:

Aug 3, 2010, 1:44:55 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncgetthread.cpp

@@ -387 +387 @@
       }
       else if (_rawFile) {
-        data = _rawFile->readChunk();
+        QByteArray currStaID;
+        QByteArray currFormat;
+        data = _rawFile->readChunk(currStaID, currFormat);
 
         if (data.isEmpty()) {

trunk/BNC/bncrawfile.cpp

@@ -105 +105 @@
 // Raw Input
 ////////////////////////////////////////////////////////////////////////////
-QByteArray bncRawFile::readChunk() {
+QByteArray bncRawFile::readChunk(QByteArray& currStaID, QByteArray& currFormat){
 
   QByteArray data;
@@ -113 +113 @@
     QStringList lst  = line.split(' ');
     
-    QByteArray staID_current  = lst.value(0).toAscii();
-    QByteArray format_current = lst.value(1).toAscii();
-    int        nBytes         = lst.value(2).toInt();
+    currStaID  = lst.value(0).toAscii();
+    currFormat = lst.value(1).toAscii();
+    int nBytes = lst.value(2).toInt();
 
     data = _inpFile->read(nBytes);

trunk/BNC/bncrawfile.h

@@ -43 +43 @@
   QByteArray format() const {return _format;}
   QByteArray staID() const {return _staID;}
-  QByteArray readChunk();
+  QByteArray readChunk(QByteArray& currStaID, QByteArray& currFormat);
   void writeRawData(const QByteArray& data, const QByteArray& staID,
                     const QByteArray& format);