Changeset 5387 in ntrip for trunk/BNC


Ignore:
Timestamp:
Sep 8, 2013, 7:12:20 PM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r5375 r5387  
    657657  // First time, set the _lastCorrDumpTime
    658658  // -------------------------------------
    659   if (!_lastCorrDumpTime.valid()) {
    660     _lastCorrDumpTime = coTime - 1.0;
     659  if (!_lastCorrDumpTime[staID].valid()) {
     660    _lastCorrDumpTime[staID] = coTime - 1.0;
    661661  }
    662662
    663663  // An old correction - throw it away
    664664  // ---------------------------------
    665   if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime) {
     665  if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime[staID]) {
    666666    if (!_bncComb) {
    667667      QString line = staID + ": Correction for one sat neglected because overaged by " +
    668668                      QString().sprintf(" %f sec",
    669                       _lastCorrDumpTime - coTime + _waitCoTime);
     669                      _lastCorrDumpTime[staID] - coTime + _waitCoTime);
    670670      messagePrivate(line.toAscii());
    671671      emit( newMessage(line.toAscii(), true) );
     
    681681    dumpCorrs();
    682682  }
    683   else if (coTime - _waitCoTime > _lastCorrDumpTime) {
    684     dumpCorrs(_lastCorrDumpTime + 1, coTime - _waitCoTime);
    685     _lastCorrDumpTime = coTime - _waitCoTime;
     683  else if (coTime - _waitCoTime > _lastCorrDumpTime[staID]) {
     684    dumpCorrs(_lastCorrDumpTime[staID] + 1, coTime - _waitCoTime);
     685    _lastCorrDumpTime[staID] = coTime - _waitCoTime;
    686686  }
    687687}
  • trunk/BNC/src/bnccore.h

    r5206 r5387  
    127127    QList<QTcpSocket*>* _socketsNMEA;
    128128    bncCaster*          _caster;
    129     bncTime            _lastCorrDumpTime;
     129    QMap<QString, bncTime> _lastCorrDumpTime;
    130130    double              _waitCoTime;
    131131    QMultiMap<bncTime, QString>* _corrs;
Note: See TracChangeset for help on using the changeset viewer.