Changeset 10548 in ntrip
- Timestamp:
- Sep 25, 2024, 5:50:15 PM (3 weeks ago)
- Location:
- trunk/BNC
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/CHANGELOG.md
r10544 r10548 1 1 # Changelog 2 ## 2.13.1 (2024- 0?-??)3 - FIXED: obs types from skl file can be used now to write them into RINEX version 3 AND 4 observation files as configured2 ## 2.13.1 (2024-10-??) 3 - FIXED: Obs types from skl file can be used now to write them into RINEX version 3 AND 4 observation files as configured 4 4 - FIXED: **Bug in IGS SSR Epoch Time (BDS and GLO)**, which is defined as follows: Full seconds since the beginning of the week of continuous time scale with no offset from GPS, Galileo, QZSS, SBAS, **UTC leap seconds from GLONASS, -14 s offset from BDS** 5 - ADDED: data field range checks within RTCM3 Ephemeris decoders mainly regarding TOC and TOE 6 - ADDED: decoder string 'ZERO2FILE': Using this, BNC allows to by-pass its decoders and directly save the input in daily log files 7 - CHANGED: decoder string 'ZERO': means that the raw data are forwarded only 8 5 - ADDED: Service CRS and RTCM CRS message encodung and decoding 6 - ADDED: Data field range checks within RTCM3 Ephemeris decoders mainly regarding TOC and TOE 7 - ADDED: Decoder string 'ZERO2FILE': Using this, BNC allows to by-pass its decoders and directly save the input in daily log files 8 - CHANGED: Decoder string 'ZERO': means that the raw data are forwarded only 9 - CHANGED: Obsolete qt-class members are replaced 9 10 10 11 ## 2.13.1 (2024-04-30) -
trunk/BNC/src/PPP/pppSatObs.cpp
r10546 r10548 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/RTCM3/crsEncoder.cpp
r10545 r10548 87 87 SCALEADDBITS(32, 50000.0, helmertPar._ox) 88 88 SCALEADDBITS(32, 50000.0, helmertPar._oy) 89 SCALEADDBITS(3 2, 50000.0, helmertPar._oz)89 SCALEADDBITS(31, 50000.0, helmertPar._oz) 90 90 91 91 SCALEADDBITS(25, 100000.0, helmertPar._sc) -
trunk/BNC/src/bncmain.cpp
r10546 r10548 458 458 QString val(argv[ii+2]); 459 459 if (val.indexOf(";") != -1) { 460 settings.setValue(key, val.split(";", Q String::SkipEmptyParts));460 settings.setValue(key, val.split(";", Qt::SkipEmptyParts)); 461 461 } 462 462 else { -
trunk/BNC/src/bncsinextro.cpp
r10546 r10548 93 93 signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX"; 94 94 } 95 QStringList priorList = signalPriorities.split(" ", Q String::SkipEmptyParts);95 QStringList priorList = signalPriorities.split(" ", Qt::SkipEmptyParts); 96 96 QStringList frqStrList; 97 97 for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) { … … 102 102 for (int ii = 0; ii < priorList.size(); ii++) { 103 103 if (priorList[ii].indexOf(":") != -1) { 104 hlp = priorList[ii].split(":", Q String::SkipEmptyParts);104 hlp = priorList[ii].split(":", Qt::SkipEmptyParts); 105 105 if (hlp.size() == 2 && hlp[0].length() == 1 && hlp[0][0] == frqSys) { 106 hlp = hlp[1].split("&", Q String::SkipEmptyParts);106 hlp = hlp[1].split("&", Qt::SkipEmptyParts); 107 107 } 108 108 if (hlp.size() == 2 && hlp[0].indexOf(frqNum) != -1) { -
trunk/BNC/src/combination/bnccomb.cpp
r10546 r10548 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
r10547 r10548 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/pppMain.cpp
r10546 r10548 407 407 408 408 QString priorStr = QString::fromStdString(opt->_signalPriorities); 409 QStringList priorList = priorStr.split(" ", Q String::SkipEmptyParts);409 QStringList priorList = priorStr.split(" ", Qt::SkipEmptyParts); 410 410 QStringList hlpList; 411 411 vector<char> systems = opt->systems(); … … 414 414 for (int ii = 0; ii < priorList.size(); ii++) { 415 415 if (priorList[ii].indexOf(":") != -1) { 416 hlpList = priorList[ii].split(":", Q String::SkipEmptyParts);416 hlpList = priorList[ii].split(":", Qt::SkipEmptyParts); 417 417 if (hlpList.size() == 2 && hlpList[0].length() == 1 && hlpList[0][0] == sys) { 418 hlpList = hlpList[1].split("&", Q String::SkipEmptyParts);418 hlpList = hlpList[1].split("&", Qt::SkipEmptyParts); 419 419 if (hlpList.size() == 2) { 420 420 for (int jj = 0; jj < hlpList[0].size(); jj++) { -
trunk/BNC/src/rinex/reqcanalyze.cpp
r10546 r10548 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]; -
trunk/BNC/src/rinex/reqcedit.cpp
r10546 r10548 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(); … … 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 … … 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
r10546 r10548 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; … … 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
r10546 r10548 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 } … … 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]; … … 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/upload/bncrtnetuploadcaster.cpp
r10546 r10548 331 331 if (nextEpoch != -1 && nextEpoch < iEpoEnd) { 332 332 rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch, nextEpochEnd); 333 lines = rtnetStreamBuffer.split('\n', Q String::SkipEmptyParts);333 lines = rtnetStreamBuffer.split('\n', Qt::SkipEmptyParts); 334 334 if (lines.size() > 2) { 335 335 decodeRtnetEpoch(lines); … … 343 343 } 344 344 345 lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', Q String::SkipEmptyParts);345 lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', Qt::SkipEmptyParts); 346 346 347 347 _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
Note:
See TracChangeset
for help on using the changeset viewer.