Changeset 3299 in ntrip for trunk/BNC/combination


Ignore:
Timestamp:
Jun 16, 2011, 5:11:50 PM (13 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/combination
Files:
2 edited

Legend:

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

    r3298 r3299  
    225225  }
    226226
    227   // Reject delayed corrections
    228   // --------------------------
    229   if (_processedBeforeTime.valid() && newCorr->tt < _processedBeforeTime) {
     227  // Remember last correction time
     228  // -----------------------------
     229  if (!_lastCorrTime.valid() || _lastCorrTime < newCorr->tt) {
     230    _lastCorrTime = newCorr->tt;
     231  }
     232
     233  bncTime processTime = _lastCorrTime - 1.5 * moduloTime;
     234
     235  // Delete old corrections
     236  // ----------------------
     237  if (newCorr->tt < processTime) {
    230238    delete newCorr;
    231239    return;
     
    255263  // Process all older Epochs (if there are any)
    256264  // -------------------------------------------
    257   const double waitTime = moduloTime;
    258   _processedBeforeTime = newCorr->tt - waitTime;
    259 
    260265  QList<cmbEpoch*> epochsToProcess;
    261 
    262266  QMapIterator<QString, cmbAC*> itAC(_ACs);
    263267  while (itAC.hasNext()) {
    264268    itAC.next();
    265269    cmbAC* AC = itAC.value();
    266 
    267270    QMutableListIterator<cmbEpoch*> itEpo(AC->epochs);
    268271    while (itEpo.hasNext()) {
    269272      cmbEpoch* epoch = itEpo.next();
    270       if (epoch->time < _processedBeforeTime) {
     273      if (epoch->time <= processTime) {
    271274        epochsToProcess.append(epoch);
    272275        itEpo.remove();
  • trunk/BNC/combination/bnccomb.h

    r3297 r3299  
    7979
    8080  QMap<QString, cmbAC*> _ACs;   // Analytical Centers (key is mountpoint)
    81   bncTime               _processedBeforeTime;
     81  bncTime               _lastCorrTime;
    8282  QVector<cmbParam*>    _params;
    8383  bncRtnetDecoder*      _rtnetDecoder;
Note: See TracChangeset for help on using the changeset viewer.