Changeset 6443 in ntrip for trunk/BNC/src/combination/bnccomb.cpp
- Timestamp:
- Dec 26, 2014, 12:47:27 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/combination/bnccomb.cpp
r6330 r6443 127 127 // Constructor 128 128 //////////////////////////////////////////////////////////////////////////// 129 bncComb::bncComb() : bncEphUser(true) {129 bncComb::bncComb() : _ephUser(true) { 130 130 131 131 bncSettings settings; … … 382 382 // Check the Ephemeris 383 383 //-------------------- 384 if (_eph.find(prn) == _eph.end()) { 384 const t_eph* ephLast = _ephUser.ephLast(prn); 385 const t_eph* ephPrev = _ephUser.ephPrev(prn); 386 if (ephLast == 0) { 385 387 emit newMessage("bncComb: eph not found " + prn.toAscii(), true); 386 388 delete newCorr; … … 388 390 } 389 391 else { 390 t_eph* lastEph = _eph[prn]->last; 391 t_eph* prevEph = _eph[prn]->prev; 392 if (lastEph && lastEph->IOD() == newCorr->_iod) { 393 newCorr->_eph = lastEph; 394 } 395 else if (lastEph && prevEph && prevEph->IOD() == newCorr->_iod) { 396 newCorr->_eph = prevEph; 397 switchToLastEph(lastEph, newCorr); 392 if (ephLast->IOD() == newCorr->_iod) { 393 newCorr->_eph = ephLast; 394 } 395 else if (ephPrev && ephPrev->IOD() == newCorr->_iod) { 396 newCorr->_eph = ephPrev; 397 switchToLastEph(ephLast, newCorr); 398 398 } 399 399 else { … … 1051 1051 cmbCorr* corr = im.next(); 1052 1052 QString prn = corr->_prn; 1053 if (_eph.find(prn) == _eph.end()) { 1053 1054 const t_eph* ephLast = _ephUser.ephLast(prn); 1055 const t_eph* ephPrev = _ephUser.ephPrev(prn); 1056 1057 if (ephLast == 0) { 1054 1058 out << "checkOrbit: missing eph (not found) " << corr->_prn << endl; 1055 1059 delete corr; … … 1062 1066 } 1063 1067 else { 1064 if ( corr->_eph == _eph[prn]->last || corr->_eph == _eph[prn]->prev ) {1065 switchToLastEph( _eph[prn]->last, corr);1068 if ( corr->_eph == ephLast || corr->_eph == ephPrev ) { 1069 switchToLastEph(ephLast, corr); 1066 1070 } 1067 1071 else {
Note:
See TracChangeset
for help on using the changeset viewer.