Changeset 5129 in ntrip


Ignore:
Timestamp:
Apr 17, 2013, 9:44:33 AM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r5123 r5129  
    658658  // ---------------------------------
    659659  if (_waitCoTime > 0.0 && coTime <= _lastCorrDumpTime) {
    660     ///    if (!_bncComb) {
     660    if (!_bncComb) {
    661661      QString line = staID + ": Correction for one sat neglected because overaged by " +
    662662                      QString().sprintf(" %f sec",
     
    664664      messagePrivate(line.toAscii());
    665665      emit( newMessage(line.toAscii(), true) );
    666       ///    }
     666    }
    667667    return;
    668668  }
  • trunk/BNC/src/combination/bnccomb.cpp

    r5128 r5129  
    296296  newCorr->acName = acName;
    297297  if (!newCorr->readLine(line) == success) {
    298     ///    emit newMessage("bncComb: cannot read correction: " + staID.toAscii() + " " + line.toAscii(), true);
    299298    delete newCorr;
    300299    return;
     
    333332  // -----------------
    334333  if (int(newCorr->tClk.gpssec()) % _cmbSampl != 0.0) {
    335     emit newMessage("bncComb: correction out of sampling rate "  + staID.toAscii() + " " + line.toAscii(), true);
    336334    delete newCorr;
    337335    return;
     
    349347  //--------------------
    350348  if (_eph.find(newCorr->prn) == _eph.end()) {
    351     emit newMessage("bncComb: eph not found (1) "  + staID.toAscii() + " " + line.toAscii(), true);
     349    emit newMessage("bncComb: eph not found "  + newCorr->prn.toAscii(), true);
    352350    delete newCorr;
    353351    return;
     
    364362    }
    365363    else {
    366       emit newMessage("bncComb: eph not found (2) "  + staID.toAscii() + " " + line.toAscii(), true);
     364      emit newMessage("bncComb: eph not found "  + newCorr->prn.toAscii() +
     365                      QString(" %1").arg(newCorr->iod).toAscii(), true);
    367366      delete newCorr;
    368367      return;
     
    372371  // Process previous Epoch(s)
    373372  // -------------------------
     373  const double waitTime = 1.5 * _cmbSampl;
    374374  QListIterator<bncTime> itTime(_buffer.keys());
    375375  while (itTime.hasNext()) {
    376376    bncTime epoTime = itTime.next();
    377     if (epoTime < newCorr->tClk - _cmbSampl) {
     377    if (epoTime < newCorr->tClk - waitTime) {
    378378      _resTime = epoTime;
    379379      processEpoch();
Note: See TracChangeset for help on using the changeset viewer.