Changeset 3556 in ntrip for trunk/BNC/combination/bnccomb.cpp
- Timestamp:
- Dec 23, 2011, 11:19:11 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/combination/bnccomb.cpp
r3555 r3556 257 257 delete _params[iPar-1]; 258 258 } 259 QListIterator< unsigned long> itTime(_buffer.keys());259 QListIterator<bncTime> itTime(_buffer.keys()); 260 260 while (itTime.hasNext()) { 261 _buffer.remove(itTime.next()); 261 bncTime epoTime = itTime.next(); 262 _buffer.remove(epoTime); 262 263 } 263 264 } … … 339 340 // Process previous Epoch(s) 340 341 // ------------------------- 341 QListIterator< unsigned long> itTime(_buffer.keys());342 QListIterator<bncTime> itTime(_buffer.keys()); 342 343 while (itTime.hasNext()) { 343 unsigned longepoTime = itTime.next();344 if (epoTime < (newCorr->tt - moduloTime).longSec()) {345 _resTime = _buffer[epoTime].tt();344 bncTime epoTime = itTime.next(); 345 if (epoTime < newCorr->tt - moduloTime) { 346 _resTime = epoTime; 346 347 processEpoch(); 347 348 } … … 350 351 // Merge or add the correction 351 352 // --------------------------- 352 QVector<cmbCorr*>& corrs = _buffer[newCorr->tt .longSec()].corrs;353 QVector<cmbCorr*>& corrs = _buffer[newCorr->tt].corrs; 353 354 cmbCorr* existingCorr = 0; 354 355 QVectorIterator<cmbCorr*> itCorr(corrs); … … 366 367 else { 367 368 corrs.append(newCorr); 368 }369 370 if (_resTime.valid()) {371 QListIterator<unsigned long> it(_buffer.keys());372 while (it.hasNext()) {373 unsigned long epoTime = it.next();374 if (epoTime <= _resTime.longSec()) {375 _buffer.remove(epoTime);376 }377 }378 369 } 379 370 } … … 460 451 if (_masterMissingEpochs < 10) { 461 452 out << "Missing Master, Epoch skipped" << endl; 462 _buffer.remove(_resTime .longSec());453 _buffer.remove(_resTime); 463 454 emit newMessage(_log, false); 464 455 return; … … 521 512 // Delete Data, emit Message 522 513 // ------------------------- 523 _buffer.remove(_resTime .longSec());514 _buffer.remove(_resTime); 524 515 emit newMessage(_log, false); 525 516 } … … 885 876 } 886 877 if (!foundMaster) { 878 delete corr; 887 879 it.remove(); 888 880 } … … 983 975 if (maxRes > _MAXRES) { 984 976 out << " Outlier" << endl; 977 delete corrs()[maxResIndex-1]; 985 978 corrs().remove(maxResIndex-1); 986 979 } … … 1020 1013 if (_eph.find(prn) == _eph.end()) { 1021 1014 out << "checkOrbit: missing eph (not found) " << corr->prn << endl; 1015 delete corr; 1022 1016 im.remove(); 1023 1017 } 1024 1018 else if (corr->eph == 0) { 1025 1019 out << "checkOrbit: missing eph (zero) " << corr->prn << endl; 1020 delete corr; 1026 1021 im.remove(); 1027 1022 } … … 1032 1027 else { 1033 1028 out << "checkOrbit: missing eph (deleted) " << corr->prn << endl; 1029 delete corr; 1034 1030 im.remove(); 1035 1031 } … … 1096 1092 QString prn = corr->prn; 1097 1093 if (numCorr[prn] < 2) { 1094 delete corr; 1098 1095 im.remove(); 1099 1096 } … … 1108 1105 << corr->iod << " " 1109 1106 << norm << endl; 1107 delete corr; 1110 1108 im.remove(); 1111 1109 removed = true;
Note:
See TracChangeset
for help on using the changeset viewer.