Changeset 10532 in ntrip
- Timestamp:
- Sep 13, 2024, 5:43:34 PM (4 weeks ago)
- Location:
- trunk/BNC/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncrinex.cpp
r10217 r10532 78 78 79 79 bncSettings settings; 80 _rnxScriptName = settings.value("rnxScript").toString(); 81 expandEnvVar(_rnxScriptName);82 80 _rnxScriptName = settings.value("rnxScript").toString(); expandEnvVar(_rnxScriptName); 81 _sklExt = settings.value("rnxSkel").toString(); 82 _sklPath = settings.value("rnxSkelPath").toString(); 83 83 _pgmName = QString(BNCPGMNAME).leftJustified(20, ' ', true); 84 84 #ifdef WIN32 … … 173 173 QUrl url; 174 174 int stIdLength = _mountPoint.path().length()-2; 175 staID = _mountPoint.path().mid(1,stIdLength).toUpper() + ". skl";176 staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ". skl";175 staID = _mountPoint.path().mid(1,stIdLength).toUpper() + "." + _sklExt; 176 staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + "." + _sklExt; 177 177 if (url.port() == -1) { 178 178 if (sklDir.contains("https", Qt::CaseInsensitive)) { … … 377 377 // Local Skeleton file 378 378 // ------------------- 379 QString sklExt = settings.value("rnxSkel").toString(); 380 QString sklPath = settings.value("rnxSkelPath").toString(); 381 expandEnvVar(sklPath); 382 if (sklPath.length() > 0 && 383 sklPath[sklPath.length()-1] != QDir::separator()) { 384 sklPath += QDir::separator(); 385 } 386 if (sklPath.isEmpty()) { 387 sklPath = rnxPath; 388 } 389 _localSklName = sklPath + ID + distStr + "." + sklExt; 390 _localSklNameAlternative = sklPath + ID.toLower() + distStr + "." + sklExt; 379 expandEnvVar(_sklPath); 380 if (_sklPath.length() > 0 && 381 _sklPath[_sklPath.length()-1] != QDir::separator()) { 382 _sklPath += QDir::separator(); 383 } 384 if (_sklPath.isEmpty()) { 385 _sklPath = rnxPath; 386 } 387 _localSklName = _sklPath + ID + distStr + "." + _sklExt; 388 _localSklNameAlternative = _sklPath + ID.toLower() + distStr + "." + _sklExt; 391 389 392 390 if (_rnxVersion > 2) { -
trunk/BNC/src/bncrinex.h
r9760 r10532 65 65 QDateTime _nextCloseEpoch; 66 66 QString _rnxScriptName; 67 QString _sklExt; 68 QString _sklPath; 67 69 QUrl _mountPoint; 68 70 QString _pgmName; -
trunk/BNC/src/bncwindow.cpp
r10524 r10532 236 236 _rnxSkelExtComboBox = new QComboBox(); 237 237 _rnxSkelExtComboBox->setEditable(false); 238 _rnxSkelExtComboBox->addItems(QString("skl, 238 _rnxSkelExtComboBox->addItems(QString("skl,SKL").split(",")); 239 239 int ik = _rnxSkelExtComboBox->findText(settings.value("rnxSkel").toString()); 240 240 if (ik != -1) { -
trunk/BNC/src/rinex/rnxobsfile.cpp
r10525 r10532 65 65 bncSettings settings; 66 66 _writeRinexOnlyWithSklObsTypes = settings.value("rnxOnlyWithSKL").toBool(); 67 67 _configuredVersion = settings.value("rnxVersion").toInt(); 68 68 } 69 69 … … 217 217 else if (key == "SYS / # / OBS TYPES") { 218 218 if (_version == 0.0) { 219 _version = defaultRnxObsVersion3;219 _version = versionFromInt(_configuredVersion); 220 220 } 221 221 QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly); -
trunk/BNC/src/rinex/rnxobsfile.h
r10127 r10532 79 79 QString _usedSystems; 80 80 double _version; 81 int _configuredVersion; 81 82 double _interval; 82 83 QString _antennaNumber;
Note:
See TracChangeset
for help on using the changeset viewer.