Changeset 9184 in ntrip for trunk/BNC/src/bncrinex.cpp
- Timestamp:
- Oct 23, 2020, 9:52:07 PM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncrinex.cpp
r9158 r9184 175 175 staID = _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl"; 176 176 staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ".skl"; 177 url = sklDir + "/" + staID;178 177 if (url.port() == -1) { 179 178 if (sklDir.contains("https", Qt::CaseInsensitive)) { … … 187 186 bncNetQuery* query = new bncNetQueryV2(true); 188 187 QByteArray outData; 188 url = sklDir + "/" + staID; 189 189 query->waitForRequestResult(url, outData); 190 190 if (query->status() == bncNetQuery::finished && … … 222 222 readDone = true; 223 223 } 224 } else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) { 224 } 225 else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) { 225 226 QTextStream in(&sklAlt); 226 227 if (_sklHeader.read(&in) == success) { … … 335 336 336 337 bncSettings settings; 337 QString path = settings.value("rnxPath").toString();338 expandEnvVar( path);339 340 if ( path.length() > 0 && path[path.length()-1] != QDir::separator() ) {341 path += QDir::separator();338 QString rnxPath = settings.value("rnxPath").toString(); 339 expandEnvVar(rnxPath); 340 341 if ( rnxPath.length() > 0 && rnxPath[rnxPath.length()-1] != QDir::separator() ) { 342 rnxPath += QDir::separator(); 342 343 } 343 344 … … 374 375 } 375 376 376 QString sklExt = settings.value("rnxSkel").toString(); 377 if (!sklExt.isEmpty()) { 378 _localSklName = path + ID + distStr + "." + sklExt; 379 _localSklNameAlternative = path + ID.toLower() + distStr + "." + sklExt; 380 } 377 // Local Skeleton file 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; 381 391 382 392 if (!_rnxV2) { … … 398 408 } 399 409 400 path += ID.left(4) +410 rnxPath += ID.left(4) + 401 411 QString("%1").arg(monNum, 1, 10) + 402 412 QString("%1").arg(recNum, 1, 10) + … … 412 422 } 413 423 else { 414 path += ID.left(4) +424 rnxPath += ID.left(4) + 415 425 QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) + 416 426 hlpStr + distStr + datTim.toString(".yyO"); 417 427 } 418 428 419 _fName = path.toLatin1();429 _fName = rnxPath.toLatin1(); 420 430 } 421 431
Note:
See TracChangeset
for help on using the changeset viewer.