Changeset 2711 in ntrip for trunk/BNC/bncgetthread.cpp

Timestamp:

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

Author:

mervart

Message:

 

File:

• trunk/BNC/bncgetthread.cpp (modified) (6 diffs)

trunk/BNC/bncgetthread.cpp

@@ -374 +374 @@
       // Delete old observations
       // -----------------------
-      QListIterator<t_obs*> itOld(_decoder->_obsList);
-      while (itOld.hasNext()) {
-        delete itOld.next();
-      }
       _decoder->_obsList.clear();
 
@@ -439 +435 @@
       // Loop over all observations (observations output)
       // ------------------------------------------------
-      QListIterator<t_obs*> it(_decoder->_obsList);
+      QListIterator<t_obs> it(_decoder->_obsList);
+      bool firstObs = true;
       while (it.hasNext()) {
-        t_obs* obs = it.next();
-      
+        const t_obs& obs = it.next();
+
         // Check observation epoch
         // -----------------------
@@ -451 +448 @@
           const double secPerWeek = 7.0 * 24.0 * 3600.0;
           
-          double currSec = week         * secPerWeek + sec;
-          double obsSec  = obs->GPSWeek * secPerWeek + obs->GPSWeeks;
+          double currSec = week        * secPerWeek + sec;
+          double obsSec  = obs.GPSWeek * secPerWeek + obs.GPSWeeks;
 
           const double maxDt = 600.0;
@@ -458 +455 @@
           if (fabs(currSec - obsSec) > maxDt) {
               emit( newMessage(_staID + ": Wrong observation epoch(s)", false) );
-            delete obs;
             continue;
           }
@@ -466 +462 @@
         // ------------
         if (_rnx) {
-          long iSec    = long(floor(obs->GPSWeeks+0.5));
-          long newTime = obs->GPSWeek * 7*24*3600 + iSec;
+          long iSec    = long(floor(obs.GPSWeeks+0.5));
+          long newTime = obs.GPSWeek * 7*24*3600 + iSec;
           if (_samplingRate == 0 || iSec % _samplingRate == 0) {
             _rnx->deepCopy(obs);
@@ -484 +480 @@
         // Emit new observation signal
         // ---------------------------
-        bool firstObs = (obs == _decoder->_obsList.first());
-        obs->_status = t_obs::posted;
-         if (!_isToBeDeleted) {
-           emit newObs(_staID, firstObs, obs);
-         }
+        if (!_isToBeDeleted) {
+          emit newObs(_staID, firstObs, obs);
+        }
+        firstObs = false;
       }
       _decoder->_obsList.clear();