Changeset 6194 in ntrip for trunk/BNC/src/RTCM

Timestamp:

Sep 14, 2014, 5:12:48 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/RTCM/RTCM2Decoder.cpp (modified) (5 diffs)

trunk/BNC/src/RTCM/RTCM2Decoder.cpp

@@ -141 +141 @@
           }                     
           else {
-            obs._prn.set('R', _ObsBlock.PRN[iSat]);
+            obs._prn.set('G', _ObsBlock.PRN[iSat]);
           }                     
+          char sys = obs._prn.system();
           obs._time.set(epochWeek, epochSecs);
           t_frqObs* frqObs1C = new t_frqObs;
@@ -151 +152 @@
 
           t_frqObs* frqObs1P = new t_frqObs;
-          frqObs1P->_rnxType2ch  = "1P";
+          frqObs1P->_rnxType2ch  = (sys == 'G') ? "1W" : "1P";
           frqObs1P->_codeValid   = true;
           frqObs1P->_code        = _ObsBlock.rng_P1[iSat];
@@ -161 +162 @@
 
           t_frqObs* frqObs2P = new t_frqObs;
-          frqObs2P->_rnxType2ch  = "2P";
+          frqObs2P->_rnxType2ch  = (sys == 'G') ? "2W" : "2P";
           frqObs2P->_codeValid   = true;
           frqObs2P->_code        = _ObsBlock.rng_P2[iSat];
@@ -281 +282 @@
 
     QString prn;
+    char    sys;
     if (corr->PRN < 200) {
-      prn = 'G' + QString("%1").arg(corr->PRN, 2, 10, QChar('0'));
+      sys = 'G';
+      prn = sys + QString("%1").arg(corr->PRN, 2, 10, QChar('0'));
     }
     else {
-      prn = 'R' + QString("%1").arg(corr->PRN - 200, 2, 10, QChar('0'));
+      sys = 'R';
+      prn = sys + QString("%1").arg(corr->PRN - 200, 2, 10, QChar('0'));
     }
 
@@ -304 +308 @@
 
     t_frqObs* frqObs1P = new t_frqObs;
-    frqObs1P->_rnxType2ch  = "1P";
+    frqObs1P->_rnxType2ch  = (sys == 'G') ? "1W" : "1P";
     new_obs->_obs.push_back(frqObs1P);
 
     t_frqObs* frqObs2P = new t_frqObs;
-    frqObs2P->_rnxType2ch  = "2P";
+    frqObs2P->_rnxType2ch  = (sys == 'G') ? "2W" : "2P";
     new_obs->_obs.push_back(frqObs2P);