Changeset 627 in ntrip

Timestamp:

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

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2Decoder.cpp (modified) (2 diffs)
• RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)
• RTIGS/RTIGSDecoder.cpp (modified) (2 diffs)
• run_valgrind (modified) (1 diff)
• test_bnc_qt.cpp (modified) (1 diff)

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -87 +87 @@
         for (int iSat=0; iSat < _ObsBlock.nSat; iSat++) {
           p_obs obs = new t_obs();
+          _obsList.push_back(obs);
           if (_ObsBlock.PRN[iSat] > 100) {
             obs->_o.satNum = _ObsBlock.PRN[iSat] % 100;
@@ -102 +103 @@
           obs->_o.L1       = _ObsBlock.resolvedPhase_L1(iSat);
           obs->_o.L2       = _ObsBlock.resolvedPhase_L2(iSat);
-
-          _obsList.push_back(obs);
         }
         _ObsBlock.clear();

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);
           }
         }

trunk/BNC/RTIGS/RTIGSDecoder.cpp

@@ -105 +105 @@
     for (short ii = 0; ii < numObs; ii++) {
       p_obs obs = new t_obs();
+      _obsList.push_back(obs);
       obs->_o.satSys   = 'G';
       obs->_o.satNum   = _GPSTrans.DecObs.Obs[ii].sat_prn;
@@ -118 +119 @@
       obs->_o.SNR1     = int(ceil(_GPSTrans.DecObs.Obs[ii].l1_sn / 60.0 * 9.0));
       obs->_o.SNR2     = int(ceil(_GPSTrans.DecObs.Obs[ii].l2_sn / 60.0 * 9.0));
-
-      _obsList.push_back(obs);
     }
   }

trunk/BNC/run_valgrind

@@ -2 +2 @@
 if [ "$1" == "start" ]
 then
-  valgrind --leak-check=full --show-reachable=yes ./bnc -nw 2> valgrind.txt &
+  valgrind --leak-check=full ./bnc -nw 2> valgrind.txt &
 elif [ "$1" == "stop" ]
 then

trunk/BNC/test_bnc_qt.cpp

@@ -85 +85 @@
   // Receive Data
   // ------------
-  Observation obs;
+  t_obsInternal obs;
   char flag = ' ';
   cout.setf(ios::showpoint | ios::fixed);