Changeset 2710 in ntrip for trunk/BNC/bnccaster.cpp

Timestamp:

Nov 18, 2010, 12:44:38 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bnccaster.cpp (modified) (5 diffs)

trunk/BNC/bnccaster.cpp

@@ -171 +171 @@
   }
 
-  _epochs = new QMultiMap<long, p_obs>;
+  _epochs = new QMultiMap<long, t_obs*>;
 
   _lastDumpSec   = 0; 
@@ -198 +198 @@
   delete _nmeaSockets;
   if (_epochs) {
-    QListIterator<p_obs> it(_epochs->values());
+    QListIterator<t_obs*> it(_epochs->values());
     while (it.hasNext()) {
       delete it.next();
@@ -208 +208 @@
 // New Observations
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::newObs(const QByteArray staID, bool firstObs, p_obs obs) {
+void bncCaster::newObs(const QByteArray staID, bool firstObs, t_obs* obs) {
 
   QMutexLocker locker(&_mutex);
@@ -323 +323 @@
 void bncCaster::addGetThread(bncGetThread* getThread, bool noNewThread) {
 
-  qRegisterMetaType<p_obs>("p_obs");
+  ////  qRegisterMetaType<t_obs*>("p_obs");
   qRegisterMetaType<gpsephemeris>("gpsephemeris");
   qRegisterMetaType<glonassephemeris>("glonassephemeris");
 
-  connect(getThread, SIGNAL(newObs(QByteArray, bool, p_obs)),
-          this,      SLOT(newObs(QByteArray, bool, p_obs))); /// Qt::DirectConnection);
+  connect(getThread, SIGNAL(newObs(QByteArray, bool, t_obs*)),
+          this,      SLOT(newObs(QByteArray, bool, t_obs*))); /// Qt::DirectConnection);
 
   connect(getThread, SIGNAL(getThreadFinished(QByteArray)), 
@@ -385 +385 @@
 
     bool first = true;
-    QList<p_obs> allObs = _epochs->values(sec);
-
-    QListIterator<p_obs> it(allObs);
+    QList<t_obs*> allObs = _epochs->values(sec);
+
+    QListIterator<t_obs*> it(allObs);
     while (it.hasNext()) {
-      p_obs obs = it.next();
+      t_obs* obs = it.next();
 
       if (_samplingRate == 0 || sec % _samplingRate == 0) {