Changeset 627 in ntrip for trunk/BNC/RTCM3/RTCM3Decoder.cpp

Timestamp:

Dec 16, 2007, 6:05:06 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -112 +112 @@
           for (int ii = 0; ii < _Parser.Data.numsats; ii++) {
             p_obs obs = new t_obs();
+            _obsList.push_back(obs);
             if      (_Parser.Data.satellites[ii] <= PRN_GPS_END) {
               obs->_o.satSys = 'G';
@@ -145 +146 @@
                 }
               }
-            if(!v)
-            { continue; }
-            else
-            {
-              if      (_Parser.dataflag[jj] & GNSSDF_C1DATA) {
-                obs->_o.C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              }
-              else if (_Parser.dataflag[jj] & GNSSDF_C2DATA) {
-                obs->_o.C2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              }
-              else if (_Parser.dataflag[jj] & GNSSDF_P1DATA) {
-                obs->_o.P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              }
-              else if (_Parser.dataflag[jj] & GNSSDF_P2DATA) {
-                obs->_o.P2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              }
-              else if (df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) {
-                obs->_o.L1   = _Parser.Data.measdata[ii][pos];
-                obs->_o.SNR1 = _Parser.Data.snrL1[ii];
-              }
-              else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
-                obs->_o.L2   = _Parser.Data.measdata[ii][pos];
-                obs->_o.SNR2 = _Parser.Data.snrL2[ii];
-              }
-              else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {
-                obs->_o.S1   = _Parser.Data.measdata[ii][pos];
-              }
-              else if (df & (GNSSDF_S2CDATA|GNSSDF_S2PDATA)) {
-                obs->_o.S2   = _Parser.Data.measdata[ii][pos];
+              if (!v) { 
+                continue; 
+              }
+              else
+              {
+                if      (_Parser.dataflag[jj] & GNSSDF_C1DATA) {
+                  obs->_o.C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
+                }
+                else if (_Parser.dataflag[jj] & GNSSDF_C2DATA) {
+                  obs->_o.C2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
+                }
+                else if (_Parser.dataflag[jj] & GNSSDF_P1DATA) {
+                  obs->_o.P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
+                }
+                else if (_Parser.dataflag[jj] & GNSSDF_P2DATA) {
+                  obs->_o.P2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
+                }
+                else if (df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) {
+                  obs->_o.L1   = _Parser.Data.measdata[ii][pos];
+                  obs->_o.SNR1 = _Parser.Data.snrL1[ii];
+                }
+                else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
+                  obs->_o.L2   = _Parser.Data.measdata[ii][pos];
+                  obs->_o.SNR2 = _Parser.Data.snrL2[ii];
+                }
+                else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {
+                  obs->_o.S1   = _Parser.Data.measdata[ii][pos];
+                }
+                else if (df & (GNSSDF_S2CDATA|GNSSDF_S2PDATA)) {
+                  obs->_o.S2   = _Parser.Data.measdata[ii][pos];
+                }
               }
             }
-            }
-            _obsList.push_back(obs);
           }
         }