Changeset 8641 in ntrip
- Timestamp:
- Mar 25, 2019, 10:37:46 AM (6 years ago)
- Location:
- branches/BNC_2.12/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/BNC_2.12/src/bncrinex.cpp
r8620 r8641 170 170 } 171 171 if (!sklDir.isEmpty() && sklDir != "none") { 172 QUrl url(sklDir + "/" + _mountPoint.path().mid(1,4).toLower() + ".skl"); 172 QString mtp; 173 if (_rnxV3) { 174 mtp = _mountPoint.path().mid(1,9).toUpper() + ".skl"; 175 } 176 else { 177 mtp = _mountPoint.path().mid(1,4).toLower() + ".skl"; 178 } 179 QUrl url(sklDir + "/" + mtp); 173 180 if (url.port() == -1) { 174 181 if (sklDir.contains("https", Qt::CaseInsensitive)) { -
branches/BNC_2.12/src/rinex/rnxobsfile.cpp
r8628 r8641 96 96 } 97 97 else if (key == "MARKER NAME") { 98 _markerName = value; 98 if (_version < 3.0) { 99 _markerName = line.mid(0,4).trimmed(); 100 } 101 else { 102 _markerName = line.mid(0,9).trimmed(); 103 } 99 104 } 100 105 else if (key == "MARKER TYPE") { … … 525 530 double shift = hlp1.first().toDouble(); 526 531 hlp1.removeFirst(); 532 QString satStr = hlp1.join(" "); 533 hlp1 = satStr.split(" "); 527 534 QStringList &satList = hlp1; 528 535 QMap<QString, QPair<double, QStringList> >::iterator it = _phaseShifts.find(type); … … 903 910 QMap<QString, QPair<double, QStringList> >::const_iterator it = _phaseShifts.begin(); 904 911 while (it != _phaseShifts.end()) { 905 strList.append(QString("%1_%2:%3").arg(it.key(), 3).arg(it.value().first, 9, 'f', 3).arg(it.value().second.join(" ")));912 strList.append(QString("%1_%2:%3").arg(it.key(), 3).arg(it.value().first, 9, 'f', 3).arg(it.value().second.join(" "))); 906 913 it++; 907 914 }
Note:
See TracChangeset
for help on using the changeset viewer.