Changeset 6962 in ntrip for trunk/BNC


Ignore:
Timestamp:
Jun 25, 2015, 8:47:06 AM (9 years ago)
Author:
stuerze
Message:

minor changes in combination

File:
1 edited

Legend:

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

    r6961 r6962  
    385385    const t_eph* ephPrev = _ephUser.ephPrev(prn);
    386386    if (ephLast == 0) {
    387       emit newMessage("bncComb: eph not found "  + prn.toAscii(), true);
     387      emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii(), true);
    388388      delete newCorr;
    389389      continue;
     
    398398      }
    399399      else {
    400         emit newMessage("bncComb: eph not found "  + prn.toAscii() +
     400        emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii() +
    401401                        QString(" %1").arg(newCorr->_iod).toAscii(), true);
    402402        delete newCorr;
     
    623623    out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str()
    624624        << " Maximum Residuum " << maxRes << ' '
    625         << corrs()[maxResIndex-1]->_acName << ' ' << corrs()[maxResIndex-1]->_prn;
     625        << corrs()[maxResIndex-1]->_acName << ' ' << corrs()[maxResIndex-1]->_prn.mid(0,3);
    626626    if (maxRes > _MAXRES) {
    627627      for (int iPar = 1; iPar <= _params.size(); iPar++) {
     
    629629        if (pp->type == cmbParam::offACSat            &&
    630630            pp->AC   == corrs()[maxResIndex-1]->_acName &&
    631             pp->prn  == corrs()[maxResIndex-1]->_prn) {
     631            pp->prn  == corrs()[maxResIndex-1]->_prn.mid(0,3)) {
    632632          QQ_sav.Row(iPar)    = 0.0;
    633633          QQ_sav.Column(iPar) = 0.0;
     
    648648        out << _resTime.datestr().c_str() << ' '
    649649            << _resTime.timestr().c_str() << " "
    650             << corr->_acName << ' ' << corr->_prn;
     650            << corr->_acName << ' ' << corr->_prn.mid(0,3);
    651651        out.setFieldWidth(10);
    652652        out <<  " res = " << vv[ii] << endl;
     
    678678          << _resTime.timestr().c_str() << " ";
    679679      out.setFieldWidth(3);
    680       out << "Full Clock " << corr->_prn << " " << corr->_iod << " ";
     680      out << "Full Clock " << corr->_prn.mid(0,3) << " " << corr->_iod << " ";
    681681      out.setFieldWidth(14);
    682682      out << (xc(4) + corr->_dClkResult) * t_CST::c << endl;
     
    10261026        out << _resTime.datestr().c_str() << ' '
    10271027            << _resTime.timestr().c_str() << " "
    1028             << corr->_acName << ' ' << corr->_prn;
     1028            << corr->_acName << ' ' << corr->_prn.mid(0,3);
    10291029        out.setFieldWidth(6);
    10301030        out << " res = " << vv[ii] << endl;
     
    10561056
    10571057    if      (ephLast == 0) {
    1058       out << "checkOrbit: missing eph (not found) " << corr->_prn << endl;
     1058      out << "checkOrbit: missing eph (not found) " << corr->_prn.mid(0,3) << endl;
    10591059      delete corr;
    10601060      im.remove();
    10611061    }
    10621062    else if (corr->_eph == 0) {
    1063       out << "checkOrbit: missing eph (zero) " << corr->_prn << endl;
     1063      out << "checkOrbit: missing eph (zero) " << corr->_prn.mid(0,3) << endl;
    10641064      delete corr;
    10651065      im.remove();
     
    10701070      }
    10711071      else {
    1072         out << "checkOrbit: missing eph (deleted) " << corr->_prn << endl;
     1072        out << "checkOrbit: missing eph (deleted) " << corr->_prn.mid(0,3) << endl;
    10731073        delete corr;
    10741074        im.remove();
Note: See TracChangeset for help on using the changeset viewer.