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

Timestamp:

Aug 24, 2006, 2:41:37 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

File:

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

trunk/BNC/bncgetthread.cpp

@@ -22 +22 @@
 #include "bncgetthread.h"
 #include "RTCM/RTCM.h"
+#include "RTIGS/rtigs.h"
 
 using namespace std;
@@ -134 +135 @@
   // Instantiate the filter
   // ----------------------
-  GPSDecoder* rtcmFilter;
+  GPSDecoder* decoder;
 
   if      (_format.indexOf("RTCM_2") != -1) {
     qWarning("Get Data: " + _mountPoint + " in RTCM 2.x format");
-    rtcmFilter = new RTCM('A',true);
+    decoder = new RTCM('A',true);
   }
   else if (_format.indexOf("RTCM_3") != -1) {
@@ -147 +148 @@
   else if (_format.indexOf("RTIGS") != -1) {
     qWarning("Get Data: " + _mountPoint + " in RTIGS format");
-    qWarning("Not yet implemented");
+    decoder = new rtigs();
     return exit(1);
   }
   else {
-    qWarning("Unknown data format");
+    qWarning(_mountPoint + " Unknown data format " + _format);
     return exit(1);
   }
@@ -163 +164 @@
       char* data = new char[nBytes];
       _socket->read(data, nBytes);
-      rtcmFilter->Decode(data, nBytes);
+      decoder->Decode(data, nBytes);
       delete data;
-      for (list<Observation*>::iterator it = rtcmFilter->m_lObsList.begin(); 
-           it != rtcmFilter->m_lObsList.end(); it++) {
+      for (list<Observation*>::iterator it = decoder->m_lObsList.begin(); 
+           it != decoder->m_lObsList.end(); it++) {
         emit newObs(_mountPoint, *it);
       }
-      rtcmFilter->m_lObsList.clear();
+      decoder->m_lObsList.clear();
     }
     else {
@@ -176 +177 @@
     }
   }
-  delete rtcmFilter;
+  delete decoder;
 }