Index: trunk/BNC/src/rinex/reqcanalyze.cpp =================================================================== --- trunk/BNC/src/rinex/reqcanalyze.cpp (revision 10629) +++ trunk/BNC/src/rinex/reqcanalyze.cpp (revision 10630) @@ -64,5 +64,5 @@ _logFileName = settings.value("reqcOutLogFile").toString(); expandEnvVar(_logFileName); _logFile = 0; - _log = 0; + _logStream = 0; _currEpo = 0; _obsFileNames = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts); @@ -95,5 +95,5 @@ delete _ephs[ii]; } - delete _log; _log = 0; + delete _logStream; _logStream = 0; delete _logFile; _logFile = 0; if (BNC_CORE->mode() != t_bncCore::interactive) { @@ -114,20 +114,20 @@ _logFile = new QFile(_logFileName); if (_logFile->open(QIODevice::WriteOnly | QIODevice::Text)) { - _log = new QTextStream(); - _log->setDevice(_logFile); - } - } - - if (_log) { - *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1) << Qt::endl << Qt::endl; + _logStream = new QTextStream(); + _logStream->setDevice(_logFile); + } + } + + if (_logStream) { + *_logStream << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1) << Qt::endl << Qt::endl; } // Initialize RINEX Observation Files // ---------------------------------- - t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _log); + t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _logStream); // Read Ephemerides // ---------------- - t_reqcEdit::readEphemerides(_navFileNames, _ephs, _log, _checkEph); + t_reqcEdit::readEphemerides(_navFileNames, _ephs, _logStream, _checkEph); // Loop over all RINEX Files @@ -225,6 +225,6 @@ } catch (QString str) { - if (_log) { - *_log << "Exception " << str << Qt::endl; + if (_logStream) { + *_logStream << "Exception " << str << Qt::endl; } else { @@ -733,5 +733,5 @@ void t_reqcAnalyze::printReport(const t_rnxObsFile* obsFile) { - if (!_log) { + if (!_logStream) { return; } @@ -742,5 +742,5 @@ // Summary // ------- - *_log << "Observation File : " << obsFileName << Qt::endl + *_logStream << "Observation File : " << obsFileName << Qt::endl << "RINEX Version : " << QString("%1").arg(obsFile->version(),4,'f',2) << Qt::endl << "Marker Name : " << _qcFile._markerName << Qt::endl @@ -766,10 +766,10 @@ char sys = obsFile->system(iSys); if (sys != ' ') { - *_log << "Observation Types " << sys << ":"; + *_logStream << "Observation Types " << sys << ":"; for (int iType = 0; iType < obsFile->nTypes(sys); iType++) { QString type = obsFile->obsType(sys, iType); - *_log << " " << type; - } - *_log << Qt::endl; + *_logStream << " " << type; + } + *_logStream << Qt::endl; } } @@ -785,11 +785,11 @@ systemMap[prn.system()].push_back(&qcSatSum); } - *_log << "Analysed GNSS : " << systemMap.size() << " "; + *_logStream << "Analysed GNSS : " << systemMap.size() << " "; QMapIterator > itSys(systemMap); while (itSys.hasNext()) { itSys.next(); - *_log << ' ' << itSys.key(); - } - *_log << Qt::endl; + *_logStream << ' ' << itSys.key(); + } + *_logStream << Qt::endl; @@ -819,5 +819,5 @@ } } - *_log << Qt::endl + *_logStream << Qt::endl << prefixSys << "Satellites: " << qcSatVec.size() << Qt::endl << prefixSys << "Signals : " << frqMap.size() << " "; @@ -826,7 +826,7 @@ itFrq.next(); QString frqType = itFrq.key(); if (frqType.length() < 2) frqType += '?'; - *_log << ' ' << frqType; - } - *_log << Qt::endl; + *_logStream << ' ' << frqType; + } + *_logStream << Qt::endl; QString prefixSys2 = " " + prefixSys; itFrq.toFront(); @@ -864,13 +864,13 @@ double ratio = (double(numObs) / double(numExpectedObs)) * 100.0; - *_log << Qt::endl + *_logStream << Qt::endl << prefixSys2 << prefixFrq << "Observations : "; if(_navFileNames.isEmpty() || numExpectedObs == 0.0 || _navFileIncomplete.contains(sys.toLatin1())) { - *_log << QString("%1\n").arg(numObs, 6); + *_logStream << QString("%1\n").arg(numObs, 6); } else { - *_log << QString("%1 (%2) %3 \%\n").arg(numObs, 6).arg(numExpectedObs, 8).arg(ratio, 8, 'f', 2); - } - *_log << prefixSys2 << prefixFrq << "Slips (file+found): " << QString("%1 +").arg(numSlipsFlagged, 8) + *_logStream << QString("%1 (%2) %3 \%\n").arg(numObs, 6).arg(numExpectedObs, 8).arg(ratio, 8, 'f', 2); + } + *_logStream << prefixSys2 << prefixFrq << "Slips (file+found): " << QString("%1 +").arg(numSlipsFlagged, 8) << QString("%1\n").arg(numSlipsFound, 8) << prefixSys2 << prefixFrq << "Gaps : " << QString("%1\n").arg(numGaps, 8) @@ -886,5 +886,5 @@ return; } - *_log << Qt::endl; + *_logStream << Qt::endl; for (int iEpo = 0; iEpo < _qcFile._qcEpo.size(); iEpo++) { const t_qcEpo& qcEpo = _qcFile._qcEpo[iEpo]; @@ -904,5 +904,5 @@ .arg(sec, 11, 'f', 7); - *_log << dateStr << QString(" %1").arg(qcEpo._qcSat.size(), 2) + *_logStream << dateStr << QString(" %1").arg(qcEpo._qcSat.size(), 2) << QString(" %1").arg(qcEpo._PDOP, 4, 'f', 1) << Qt::endl; @@ -914,5 +914,5 @@ const t_qcSat& qcSat = itSat.value(); - *_log << prn.toString().c_str() + *_logStream << prn.toString().c_str() << QString(" %1 %2").arg(qcSat._eleDeg, 6, 'f', 2).arg(qcSat._azDeg, 7, 'f', 2); @@ -927,39 +927,39 @@ } } - *_log << QString(" %1").arg(numObsTypes, 2); + *_logStream << QString(" %1").arg(numObsTypes, 2); for (int iFrq = 0; iFrq < qcSat._qcFrq.size(); iFrq++) { const t_qcFrq& qcFrq = qcSat._qcFrq[iFrq]; if (qcFrq._phaseValid) { - *_log << " L" << qcFrq._rnxType2ch << ' '; + *_logStream << " L" << qcFrq._rnxType2ch << ' '; if (qcFrq._slip) { - *_log << 's'; + *_logStream << 's'; } else { - *_log << '.'; + *_logStream << '.'; } if (qcFrq._gap) { - *_log << 'g'; + *_logStream << 'g'; } else { - *_log << '.'; - } - *_log << QString(" %1").arg(qcFrq._SNR, 4, 'f', 1); + *_logStream << '.'; + } + *_logStream << QString(" %1").arg(qcFrq._SNR, 4, 'f', 1); } if (qcFrq._codeValid) { - *_log << " C" << qcFrq._rnxType2ch << ' '; + *_logStream << " C" << qcFrq._rnxType2ch << ' '; if (qcFrq._gap) { - *_log << " g"; + *_logStream << " g"; } else { - *_log << " ."; - } - *_log << QString(" %1").arg(qcFrq._stdMP, 3, 'f', 2); - } - } - *_log << Qt::endl; - } - } - _log->flush(); + *_logStream << " ."; + } + *_logStream << QString(" %1").arg(qcFrq._stdMP, 3, 'f', 2); + } + } + *_logStream << Qt::endl; + } + } + _logStream->flush(); } Index: trunk/BNC/src/rinex/reqcanalyze.h =================================================================== --- trunk/BNC/src/rinex/reqcanalyze.h (revision 10629) +++ trunk/BNC/src/rinex/reqcanalyze.h (revision 10630) @@ -204,5 +204,5 @@ QString _logFileName; QFile* _logFile; - QTextStream* _log; + QTextStream* _logStream; bool _checkEph; QStringList _obsFileNames; Index: trunk/BNC/src/rinex/reqcedit.cpp =================================================================== --- trunk/BNC/src/rinex/reqcedit.cpp (revision 10629) +++ trunk/BNC/src/rinex/reqcedit.cpp (revision 10630) @@ -57,5 +57,5 @@ _logFileName = settings.value("reqcOutLogFile").toString(); expandEnvVar(_logFileName); _logFile = 0; - _log = 0; + _logStream = 0; _obsFileNames = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts); _outObsFileName = settings.value("reqcOutObsFile").toString(); @@ -89,5 +89,5 @@ delete _ephs[ii]; } - delete _log; _log = 0; + delete _logStream; _logStream = 0; delete _logFile; _logFile = 0; } @@ -102,6 +102,6 @@ _logFile = new QFile(_logFileName); if (_logFile->open(QIODevice::WriteOnly | QIODevice::Text)) { - _log = new QTextStream(); - _log->setDevice(_logFile); + _logStream = new QTextStream(); + _logStream->setDevice(_logFile); } } @@ -109,36 +109,36 @@ // Log File Header // --------------- - if (_log) { - *_log << QByteArray(78, '-') << Qt::endl; - *_log << "RINEX File Editing\n"; - *_log << QByteArray(78, '-') << Qt::endl; - - *_log << QByteArray("Program").leftJustified(15) << ": " + if (_logStream) { + *_logStream << QByteArray(78, '-') << Qt::endl; + *_logStream << "RINEX File Editing\n"; + *_logStream << QByteArray(78, '-') << Qt::endl; + + *_logStream << QByteArray("Program").leftJustified(15) << ": " << BNC_CORE->pgmName() << Qt::endl; - *_log << QByteArray("Run by").leftJustified(15) << ": " + *_logStream << QByteArray("Run by").leftJustified(15) << ": " << BNC_CORE->userName() << Qt::endl; - *_log << QByteArray("Date").leftJustified(15) << ": " + *_logStream << QByteArray("Date").leftJustified(15) << ": " << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << Qt::endl; - *_log << QByteArray("RINEX Version").leftJustified(15) << ": " + *_logStream << QByteArray("RINEX Version").leftJustified(15) << ": " << _rnxVersion << Qt::endl; - *_log << QByteArray("Sampling").leftJustified(15) << ": " + *_logStream << QByteArray("Sampling").leftJustified(15) << ": " << _samplingRate << " sec" << Qt::endl; - *_log << QByteArray("Start time").leftJustified(15) << ": " + *_logStream << QByteArray("Start time").leftJustified(15) << ": " << _begTime.datestr().c_str() << ' ' << _begTime.timestr(0).c_str() << Qt::endl; - *_log << QByteArray("End time").leftJustified(15) << ": " + *_logStream << QByteArray("End time").leftJustified(15) << ": " << _endTime.datestr().c_str() << ' ' << _endTime.timestr(0).c_str() << Qt::endl; - *_log << QByteArray("Input Obs Files").leftJustified(15) << ": " + *_logStream << QByteArray("Input Obs Files").leftJustified(15) << ": " << _obsFileNames.join(",") << Qt::endl; - *_log << QByteArray("Input Nav Files").leftJustified(15) << ": " + *_logStream << QByteArray("Input Nav Files").leftJustified(15) << ": " << _navFileNames.join(",") << Qt::endl; - *_log << QByteArray("Output Obs File").leftJustified(15) << ": " + *_logStream << QByteArray("Output Obs File").leftJustified(15) << ": " << _outObsFileName << Qt::endl; - *_log << QByteArray("Output Nav File").leftJustified(15) << ": " + *_logStream << QByteArray("Output Nav File").leftJustified(15) << ": " << _outNavFileName << Qt::endl; - *_log << QByteArray(78, '-') << Qt::endl; - _log->flush(); + *_logStream << QByteArray(78, '-') << Qt::endl; + _logStream->flush(); } @@ -221,5 +221,5 @@ } - t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _log); + t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _logStream); // Initialize output observation file @@ -318,6 +318,6 @@ for (int ii = 0; ii < _rnxObsFiles.size(); ii++) { t_rnxObsFile* obsFile = _rnxObsFiles[ii]; - if (_log) { - *_log << "Input Obs File: " << obsFile->fileName() << " start: " + if (_logStream) { + *_logStream << "Input Obs File: " << obsFile->fileName() << " start: " << obsFile->startTime().datestr().c_str() << ' ' << obsFile->startTime().timestr(0).c_str() << Qt::endl; @@ -369,6 +369,6 @@ } catch (QString str) { - if (_log) { - *_log << "Exception " << str << Qt::endl; + if (_logStream) { + *_logStream << "Exception " << str << Qt::endl; } else { @@ -378,6 +378,6 @@ } catch (...) { - if (_log) { - *_log << "Exception unknown" << Qt::endl; + if (_logStream) { + *_logStream << "Exception unknown" << Qt::endl; } else { @@ -586,5 +586,5 @@ // Read Ephemerides // ---------------- - t_reqcEdit::readEphemerides(_navFileNames, _ephs, _log, _checkEph); + t_reqcEdit::readEphemerides(_navFileNames, _ephs, _logStream, _checkEph); // Check Satellite Systems @@ -796,9 +796,17 @@ if (log) { *log << " : " - << QString("WRONG %2:%3\n") + << QString("WRONG %2:%3\n") .arg(eph->typeStr(eph->type(), eph->prn(), 99.0)) .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1(); } - } + }/* switched off because of to many SBAS satellites are set to unhealthy + if (eph->checkState() == t_eph::unhealthy) { + if (log) { + *log << " : " + << QString("UNHEALTHY %2:%3\n") + .arg(eph->typeStr(eph->type(), eph->prn(), 99.0)) + .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1(); + } + }*/ } } Index: trunk/BNC/src/rinex/reqcedit.h =================================================================== --- trunk/BNC/src/rinex/reqcedit.h (revision 10629) +++ trunk/BNC/src/rinex/reqcedit.h (revision 10630) @@ -51,7 +51,7 @@ QTextStream* log); static void readEphemerides(const QStringList& navFileNames, - QVector& ephs, QTextStream* log, + QVector& ephs, QTextStream* log, bool checkEph); - static void appendEphemerides(const QString& fileName, + static void appendEphemerides(const QString& fileName, QVector& ephs, QTextStream* log, bool checkEph); @@ -67,5 +67,5 @@ QString _logFileName; QFile* _logFile; - QTextStream* _log; + QTextStream* _logStream; bool _checkEph; QStringList _obsFileNames;