Changeset 3588 in ntrip for trunk/BNC/combination/bnccomb.cpp
- Timestamp:
- Jan 19, 2012, 5:44:10 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/combination/bnccomb.cpp
r3556 r3588 262 262 _buffer.remove(epoTime); 263 263 } 264 QMapIterator<QString, cmbCorr*> itOrbCorr(_orbitCorrs); 265 while (itOrbCorr.hasNext()) { 266 itOrbCorr.next(); 267 delete itOrbCorr.value(); 268 } 264 269 } 265 270 … … 302 307 } 303 308 309 // Save Orbit-Only Corrections 310 // --------------------------- 311 if (newCorr->raoSet && !newCorr->dClkSet) { 312 QString corrID = newCorr->ID(); 313 if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) { 314 delete _orbitCorrs[corrID]; 315 } 316 _orbitCorrs[corrID] = new cmbCorr(*newCorr); 317 } 318 304 319 // Check Modulo Time 305 320 // ----------------- … … 314 329 delete newCorr; 315 330 return; 331 } 332 333 // Merge with saved orbit correction 334 // --------------------------------- 335 if (newCorr->dClkSet && !newCorr->raoSet) { 336 QString corrID = newCorr->ID(); 337 if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) { 338 mergeOrbitCorr(_orbitCorrs[corrID], newCorr); 339 } 316 340 } 317 341 … … 362 386 } 363 387 if (existingCorr) { 364 delete newCorr; 388 delete newCorr; newCorr = 0; 365 389 existingCorr->readLine(line); // merge (multiple messages) 390 366 391 } 367 392 else { … … 1119 1144 return success; 1120 1145 } 1146 1147 // 1148 //////////////////////////////////////////////////////////////////////////// 1149 t_irc bncComb::mergeOrbitCorr(const cmbCorr* orbitCorr, cmbCorr* clkCorr) { 1150 1151 1152 return success; 1153 }
Note:
See TracChangeset
for help on using the changeset viewer.