Changeset 624 in ntrip

Timestamp:

Dec 16, 2007, 4:53:14 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.h (modified) (2 diffs)
• bnccaster.cpp (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)

trunk/BNC/RTCM/GPSDecoder.h

@@ -76 +76 @@
   }
 
-  ~t_obs() {
-    if (_status == posted) {
-      return;
-    }
-  }
-
   t_obsInternal _o;
   t_obs_status  _status;
@@ -95 +89 @@
     QListIterator<p_obs> it(_obsList);
     while (it.hasNext()) {
-      delete it.next();
+      p_obs obs = it.next();
+      if (obs->_status == t_obs::initial) {
+        delete obs;
+      }
     }
   }

trunk/BNC/bnccaster.cpp

@@ -122 +122 @@
 
   QMutexLocker locker(&_mutex);
+
+  obs->_status = t_obs::received;
 
   long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
@@ -173 +175 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncCaster::addGetThread(bncGetThread* getThread) {
+
+  qRegisterMetaType<p_obs>("p_obs");
+
   connect(getThread, SIGNAL(newObs(const QByteArray, bool, p_obs)),
           this,      SLOT(newObs(const QByteArray, bool, p_obs)));

trunk/BNC/bncgetthread.cpp

@@ -444 +444 @@
 
           bool firstObs = (obs == _decoder->_obsList.first());
+          obs->_status = t_obs::posted;
           emit newObs(_staID, firstObs, obs);
         }

trunk/BNC/bncmain.cpp

@@ -117 +117 @@
 
     //// beg test
-    QTimer::singleShot(30000, &app, SLOT(slotQuit()));
+    ////    QTimer::singleShot(30000, &app, SLOT(slotQuit()));
     //// end test