Changeset 10525 in ntrip
- Timestamp:
- Aug 19, 2024, 4:15:53 PM (8 weeks ago)
- Location:
- trunk/BNC/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppSatObs.cpp
r10418 r10525 76 76 // Select pseudo-ranges and phase observations 77 77 // ------------------------------------------- 78 QStringList priorList = _signalPriorities.split(" ", Q String::SkipEmptyParts);78 QStringList priorList = _signalPriorities.split(" ", Qt::SkipEmptyParts); 79 79 string preferredAttrib; 80 80 for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) { … … 92 92 for (int ii = 0; ii < priorList.size(); ii++) { 93 93 if (priorList[ii].indexOf(":") != -1) { 94 hlp = priorList[ii].split(":", Q String::SkipEmptyParts);94 hlp = priorList[ii].split(":", Qt::SkipEmptyParts); 95 95 if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) { 96 hlp = hlp[1].split("&", Q String::SkipEmptyParts);96 hlp = hlp[1].split("&", Qt::SkipEmptyParts); 97 97 } 98 98 if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) { -
trunk/BNC/src/combination/bnccomb.cpp
r10519 r10525 176 176 newAC->name = hlp[1]; 177 177 newAC->weightFactor = hlp[2].toDouble(); 178 newAC->excludeSats = hlp[3].split(QRegExp("[ ,]"), Q String::SkipEmptyParts);178 newAC->excludeSats = hlp[3].split(QRegExp("[ ,]"), Qt::SkipEmptyParts); 179 179 newAC->isAPC = bool(newAC->mountPoint.mid(0,4) == "SSRA"); 180 180 QMapIterator<char, unsigned> itSys(_cmbSysPrn); -
trunk/BNC/src/orbComp/sp3Comp.cpp
r10127 r10525 54 54 55 55 bncSettings settings; 56 _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegExp("[ ,]"), Q String::SkipEmptyParts);56 _sp3FileNames = settings.value("sp3CompFile").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts); 57 57 for (int ii = 0; ii < _sp3FileNames.size(); ii++) { 58 58 expandEnvVar(_sp3FileNames[ii]); … … 62 62 _log = 0; 63 63 64 _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), Q String::SkipEmptyParts);64 _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), Qt::SkipEmptyParts); 65 65 66 66 _summaryOnly = (Qt::CheckState(settings.value("sp3CompSummaryOnly").toInt()) == Qt::Checked); -
trunk/BNC/src/rinex/graphwin.cpp
r8566 r10525 66 66 setWindowTitle(_fileName); 67 67 68 int ww = QFontMetrics(font()). width('w');68 int ww = QFontMetrics(font()).horizontalAdvance('w'); 69 69 70 70 // Buttons -
trunk/BNC/src/rinex/reqcanalyze.cpp
r10073 r10525 66 66 _log = 0; 67 67 _currEpo = 0; 68 _obsFileNames = settings.value("reqcObsFile").toString().split(",", Q String::SkipEmptyParts);69 _navFileNames = settings.value("reqcNavFile").toString().split(",", Q String::SkipEmptyParts);68 _obsFileNames = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts); 69 _navFileNames = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts); 70 70 _reqcPlotSignals = settings.value("reqcSkyPlotSignals").toString(); 71 71 _defaultSignalTypes << "G:1&2&5" << "R:1&2&3" << "J:1&2" << "E:1&5" << "S:1&5" << "C:2&6" << "I:5&9"; … … 149 149 void t_reqcAnalyze::analyzePlotSignals() { 150 150 151 QStringList signalsOpt = _reqcPlotSignals.split(" ", Q String::SkipEmptyParts);151 QStringList signalsOpt = _reqcPlotSignals.split(" ", Qt::SkipEmptyParts); 152 152 153 153 for (int ii = 0; ii < signalsOpt.size(); ii++) { 154 QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), Q String::SkipEmptyParts);154 QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), Qt::SkipEmptyParts); 155 155 if (input.size() > 1 && input[0].length() == 1) { 156 156 char system = input[0].toLatin1().constData()[0]; … … 582 582 // Sort MP data (make the largest values always visible) 583 583 // ----------------------------------------------------- 584 qStableSort(dataMP._data->begin(), dataMP._data->end(), mpLessThan);584 std::stable_sort(dataMP._data->begin(), dataMP._data->end(), mpLessThan); 585 585 } 586 586 } … … 718 718 t_graphWin* graphWin = new t_graphWin(0, fileName, plots, true); 719 719 720 int ww = QFontMetrics(graphWin->font()). width('w');720 int ww = QFontMetrics(graphWin->font()).horizontalAdvance('w'); 721 721 graphWin->setMinimumSize(120*ww, 40*ww); 722 722 -
trunk/BNC/src/rinex/reqcedit.cpp
r9945 r10525 58 58 _logFile = 0; 59 59 _log = 0; 60 _obsFileNames = settings.value("reqcObsFile").toString().split(",", Q String::SkipEmptyParts);60 _obsFileNames = settings.value("reqcObsFile").toString().split(",", Qt::SkipEmptyParts); 61 61 _outObsFileName = settings.value("reqcOutObsFile").toString(); 62 _navFileNames = settings.value("reqcNavFile").toString().split(",", Q String::SkipEmptyParts);62 _navFileNames = settings.value("reqcNavFile").toString().split(",", Qt::SkipEmptyParts); 63 63 _outNavFileName = settings.value("reqcOutNavFile").toString(); 64 64 int version = settings.value("reqcRnxVersion").toInt(); … … 108 108 // --------------- 109 109 if (_log) { 110 *_log << QByteArray(78, '-') << endl;110 *_log << QByteArray(78, '-') << '\n'; 111 111 *_log << "RINEX File Editing\n"; 112 *_log << QByteArray(78, '-') << endl;112 *_log << QByteArray(78, '-') << '\n'; 113 113 114 114 *_log << QByteArray("Program").leftJustified(15) << ": " 115 << BNC_CORE->pgmName() << endl;115 << BNC_CORE->pgmName() << '\n'; 116 116 *_log << QByteArray("Run by").leftJustified(15) << ": " 117 << BNC_CORE->userName() << endl;117 << BNC_CORE->userName() << '\n'; 118 118 *_log << QByteArray("Date").leftJustified(15) << ": " 119 << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << endl;119 << QDateTime::currentDateTime().toUTC().toString("yyyy-MM-dd hh:mm:ss") << '\n'; 120 120 *_log << QByteArray("RINEX Version").leftJustified(15) << ": " 121 << _rnxVersion << endl;121 << _rnxVersion << '\n'; 122 122 *_log << QByteArray("Sampling").leftJustified(15) << ": " 123 << _samplingRate << " sec" << endl;123 << _samplingRate << " sec" << '\n'; 124 124 *_log << QByteArray("Start time").leftJustified(15) << ": " 125 125 << _begTime.datestr().c_str() << ' ' 126 << _begTime.timestr(0).c_str() << endl;126 << _begTime.timestr(0).c_str() << '\n'; 127 127 *_log << QByteArray("End time").leftJustified(15) << ": " 128 128 << _endTime.datestr().c_str() << ' ' 129 << _endTime.timestr(0).c_str() << endl;129 << _endTime.timestr(0).c_str() << '\n'; 130 130 *_log << QByteArray("Input Obs Files").leftJustified(15) << ": " 131 << _obsFileNames.join(",") << endl;131 << _obsFileNames.join(",") << '\n'; 132 132 *_log << QByteArray("Input Nav Files").leftJustified(15) << ": " 133 << _navFileNames.join(",") << endl;133 << _navFileNames.join(",") << '\n'; 134 134 *_log << QByteArray("Output Obs File").leftJustified(15) << ": " 135 << _outObsFileName << endl;135 << _outObsFileName << '\n'; 136 136 *_log << QByteArray("Output Nav File").leftJustified(15) << ": " 137 << _outNavFileName << endl;138 139 *_log << QByteArray(78, '-') << endl;137 << _outNavFileName << '\n'; 138 139 *_log << QByteArray(78, '-') << '\n'; 140 140 _log->flush(); 141 141 } … … 186 186 delete rnxObsFile; 187 187 if (log) { 188 *log << "Error in rnxObsFile " << filePath.toLatin1().data() << endl;188 *log << "Error in rnxObsFile " << filePath.toLatin1().data() << '\n'; 189 189 } 190 190 } … … 199 199 catch (...) { 200 200 if (log) { 201 *log << "Error in rnxObsFile " << fileName.toLatin1().data() << endl;202 } 203 } 204 } 205 } 206 qStableSort(rnxObsFiles.begin(), rnxObsFiles.end(),201 *log << "Error in rnxObsFile " << fileName.toLatin1().data() << '\n'; 202 } 203 } 204 } 205 } 206 std::stable_sort(rnxObsFiles.begin(), rnxObsFiles.end(), 207 207 t_rnxObsFile::earlierStartTime); 208 208 } … … 242 242 // ------------------------ 243 243 bncSettings settings; 244 QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", Q String::SkipEmptyParts);244 QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", Qt::SkipEmptyParts); 245 245 246 246 // Put together all observation types … … 318 318 *_log << "Processing File: " << obsFile->fileName() << " start: " 319 319 << obsFile->startTime().datestr().c_str() << ' ' 320 << obsFile->startTime().timestr(0).c_str() << endl;320 << obsFile->startTime().timestr(0).c_str() << '\n'; 321 321 } 322 322 if (ii == 0) { … … 367 367 catch (QString str) { 368 368 if (_log) { 369 *_log << "Exception " << str << endl;369 *_log << "Exception " << str << '\n'; 370 370 } 371 371 else { … … 376 376 catch (...) { 377 377 if (_log) { 378 *_log << "Exception unknown" << endl;378 *_log << "Exception unknown" << '\n'; 379 379 } 380 380 else { … … 540 540 } 541 541 // TODO: enable user decision 542 qStableSort(ephs.begin(), ephs.end(), t_eph::earlierTime);543 // qStableSort(ephs.begin(), ephs.end(), t_eph::prnSort);542 std::stable_sort(ephs.begin(), ephs.end(), t_eph::earlierTime); 543 //std::stable_sort(ephs.begin(), ephs.end(), t_eph::prnSort); 544 544 } 545 545 … … 785 785 QString preferredAttrib; 786 786 if (preferredAttribListSys[ii].indexOf("&") != -1) { 787 QStringList hlp = preferredAttribListSys[ii].split("&", Q String::SkipEmptyParts);787 QStringList hlp = preferredAttribListSys[ii].split("&", Qt::SkipEmptyParts); 788 788 if (hlp.size() == 2 && hlp[0].contains(band)) { 789 789 preferredAttrib = hlp[1]; -
trunk/BNC/src/rinex/rnxnavfile.cpp
r10318 r10525 158 158 } 159 159 160 QStringList hlp = line.split(QRegExp("\\s+"), Q String::SkipEmptyParts);160 QStringList hlp = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts); 161 161 QString firstStr = hlp.at(0); 162 162 QString prn; … … 243 243 eph = new t_ephGPS(version(), lines); 244 244 } 245 245 246 246 if (version() >= 4.0) { 247 247 if (eph->setNavType(navTypeStr) != success) { … … 250 250 } 251 251 } 252 252 253 253 if (eph) { 254 254 _ephs.push_back(eph); … … 317 317 } 318 318 else if (it.key() == "RUN BY DATE") { 319 runByDate = it.value().split("\\n", Q String::SkipEmptyParts);319 runByDate = it.value().split("\\n", Qt::SkipEmptyParts); 320 320 } 321 321 else if (it.key() == "COMMENT") { 322 comments = it.value().split("\\n", Q String::SkipEmptyParts);322 comments = it.value().split("\\n", Qt::SkipEmptyParts); 323 323 } 324 324 } -
trunk/BNC/src/rinex/rnxobsfile.cpp
r9963 r10525 505 505 for (int iType = 0; iType < useObsTypes->size(); iType++) { 506 506 if (useObsTypes->at(iType).indexOf(":") != -1) { 507 QStringList hlp = useObsTypes->at(iType).split(":", Q String::SkipEmptyParts);507 QStringList hlp = useObsTypes->at(iType).split(":", Qt::SkipEmptyParts); 508 508 if (hlp.size() == 2 && hlp[0].length() == 1) { 509 509 if (_version >= 3.0) { … … 551 551 else { 552 552 foreach (const QString &str, *phaseShifts) { 553 QStringList hlp = str.split("_", Q String::SkipEmptyParts);554 QStringList hlp1 = hlp.last().split(":", Q String::SkipEmptyParts);553 QStringList hlp = str.split("_", Qt::SkipEmptyParts); 554 QStringList hlp1 = hlp.last().split(":", Qt::SkipEmptyParts); 555 555 QString type = hlp.first(); 556 556 double shift = hlp1.first().toDouble(); … … 577 577 else { 578 578 foreach (const QString &str, *gloBiases) { 579 QStringList hlp = str.split(":", Q String::SkipEmptyParts);579 QStringList hlp = str.split(":", Qt::SkipEmptyParts); 580 580 QString type = hlp.first();; 581 581 double value = hlp.last().toDouble(); … … 590 590 else { 591 591 foreach (const QString &str, *gloSlots) { 592 QStringList hlp = str.split(":", Q String::SkipEmptyParts);592 QStringList hlp = str.split(":", Qt::SkipEmptyParts); 593 593 QString sat = hlp.first(); 594 594 int slot = hlp.last().toInt(); … … 631 631 } 632 632 else if (it.key() == "RUN BY DATE") { 633 runByDate = it.value().split("\\n", Q String::SkipEmptyParts);633 runByDate = it.value().split("\\n", Qt::SkipEmptyParts); 634 634 } 635 635 else if ((it.key().indexOf("COMMENT")) != -1) { 636 newComments += it.value().split("\\n", Q String::SkipEmptyParts);636 newComments += it.value().split("\\n", Qt::SkipEmptyParts); 637 637 } 638 638 } … … 1409 1409 const t_rnxSat& rnxSat = epo->rnxSat[iSat]; 1410 1410 if (iSat > 0 && iSat % 12 == 0) { 1411 *stream << endl<< QString().leftJustified(32);1411 *stream << '\n' << QString().leftJustified(32); 1412 1412 } 1413 1413 *stream << rnxSat.prn.toString().c_str(); 1414 1414 } 1415 *stream << endl;1415 *stream << '\n'; 1416 1416 1417 1417 for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) { … … 1420 1420 for (int iTypeV2 = 0; iTypeV2 < header.nTypes(sys); iTypeV2++) { 1421 1421 if (iTypeV2 > 0 && iTypeV2 % 5 == 0) { 1422 *stream << endl;1422 *stream << '\n'; 1423 1423 } 1424 1424 QString typeV2 = header.obsType(sys, iTypeV2); … … 1428 1428 for (int ii = 0; ii < preferredAttribList.size(); ii++) { 1429 1429 if (preferredAttribList[ii].indexOf("&") != -1) { 1430 QStringList hlp = preferredAttribList[ii].split("&", Q String::SkipEmptyParts);1430 QStringList hlp = preferredAttribList[ii].split("&", Qt::SkipEmptyParts); 1431 1431 if (hlp.size() == 2 && hlp[0].contains(typeV2[1])) { 1432 1432 preferredAttrib = hlp[1]; … … 1476 1476 } 1477 1477 } 1478 *stream << endl;1478 *stream << '\n'; 1479 1479 } 1480 1480 } … … 1559 1559 } 1560 1560 } 1561 *stream << endl;1561 *stream << '\n'; 1562 1562 } 1563 1563 } … … 1677 1677 // --------------------------------------------------- 1678 1678 if (reqcAction == "Edit/Concatenate") { 1679 priorList = settings.value("reqcV2Priority").toString().split(" ", Q String::SkipEmptyParts);1679 priorList = settings.value("reqcV2Priority").toString().split(" ", Qt::SkipEmptyParts); 1680 1680 } 1681 1681 … … 1683 1683 // ---------------------------- 1684 1684 else { 1685 priorList = settings.value("rnxV2Priority").toString().split(" ", Q String::SkipEmptyParts);1685 priorList = settings.value("rnxV2Priority").toString().split(" ", Qt::SkipEmptyParts); 1686 1686 } 1687 1687 … … 1689 1689 for (int ii = 0; ii < priorList.size(); ii++) { 1690 1690 if (priorList[ii].indexOf(":") != -1) { 1691 QStringList hlp = priorList[ii].split(":", Q String::SkipEmptyParts);1691 QStringList hlp = priorList[ii].split(":", Qt::SkipEmptyParts); 1692 1692 if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == sys) { 1693 1693 result.append(hlp[1]); -
trunk/BNC/src/serial/posix_qextserialport.h
r9957 r10525 33 33 virtual void setTimeout(ulong, ulong); 34 34 35 virtual bool open(OpenMode mode= 0);35 virtual bool open(OpenMode mode=QIODevice::NotOpen); 36 36 virtual void close(); 37 37 virtual void flush(); -
trunk/BNC/src/serial/qextserialbase.h
r1317 r10525 160 160 virtual void setTimeout(ulong, ulong)=0; 161 161 162 virtual bool open(OpenMode mode= 0)=0;162 virtual bool open(OpenMode mode=QIODevice::NotOpen)=0; 163 163 virtual bool isSequential() const; 164 164 virtual void close()=0;
Note:
See TracChangeset
for help on using the changeset viewer.