Changeset 3435 in ntrip for trunk


Ignore:
Timestamp:
Sep 21, 2011, 6:59:54 PM (13 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/combination/bnccomb.cpp

    r3434 r3435  
    241241  // Delete old corrections
    242242  // ----------------------
    243   if (newCorr->tt < _resTime) {
     243  if (_resTime.valid() && newCorr->tt < _resTime) {
    244244    delete newCorr;
    245245    return;
     
    268268  }
    269269
    270   // Process previous Epoch
    271   // ----------------------
    272   if (_resTime.valid() && _resTime < newCorr->tt) {
    273     processEpoch();
    274   }
    275 
    276   // Remember last correction time
    277   // -----------------------------
    278   _resTime = newCorr->tt;
     270  // Process previous Epoch(s)
     271  // -------------------------
     272  QListIterator<bncTime> itTime(_buffer.keys());
     273  while (itTime.hasNext()) {
     274    bncTime epoTime = itTime.next();
     275    if (epoTime < newCorr->tt) {
     276      _resTime = epoTime;
     277      processEpoch();
     278    }
     279  }
    279280
    280281  // Merge or add the correction
    281282  // ---------------------------
     283  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt].corrs;
    282284  cmbCorr* existingCorr = 0;
    283   QVectorIterator<cmbCorr*> itCorr(corrs());
     285  QVectorIterator<cmbCorr*> itCorr(corrs);
    284286  while (itCorr.hasNext()) {
    285287    cmbCorr* hlp = itCorr.next();
     
    294296  }
    295297  else {
    296     corrs().append(newCorr);
     298    corrs.append(newCorr);
    297299  }
    298300}
Note: See TracChangeset for help on using the changeset viewer.