Changeset 6579 in ntrip

Timestamp:

Feb 4, 2015, 1:05:32 PM (10 years ago)

Author:

stuerze

Message:

consider type C,L,D,D in scanRtcm()

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (3 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -648 +648 @@
 
     if ( _miscMount == _staID || _miscMount == "ALL" ) {
-
       // RTCM message types
       // ------------------
@@ -663 +662 @@
         bool allFound = true;
         for (unsigned iFrq = 0; iFrq < obs._obs.size(); iFrq++) {
-          QString rnxStr(obs._obs[iFrq]->_rnxType2ch.c_str());
-          if (rnxTypes.indexOf(rnxStr) == -1) {
-            allFound = false;
-            rnxTypes << rnxStr;
+          if (obs._obs[iFrq]->_codeValid) {
+            QString rnxStr('C');
+            rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (rnxTypes.indexOf(rnxStr) == -1) {
+              rnxTypes.push_back(rnxStr);
+              allFound = false;
+            }
+          }
+          if (obs._obs[iFrq]->_phaseValid) {
+            QString rnxStr('L');
+            rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (rnxTypes.indexOf(rnxStr) == -1) {
+              rnxTypes.push_back(rnxStr);
+              allFound = false;
+            }
+          }
+          if (obs._obs[iFrq]->_dopplerValid){
+            QString rnxStr('D');
+            rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (rnxTypes.indexOf(rnxStr) == -1) {
+              rnxTypes.push_back(rnxStr);
+              allFound = false;
+            }
+          }
+          if (obs._obs[iFrq]->_snrValid){
+            QString rnxStr('S');
+            rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (rnxTypes.indexOf(rnxStr) == -1) {
+              rnxTypes.push_back(rnxStr);
+              allFound = false;
+            }
           }
         }
@@ -672 +698 @@
           QString msg; 
           QTextStream str(&msg);
-          str << obs._prn.system() << "    " << rnxTypes.size() << "  ";
+          QString s;
+          str << obs._prn.system() << "    " << s.sprintf("%2d", rnxTypes.size()) << "  ";
           for (int iType = 0; iType < rnxTypes.size(); iType++) {
             str << " " << rnxTypes[iType];