Changeset 2711 in ntrip for trunk/BNC/bncgetthread.cpp
- Timestamp:
- Nov 18, 2010, 1:38:51 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bncgetthread.cpp
r2710 r2711 374 374 // Delete old observations 375 375 // ----------------------- 376 QListIterator<t_obs*> itOld(_decoder->_obsList);377 while (itOld.hasNext()) {378 delete itOld.next();379 }380 376 _decoder->_obsList.clear(); 381 377 … … 439 435 // Loop over all observations (observations output) 440 436 // ------------------------------------------------ 441 QListIterator<t_obs*> it(_decoder->_obsList); 437 QListIterator<t_obs> it(_decoder->_obsList); 438 bool firstObs = true; 442 439 while (it.hasNext()) { 443 t_obs*obs = it.next();444 440 const t_obs& obs = it.next(); 441 445 442 // Check observation epoch 446 443 // ----------------------- … … 451 448 const double secPerWeek = 7.0 * 24.0 * 3600.0; 452 449 453 double currSec = week 454 double obsSec = obs ->GPSWeek * secPerWeek + obs->GPSWeeks;450 double currSec = week * secPerWeek + sec; 451 double obsSec = obs.GPSWeek * secPerWeek + obs.GPSWeeks; 455 452 456 453 const double maxDt = 600.0; … … 458 455 if (fabs(currSec - obsSec) > maxDt) { 459 456 emit( newMessage(_staID + ": Wrong observation epoch(s)", false) ); 460 delete obs;461 457 continue; 462 458 } … … 466 462 // ------------ 467 463 if (_rnx) { 468 long iSec = long(floor(obs ->GPSWeeks+0.5));469 long newTime = obs ->GPSWeek * 7*24*3600 + iSec;464 long iSec = long(floor(obs.GPSWeeks+0.5)); 465 long newTime = obs.GPSWeek * 7*24*3600 + iSec; 470 466 if (_samplingRate == 0 || iSec % _samplingRate == 0) { 471 467 _rnx->deepCopy(obs); … … 484 480 // Emit new observation signal 485 481 // --------------------------- 486 bool firstObs = (obs == _decoder->_obsList.first()); 487 obs->_status = t_obs::posted; 488 if (!_isToBeDeleted) { 489 emit newObs(_staID, firstObs, obs); 490 } 482 if (!_isToBeDeleted) { 483 emit newObs(_staID, firstObs, obs); 484 } 485 firstObs = false; 491 486 } 492 487 _decoder->_obsList.clear();
Note:
See TracChangeset
for help on using the changeset viewer.