Changeset 423 in ntrip for trunk

Timestamp:

Mar 28, 2007, 2:55:26 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncgetthread.cpp (modified) (5 diffs)
• bncgetthread.h (modified) (1 diff)
• bnczerodecoder.cpp (added)
• bnczerodecoder.h (added)

trunk/BNC/bnc.pro

@@ -14 +14 @@
 HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h  \
           bnccaster.h bncrinex.h bncapp.h bncutils.h   bnchlpdlg.h    \
-          bncconst.h bnchtml.h bnctableitem.h                         \
+          bncconst.h bnchtml.h bnctableitem.h bnczerodecoder.h        \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex.h                   \
@@ -23 +23 @@
           bnccaster.cpp bncrinex.cpp bncapp.cpp bncutils.cpp          \
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
+          bnczerodecoder.cpp                                          \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex.cpp               \

trunk/BNC/bncgetthread.cpp

@@ -52 +52 @@
 #include "bncutils.h"
 #include "bncrinex.h"
+#include "bnczerodecoder.h"
 
 #include "RTCM/RTCM2Decoder.h"
@@ -67 +68 @@
                            const QByteArray& nmea, int iMount) {
   _decoder    = 0;
-  _zeroDecoder= false;
   _mountPoint = mountPoint;
   _staID      = mountPoint.path().mid(1).toAscii();
@@ -302 +302 @@
   // Instantiate the filter
   // ----------------------
-  if (!_decoder && !_zeroDecoder) { 
+  if (!_decoder) { 
     if      (_format.indexOf("RTCM_2") != -1) {
       emit(newMessage("Get Data: " + _staID + " in RTCM 2.x format"));
@@ -315 +315 @@
       _decoder = new RTIGSDecoder();
     }
-    else if (_format.indexOf("SP3") != -1) {
-      emit(newMessage("Get Data in SP3 format"));
-      _zeroDecoder = true;
+    else if (_format.indexOf("SP3") != -1 || _format.indexOf("ASCII") != -1) {
+      emit(newMessage("Get Data in ASCII format"));
+      _decoder = new bncZeroDecoder();
     }
     else {
@@ -358 +358 @@
         _socket->read(data, nBytes);
 
-        if (_zeroDecoder) {
-          cout.write(data, nBytes);
-          continue;
-        }
-
         _decoder->Decode(data, nBytes);
         delete [] data;
+        
         for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
              it != _decoder->_obsList.end(); it++) {

trunk/BNC/bncgetthread.h

@@ -76 +76 @@
    int         _nextSleep;
    int         _iMount;
-   bool        _zeroDecoder;
    int         _samplingRate;
    bncRinex*   _rnx;