Changeset 2711 in ntrip for trunk/BNC/RTCM

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/RTCM

Files:

• GPSDecoder.h (modified) (4 diffs)
• RTCM2Decoder.cpp (modified) (2 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -36 +36 @@
 class t_obs {
  public:
-  enum t_obs_status {initial, posted, received};
   t_obs() {
-    _status     = initial;
     satSys      = 'G';
     satNum      = 0;
@@ -76 +74 @@
   double S1() const {return (L1P != 0.0 ? S1P : S1C);}
   double S2() const {return (L2P != 0.0 ? S2P : S2C);}
-
-  t_obs_status  _status;
 
   char   StatID[20+1]; // Station ID
@@ -118 +114 @@
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg) = 0;
 
-  virtual ~GPSDecoder() {
-    QListIterator<t_obs*> it(_obsList);
-    while (it.hasNext()) {
-      t_obs* obs = it.next();
-      if (obs && obs->_status == t_obs::initial) {
-        delete obs;
-      }
-    }
-  }
+  virtual ~GPSDecoder() {}
 
   virtual int corrGPSEpochTime() const {return -1;}
@@ -149 +137 @@
   };
 
-  QList<t_obs*>    _obsList;
+  QList<t_obs>     _obsList;
   QList<int>       _typeList;  // RTCM   message types
   QStringList      _antType;   // RTCM   antenna descriptor

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