Changeset 3558 in ntrip

Timestamp:

Dec 24, 2011, 8:30:36 AM (12 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/bncgetthread.cpp

@@ -285 +285 @@
            _format.indexOf("RTCM 3") != -1 ) {
     emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
-    _decoders[_staID] = new RTCM3Decoder(_staID, _rawFile);
-    connect((RTCM3Decoder*) decoder(), SIGNAL(newMessage(QByteArray,bool)), 
+    RTCM3Decoder* newDecoder = new RTCM3Decoder(_staID, _rawFile);
+    _decoders[_staID] = newDecoder;
+    connect((RTCM3Decoder*) newDecoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));
   }
@@ -313 +314 @@
   msleep(100); //sleep 0.1 sec
   
-  if (decoder()) {
-    decoder()->initRinex(_staID, _mountPoint, _latitude, _longitude, 
-                         _nmea, _ntripVersion);
-
+  if (_decoders.contains(_staID)) {
+    _decoders[_staID]->initRinex(_staID, _mountPoint, _latitude, _longitude, 
+                                 _nmea, _ntripVersion);
+  }
+  else {
+    emit(newMessage(_staID + ": no decoder initialized " + _format, true));
+    _isToBeDeleted = true;
+    return failure;
   }
 
@@ -342 +347 @@
 GPSDecoder* bncGetThread::decoder() {
   if (_decoders.contains(_staID) || initDecoder() == success) {
-    return _decoders.value(_staID);
+    return _decoders[_staID];
   }
   else {
@@ -642 +647 @@
 void bncGetThread::scanRTCM() {
 
+  if (!decoder()) {
+    return;
+  }
+
   bncSettings settings;
   if ( Qt::CheckState(settings.value("scanRTCM").toInt()) == Qt::Checked ) {
@@ -746 +755 @@
 //////////////////////////////////////////////////////////////////////////////
 void bncGetThread::slotNewEphGPS(gpsephemeris gpseph) {
+
+  if (!decoder()) {
+    return;
+  }
+
   RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(decoder());
   RTCM3Decoder* decoder3 = dynamic_cast<RTCM3Decoder*>(decoder());