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

Timestamp:

Aug 7, 2008, 4:01:56 PM (16 years ago)

Author:

zdenek

Message:

Zdenek Lukes: added logic for decoding of message 20/21 from RTCM 2.3 streams

File:

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

trunk/BNC/bncgetthread.cpp

@@ -140 +140 @@
     _rnx = new bncRinex(_staID, mountPoint, format, latitude, longitude, nmea);
   }
+  _rnx_set_position = false;
 
   msleep(100); //sleep 0.1 sec
@@ -156 +157 @@
   }
   delete _decoder;
-  delete _rnx;    
+  delete _rnx;
 }
 
@@ -365 +366 @@
     if      (_format.indexOf("RTCM_2") != -1) {
       emit(newMessage("Get Data: " + _staID + " in RTCM 2.x format"));
-      _decoder = new RTCM2Decoder();
+      _decoder = new RTCM2Decoder(_staID.data());
     }
     else if (_format.indexOf("RTCM_3") != -1) {
@@ -557 +558 @@
 
         delete [] data;
-        
+
         QListIterator<p_obs> it(_decoder->_obsList);
         while (it.hasNext()) {
@@ -645 +646 @@
           // ------------
           if (_rnx) {
-             long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
-             long newTime = obs->_o.GPSWeek * 7*24*3600 + iSec;
-            if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-              _rnx->deepCopy(obs);
-            }
-            _rnx->dumpEpoch(newTime);
-          }
-
+            bool dump = true;
+
+            RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(_decoder);
+            if ( decoder2 && !_rnx_set_position ) {
+              double stax, stay, staz;
+              if ( decoder2->getStaCrd(stax, stay, staz) == success ) {
+                _rnx->setApproxPos(stax, stay, staz);
+                _rnx_set_position = true;
+              }
+              else {
+                dump = false;
+              }
+            }
+              
+            if ( dump ) {
+              long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
+              long newTime = obs->_o.GPSWeek * 7*24*3600 + iSec;
+              if (_samplingRate == 0 || iSec % _samplingRate == 0) {
+                _rnx->deepCopy(obs);
+              }
+              _rnx->dumpEpoch(newTime);
+            }
+          }
+
+          // Emit new observation signal
+          // ---------------------------
           bool firstObs = (obs == _decoder->_obsList.first());
           obs->_status = t_obs::posted;
@@ -736 +755 @@
   }
 }
+
+//
+//////////////////////////////////////////////////////////////////////////////
+void bncGetThread::slotNewEphGPS(gpsephemeris gpseph) {
+  RTCM2Decoder* decoder = dynamic_cast<RTCM2Decoder*>(_decoder);
+
+  if ( decoder ) {
+    QMutexLocker locker(&_mutex);
+  
+    decoder->storeEph(gpseph);
+  }
+}
+