Changeset 6580 in ntrip

Timestamp:

Feb 4, 2015, 5:13:03 PM (9 years ago)

Author:

stuerze

Message:

consider RTCM2/RINEX2 in scanRTCM()

Location:

trunk/BNC/src

Files:

• bncgetthread.cpp (modified) (4 diffs)
• bncgetthread.h (modified) (1 diff)

trunk/BNC/src/bncgetthread.cpp

@@ -665 +665 @@
             QString rnxStr('C');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -673 +678 @@
             QString rnxStr('L');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -681 +691 @@
             QString rnxStr('D');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -689 +704 @@
             QString rnxStr('S');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);

trunk/BNC/src/bncgetthread.h

@@ -36 +36 @@
 #include "bncrawfile.h"
 #include "satObs.h"
+#include "rinex/rnxobsfile.h"
 
 class GPSDecoder;