Changeset 2710 in ntrip for trunk/BNC/bnccaster.cpp
- Timestamp:
- Nov 18, 2010, 12:44:38 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bnccaster.cpp
r2709 r2710 171 171 } 172 172 173 _epochs = new QMultiMap<long, p_obs>;173 _epochs = new QMultiMap<long, t_obs*>; 174 174 175 175 _lastDumpSec = 0; … … 198 198 delete _nmeaSockets; 199 199 if (_epochs) { 200 QListIterator< p_obs> it(_epochs->values());200 QListIterator<t_obs*> it(_epochs->values()); 201 201 while (it.hasNext()) { 202 202 delete it.next(); … … 208 208 // New Observations 209 209 //////////////////////////////////////////////////////////////////////////// 210 void bncCaster::newObs(const QByteArray staID, bool firstObs, p_obsobs) {210 void bncCaster::newObs(const QByteArray staID, bool firstObs, t_obs* obs) { 211 211 212 212 QMutexLocker locker(&_mutex); … … 323 323 void bncCaster::addGetThread(bncGetThread* getThread, bool noNewThread) { 324 324 325 qRegisterMetaType<p_obs>("p_obs");325 //// qRegisterMetaType<t_obs*>("p_obs"); 326 326 qRegisterMetaType<gpsephemeris>("gpsephemeris"); 327 327 qRegisterMetaType<glonassephemeris>("glonassephemeris"); 328 328 329 connect(getThread, SIGNAL(newObs(QByteArray, bool, p_obs)),330 this, SLOT(newObs(QByteArray, bool, p_obs))); /// Qt::DirectConnection);329 connect(getThread, SIGNAL(newObs(QByteArray, bool, t_obs*)), 330 this, SLOT(newObs(QByteArray, bool, t_obs*))); /// Qt::DirectConnection); 331 331 332 332 connect(getThread, SIGNAL(getThreadFinished(QByteArray)), … … 385 385 386 386 bool first = true; 387 QList< p_obs> allObs = _epochs->values(sec);388 389 QListIterator< p_obs> it(allObs);387 QList<t_obs*> allObs = _epochs->values(sec); 388 389 QListIterator<t_obs*> it(allObs); 390 390 while (it.hasNext()) { 391 p_obsobs = it.next();391 t_obs* obs = it.next(); 392 392 393 393 if (_samplingRate == 0 || sec % _samplingRate == 0) {
Note:
See TracChangeset
for help on using the changeset viewer.