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

Timestamp:

Nov 19, 2008, 2:56:05 PM (15 years ago)

Author:

mervart

Message:

Zdenek Lukes:
a) changed logic how the ephemerides are stored for decoding of message 20/21 RTCM 2.3
b) added some debugging output (enabled is macro DEBUG_RTCM2_2021 is defined)

File:

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

trunk/BNC/bncgetthread.cpp

@@ -41 +41 @@
 #include <stdlib.h>
 #include <iomanip>
+#include <sstream>
 
 #include <QFile>
@@ -543 +544 @@
 
         if (_inspSegm<1) {
-          _decoder->Decode(data, nBytes);
+          vector<string> errmsg;
+          _decoder->Decode(data, nBytes, errmsg);
+#ifdef DEBUG_RTCM2_2021
+          for (unsigned ii = 0; ii < errmsg.size(); ii++) {
+            emit newMessage(_staID + ": " + errmsg[ii].c_str());
+          }
+#endif
         }
         else {
@@ -553 +560 @@
         
             if (decode) { 
-              if ( _decoder->Decode(data, nBytes) == success ) { 
+              vector<string> errmsg;
+              if ( _decoder->Decode(data, nBytes, errmsg) == success ) { 
                 numSucc += 1;
               } 
@@ -559 +567 @@
                 decode = false;
               }
+#ifdef DEBUG_RTCM2_2021
+              for (unsigned ii = 0; ii < errmsg.size(); ii++) {
+                emit newMessage(_staID + ": " + errmsg[ii].c_str());
+              }
+#endif
             }
         
@@ -737 +750 @@
             bool dump = true;
 
-/*   // RTCMv2 XYZ
-     // ----------
-     RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(_decoder);
-     if ( decoder2 && !_rnx_set_position ) {
+            // RTCMv2 XYZ
+            // ----------
+            RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(_decoder);
+            if ( decoder2 && !_rnx_set_position ) {
               double stax, stay, staz;
               double dL1[3], dL2[3];
@@ -746 +759 @@
                                        dL1[0], dL1[1], dL1[2], 
                                        dL2[0], dL2[1], dL2[2]) == success ) {
-                QByteArray msg;
-                QTextStream out(&msg);
-                out.setRealNumberNotation(QTextStream::FixedNotation);
-                out.setRealNumberPrecision(5);
-                ////    _rnx->setApproxPos(stax, stay, staz);
-                out << "STA " << staID()
-                    << ' '    << qSetFieldWidth(15) << stax
-                    << ' '    << qSetFieldWidth(15) << stay
-                    << ' '    << qSetFieldWidth(15) << staz
-                    << " L1 " << qSetFieldWidth(10) << dL1[0]
-                    << ' '    << qSetFieldWidth(10) << dL1[1]
-                    << ' '    << qSetFieldWidth(10) << dL1[2]
-                    << " L2 " << qSetFieldWidth(10) << dL2[0]
-                    << ' '    << qSetFieldWidth(10) << dL2[1]
-                    << ' '    << qSetFieldWidth(10) << dL2[2] << endl;
+
+                ostringstream msg2; msg2.setf(ios::fixed);
+                msg2 << "station coordinates " << staID().data()
+                     << ' ' << setw(14) << setprecision(5) << stax
+                     << ' ' << setw(14) << setprecision(5) << stay
+                     << ' ' << setw(14) << setprecision(5) << staz
+                     << " L1 "
+                     << ' ' << setw(8)  << setprecision(5) << dL1[0]
+                     << ' ' << setw(8)  << setprecision(5) << dL1[1]
+                     << ' ' << setw(8)  << setprecision(5) << dL1[2]
+                     << " L2 "
+                     << ' ' << setw(8)  << setprecision(5) << dL2[0]
+                     << ' ' << setw(8)  << setprecision(5) << dL2[1]
+                     << ' ' << setw(8)  << setprecision(5) << dL2[2] 
+                     << ends;
                 _rnx_set_position = true;
-                emit newMessage(msg);
+                emit newMessage(QByteArray(msg2.str().c_str()));
               }
-            }  */
-
-            ////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));
@@ -942 +943 @@
     QMutexLocker locker(&_mutex);
   
-    decoder->storeEph(gpseph);
-  }
-}
-
+    string storedPRN;
+    vector<int> IODs;
+    
+    if ( decoder->storeEph(gpseph, storedPRN, IODs) ) {
+#ifdef DEBUG_RTCM2_2021
+      QString msg = _staID + QString(": stored eph %1 IODs").arg(storedPRN.c_str());
+      
+      for (unsigned ii = 0; ii < IODs.size(); ii++) {
+        msg += QString(" %1").arg(IODs[ii],4);
+      }
+      
+      emit(newMessage(msg.toAscii()));
+#endif
+    }
+  }
+}
+