Changeset 3553 in ntrip


Ignore:
Timestamp:
Dec 23, 2011, 8:37:51 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/combination
Files:
2 edited

Legend:

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

    r3551 r3553  
    257257    delete _params[iPar-1];
    258258  }
    259   QListIterator<bncTime> itTime(_buffer.keys());
     259  QListIterator<unsigned long> itTime(_buffer.keys());
    260260  while (itTime.hasNext()) {
    261261    _buffer.remove(itTime.next());
     
    339339  // Process previous Epoch(s)
    340340  // -------------------------
    341   QListIterator<bncTime> itTime(_buffer.keys());
     341  QListIterator<unsigned long> itTime(_buffer.keys());
    342342  while (itTime.hasNext()) {
    343     bncTime epoTime = itTime.next();
    344     if (epoTime < newCorr->tt - moduloTime) {
    345       _resTime = epoTime;
     343    unsigned long epoTime = itTime.next();
     344    if (epoTime < (newCorr->tt - moduloTime).longSec()) {
     345      _resTime = _buffer[epoTime].tt();
    346346      processEpoch();
    347347    }
     
    350350  // Merge or add the correction
    351351  // ---------------------------
    352   QVector<cmbCorr*>& corrs = _buffer[newCorr->tt].corrs;
     352  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt.longSec()].corrs;
    353353  cmbCorr* existingCorr = 0;
    354354  QVectorIterator<cmbCorr*> itCorr(corrs);
     
    450450    if (_masterMissingEpochs < 10) {
    451451      out << "Missing Master, Epoch skipped" << endl;
    452       _buffer.remove(_resTime);
     452      _buffer.remove(_resTime.longSec());
    453453      emit newMessage(_log, false);
    454454      return;
     
    511511  // Delete Data, emit Message
    512512  // -------------------------
    513   _buffer.remove(_resTime);
     513  _buffer.remove(_resTime.longSec());
    514514  emit newMessage(_log, false);
    515515}
  • trunk/BNC/combination/bnccomb.h

    r3497 r3553  
    7373      }
    7474    }
     75    bncTime tt() const {
     76      if (corrs.size() > 0) {
     77        return corrs[0]->tt;
     78      }
     79      else {
     80        return bncTime();
     81      }
     82    }
    7583    QVector<cmbCorr*> corrs;
    7684  };
     
    9098  t_irc checkOrbits(QTextStream& out);
    9199
    92   QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
     100  QVector<cmbCorr*>& corrs() {return _buffer[_resTime.longSec()].corrs;}
    93101
    94102  QList<cmbAC*>           _ACs;
    95103  bncTime                 _resTime;
    96104  QVector<cmbParam*>      _params;
    97   QMap<bncTime, cmbEpoch> _buffer;
     105  QMap<unsigned long, cmbEpoch> _buffer;
    98106  bncRtnetDecoder*        _rtnetDecoder;
    99107  SymmetricMatrix         _QQ;
Note: See TracChangeset for help on using the changeset viewer.