Index: /trunk/BNC/src/rinex/reqcanalyze.cpp =================================================================== --- /trunk/BNC/src/rinex/reqcanalyze.cpp (revision 10560) +++ /trunk/BNC/src/rinex/reqcanalyze.cpp (revision 10561) @@ -118,5 +118,5 @@ if (_log) { - *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1) << '\n' << '\n'; + *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1) << Qt::endl << Qt::endl; } @@ -228,5 +228,5 @@ catch (QString str) { if (_log) { - *_log << "Exception " << str << '\n'; + *_log << "Exception " << str << Qt::endl; } else { @@ -745,21 +745,21 @@ // Summary // ------- - *_log << "Observation File : " << obsFileName << '\n' - << "RINEX Version : " << QString("%1").arg(obsFile->version(),4,'f',2) << '\n' - << "Marker Name : " << _qcFile._markerName << '\n' - << "Marker Number : " << obsFile->markerNumber() << '\n' - << "Receiver : " << _qcFile._receiverType << '\n' - << "Antenna : " << _qcFile._antennaName << '\n' + *_log << "Observation File : " << obsFileName << Qt::endl + << "RINEX Version : " << QString("%1").arg(obsFile->version(),4,'f',2) << Qt::endl + << "Marker Name : " << _qcFile._markerName << Qt::endl + << "Marker Number : " << obsFile->markerNumber() << Qt::endl + << "Receiver : " << _qcFile._receiverType << Qt::endl + << "Antenna : " << _qcFile._antennaName << Qt::endl << "Position XYZ : " << QString("%1 %2 %3").arg(obsFile->xyz()(1), 14, 'f', 4) .arg(obsFile->xyz()(2), 14, 'f', 4) - .arg(obsFile->xyz()(3), 14, 'f', 4) << '\n' + .arg(obsFile->xyz()(3), 14, 'f', 4) << Qt::endl << "Antenna dH/dE/dN : " << QString("%1 %2 %3").arg(obsFile->antNEU()(3), 8, 'f', 4) .arg(obsFile->antNEU()(2), 8, 'f', 4) - .arg(obsFile->antNEU()(1), 8, 'f', 4) << '\n' + .arg(obsFile->antNEU()(1), 8, 'f', 4) << Qt::endl << "Start Time : " << _qcFile._startTime.datestr().c_str() << ' ' - << _qcFile._startTime.timestr(1,'.').c_str() << '\n' + << _qcFile._startTime.timestr(1,'.').c_str() << Qt::endl << "End Time : " << _qcFile._endTime.datestr().c_str() << ' ' - << _qcFile._endTime.timestr(1,'.').c_str() << '\n' - << "Interval : " << _qcFile._interval << " sec" << '\n'; + << _qcFile._endTime.timestr(1,'.').c_str() << Qt::endl + << "Interval : " << _qcFile._interval << " sec" << Qt::endl; @@ -774,5 +774,5 @@ *_log << " " << type; } - *_log << '\n'; + *_log << Qt::endl; } } @@ -794,5 +794,5 @@ *_log << ' ' << itSys.key(); } - *_log << '\n'; + *_log << Qt::endl; @@ -822,6 +822,6 @@ } } - *_log << '\n' - << prefixSys << "Satellites: " << qcSatVec.size() << '\n' + *_log << Qt::endl + << prefixSys << "Satellites: " << qcSatVec.size() << Qt::endl << prefixSys << "Signals : " << frqMap.size() << " "; QMapIterator > itFrq(frqMap); @@ -831,5 +831,5 @@ *_log << ' ' << frqType; } - *_log << '\n'; + *_log << Qt::endl; QString prefixSys2 = " " + prefixSys; itFrq.toFront(); @@ -867,5 +867,5 @@ double ratio = (double(numObs) / double(numExpectedObs)) * 100.0; - *_log << '\n' + *_log << Qt::endl << prefixSys2 << prefixFrq << "Observations : "; if(_navFileNames.isEmpty() || numExpectedObs == 0.0 || _navFileIncomplete.contains(sys.toLatin1())) { @@ -889,5 +889,5 @@ return; } - *_log << '\n'; + *_log << Qt::endl; for (int iEpo = 0; iEpo < _qcFile._qcEpo.size(); iEpo++) { const t_qcEpo& qcEpo = _qcFile._qcEpo[iEpo]; @@ -909,5 +909,5 @@ *_log << dateStr << QString(" %1").arg(qcEpo._qcSat.size(), 2) << QString(" %1").arg(qcEpo._PDOP, 4, 'f', 1) - << '\n'; + << Qt::endl; QMapIterator itSat(qcEpo._qcSat); @@ -961,5 +961,5 @@ } } - *_log << '\n'; + *_log << Qt::endl; } } @@ -985,5 +985,5 @@ } if (_log) { - *_log << "Navigation File(s) : " << navFileName << '\n'; + *_log << "Navigation File(s) : " << navFileName << Qt::endl; } QStringListIterator it(_navFileNames); @@ -1024,5 +1024,5 @@ } } - *_log << '\n'; + *_log << Qt::endl; } } Index: /trunk/BNC/src/rinex/reqcedit.cpp =================================================================== --- /trunk/BNC/src/rinex/reqcedit.cpp (revision 10560) +++ /trunk/BNC/src/rinex/reqcedit.cpp (revision 10561) @@ -108,34 +108,34 @@ // --------------- if (_log) { - *_log << QByteArray(78, '-') << '\n'; + *_log << QByteArray(78, '-') << Qt::endl; *_log << "RINEX File Editing\n"; - *_log << QByteArray(78, '-') << '\n'; + *_log << QByteArray(78, '-') << Qt::endl; *_log << QByteArray("Program").leftJustified(15) << ": " - << BNC_CORE->pgmName() << '\n'; + << BNC_CORE->pgmName() << Qt::endl; *_log << QByteArray("Run by").leftJustified(15) << ": " - << BNC_CORE->userName() << '\n'; + << BNC_CORE->userName() << Qt::endl; *_log << QByteArray("Date").leftJustified(15) << ": " - << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << '\n'; + << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << Qt::endl; *_log << QByteArray("RINEX Version").leftJustified(15) << ": " - << _rnxVersion << '\n'; + << _rnxVersion << Qt::endl; *_log << QByteArray("Sampling").leftJustified(15) << ": " - << _samplingRate << " sec" << '\n'; + << _samplingRate << " sec" << Qt::endl; *_log << QByteArray("Start time").leftJustified(15) << ": " << _begTime.datestr().c_str() << ' ' - << _begTime.timestr(0).c_str() << '\n'; + << _begTime.timestr(0).c_str() << Qt::endl; *_log << QByteArray("End time").leftJustified(15) << ": " << _endTime.datestr().c_str() << ' ' - << _endTime.timestr(0).c_str() << '\n'; + << _endTime.timestr(0).c_str() << Qt::endl; *_log << QByteArray("Input Obs Files").leftJustified(15) << ": " - << _obsFileNames.join(",") << '\n'; + << _obsFileNames.join(",") << Qt::endl; *_log << QByteArray("Input Nav Files").leftJustified(15) << ": " - << _navFileNames.join(",") << '\n'; + << _navFileNames.join(",") << Qt::endl; *_log << QByteArray("Output Obs File").leftJustified(15) << ": " - << _outObsFileName << '\n'; + << _outObsFileName << Qt::endl; *_log << QByteArray("Output Nav File").leftJustified(15) << ": " - << _outNavFileName << '\n'; - - *_log << QByteArray(78, '-') << '\n'; + << _outNavFileName << Qt::endl; + + *_log << QByteArray(78, '-') << Qt::endl; _log->flush(); } @@ -186,5 +186,5 @@ delete rnxObsFile; if (log) { - *log << "Error in rnxObsFile " << filePath.toLatin1().data() << '\n'; + *log << "Error in rnxObsFile " << filePath.toLatin1().data() << Qt::endl; } } @@ -199,5 +199,5 @@ catch (...) { if (log) { - *log << "Error in rnxObsFile " << fileName.toLatin1().data() << '\n'; + *log << "Error in rnxObsFile " << fileName.toLatin1().data() << Qt::endl; } } @@ -318,5 +318,5 @@ *_log << "Processing File: " << obsFile->fileName() << " start: " << obsFile->startTime().datestr().c_str() << ' ' - << obsFile->startTime().timestr(0).c_str() << '\n'; + << obsFile->startTime().timestr(0).c_str() << Qt::endl; } if (ii == 0) { @@ -367,5 +367,5 @@ catch (QString str) { if (_log) { - *_log << "Exception " << str << '\n'; + *_log << "Exception " << str << Qt::endl; } else { @@ -376,5 +376,5 @@ catch (...) { if (_log) { - *_log << "Exception unknown" << '\n'; + *_log << "Exception unknown" << Qt::endl; } else { Index: /trunk/BNC/src/rinex/rnxobsfile.cpp =================================================================== --- /trunk/BNC/src/rinex/rnxobsfile.cpp (revision 10560) +++ /trunk/BNC/src/rinex/rnxobsfile.cpp (revision 10561) @@ -1409,9 +1409,9 @@ const t_rnxSat& rnxSat = epo->rnxSat[iSat]; if (iSat > 0 && iSat % 12 == 0) { - *stream << '\n' << QString().leftJustified(32); + *stream << Qt::endl << QString().leftJustified(32); } *stream << rnxSat.prn.toString().c_str(); } - *stream << '\n'; + *stream << Qt::endl; for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) { @@ -1420,5 +1420,5 @@ for (int iTypeV2 = 0; iTypeV2 < header.nTypes(sys); iTypeV2++) { if (iTypeV2 > 0 && iTypeV2 % 5 == 0) { - *stream << '\n'; + *stream << Qt::endl; } QString typeV2 = header.obsType(sys, iTypeV2); @@ -1476,5 +1476,5 @@ } } - *stream << '\n'; + *stream << Qt::endl; } } @@ -1559,5 +1559,5 @@ } } - *stream << '\n'; + *stream << Qt::endl; } }