Changeset 9945 in ntrip for trunk/BNC/src/rinex/reqcedit.cpp
- Timestamp:
- Dec 15, 2022, 11:06:12 PM (16 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/rinex/reqcedit.cpp
r9893 r9945 224 224 t_rnxObsFile outObsFile(_outObsFileName, t_rnxObsFile::output); 225 225 226 227 // Put together all run by date entries 228 // ------------------------------------ 229 QStringList runByDate; 230 if (_rnxVersion >= 4.0 && _rnxObsFiles.size() > 1) { 231 for (int ii = 0; ii < _rnxObsFiles.size(); ii++) { 232 t_rnxObsFile* rnxObsFile = _rnxObsFiles[ii]; 233 QStringListIterator itRunByDt(rnxObsFile->runByDate()); 234 while (itRunByDt.hasNext()) { 235 runByDate.append(itRunByDt.next()); 236 } 237 } 238 runByDate.removeDuplicates(); 239 } 240 226 241 // Select observation types 227 242 // ------------------------ … … 307 322 if (ii == 0) { 308 323 outObsFile.setHeader(obsFile->header(), int(_rnxVersion), &useObsTypes, 309 &phaseShifts, &gloBiases, &gloSlots );324 &phaseShifts, &gloBiases, &gloSlots, &runByDate); 310 325 if (_begTime.valid() && _begTime > outObsFile.startTime()) { 311 326 outObsFile.setStartTime(_begTime); … … 403 418 } 404 419 } 405 406 420 407 421 const ColumnVector& obsFileAntNEU = obsFile.antNEU(); … … 539 553 return; 540 554 } 541 // Concatenate all comments 542 // ------------------------ 555 // Concatenate all comments and all run by date lines 556 // -------------------------------------------------- 543 557 QStringList comments; 558 QStringList runByDate; 544 559 bncSettings settings; 545 560 QString comment = settings.value("reqcComment").toString(); … … 555 570 comments.append(itCmnt.next()); 556 571 } 572 QStringListIterator itRunByDt(rnxNavFile.runByDate()); 573 while (itRunByDt.hasNext()) { 574 runByDate.append(itRunByDt.next()); 575 } 557 576 } 558 577 comments.removeDuplicates(); 578 runByDate.removeDuplicates(); 559 579 560 580 // Read Ephemerides … … 611 631 outNavFile.setVersion(defaultRnxNavVersion2); 612 632 } 633 if (!haveGPS && haveGlonass) { 634 outNavFile.setVersion(defaultRnxNavVersion2); 635 } 613 636 } 614 637 … … 634 657 if (!runBy.isEmpty()) { 635 658 txtMap["RUN BY"] = runBy; 659 } 660 if (!runByDate.empty()) { 661 txtMap["RUN BY DATE"] = runByDate.join("\\n"); 636 662 } 637 663 if (!comments.isEmpty()) { … … 667 693 continue; 668 694 } 695 696 if (outNavFile.version() < 3.0) { 697 if (outNavFile.glonass() && eph->type() != t_eph::GLONASS) { 698 continue; 699 } 700 if (!outNavFile.glonass() && eph->type() != t_eph::GPS) { 701 continue; 702 } 703 } 704 705 if (outNavFile.version() < 4.0) { 706 if (eph->navType() == t_eph::CNAV || 707 eph->navType() == t_eph::CNV1 || 708 eph->navType() == t_eph::CNV2 || 709 eph->navType() == t_eph::CNV3) { 710 continue; 711 } 712 } 713 669 714 if (outNavFile.version() >= 4.0 && 670 715 eph->navType() == t_eph::undefined) { // input files < version 4.0 671 716 continue; 672 717 } 718 673 719 outNavFile.writeEph(eph); 674 720 }
Note:
See TracChangeset
for help on using the changeset viewer.