Changeset 2711 in ntrip for trunk/BNC/RTCM/RTCM2Decoder.cpp

Timestamp:

Nov 18, 2010, 1:38:51 PM (13 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -140 +140 @@
           
         for (int iSat=0; iSat < _ObsBlock.nSat; iSat++) {
-          t_obs* obs = new t_obs();
-          _obsList.push_back(obs);
+          t_obs obs;
           if (_ObsBlock.PRN[iSat] > 100) {
-            obs->satNum      = _ObsBlock.PRN[iSat] % 100;
-            obs->satSys      = 'R';
+            obs.satNum      = _ObsBlock.PRN[iSat] % 100;
+            obs.satSys      = 'R';
           }                     
           else {                
-            obs->satNum      = _ObsBlock.PRN[iSat];
-            obs->satSys      = 'G';
+            obs.satNum      = _ObsBlock.PRN[iSat];
+            obs.satSys      = 'G';
           }                     
-          obs->GPSWeek       = epochWeek;
-          obs->GPSWeeks      = epochSecs;
-          obs->C1            = _ObsBlock.rng_C1[iSat];
-          obs->P1            = _ObsBlock.rng_P1[iSat];
-          obs->P2            = _ObsBlock.rng_P2[iSat];
-          obs->L1P           = _ObsBlock.resolvedPhase_L1(iSat);
-          obs->L2P           = _ObsBlock.resolvedPhase_L2(iSat);
-          obs->slip_cnt_L1   = _ObsBlock.slip_L1[iSat];
-          obs->slip_cnt_L2   = _ObsBlock.slip_L2[iSat];
+          obs.GPSWeek       = epochWeek;
+          obs.GPSWeeks      = epochSecs;
+          obs.C1            = _ObsBlock.rng_C1[iSat];
+          obs.P1            = _ObsBlock.rng_P1[iSat];
+          obs.P2            = _ObsBlock.rng_P2[iSat];
+          obs.L1P           = _ObsBlock.resolvedPhase_L1(iSat);
+          obs.L2P           = _ObsBlock.resolvedPhase_L2(iSat);
+          obs.slip_cnt_L1   = _ObsBlock.slip_L1[iSat];
+          obs.slip_cnt_L2   = _ObsBlock.slip_L2[iSat];
+
+          _obsList.push_back(obs);
         }
         _ObsBlock.clear();
@@ -435 +436 @@
     // Store new observation
     if ( new_obs ) {
-      _obsList.push_back( new_obs );
-
-      ////ostringstream hasIODstr;
-      ////copy(hasIOD.begin(), hasIOD.end(), ostream_iterator<string>(hasIODstr, "    "));
-      ////errmsg.push_back("decoded PRN " + PRN + " : " + hasIODstr.str());
-    }
-  }
-}
+      _obsList.push_back(*new_obs);
+    }
+  }
+}