Changeset 5120 in ntrip for trunk/BNC/src/bnccore.cpp
- Timestamp:
- Apr 14, 2013, 6:26:22 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnccore.cpp
r5084 r5120 115 115 _userName = _userName.leftJustified(20, ' ', true); 116 116 117 _lastDumpCoSec = 0; 118 119 _corrs = new QMultiMap<long, QString>; 117 _corrs = new QMultiMap<bncTime, QString>; 120 118 121 119 _currentDateAndTimeGPS = 0; … … 633 631 // 634 632 //////////////////////////////////////////////////////////////////////////// 635 void t_bncCore::slotNewCorrLine(QString line, QString staID, longcoTime) {633 void t_bncCore::slotNewCorrLine(QString line, QString staID, bncTime coTime) { 636 634 637 635 QMutexLocker locker(&_mutex); … … 646 644 647 645 bncSettings settings; 648 _waitCoTime = settings.value("corrTime").to Int();649 if (_waitCoTime < 0 ) {650 _waitCoTime = 0 ;646 _waitCoTime = settings.value("corrTime").toDouble(); 647 if (_waitCoTime < 0.0) { 648 _waitCoTime = 0.0; 651 649 } 652 650 653 651 // First time, set the _lastDumpSec immediately 654 652 // -------------------------------------------- 655 if ( _lastDumpCoSec == 0) {656 _lastDumpCoSec = coTime - 1 ;653 if (!_lastDumpCoSec.valid()) { 654 _lastDumpCoSec = coTime - 1.0; 657 655 } 658 656 659 657 // An old correction - throw it away 660 658 // --------------------------------- 661 if (_waitCoTime > 0 && coTime <= _lastDumpCoSec) {662 if (!_bncComb) {659 if (_waitCoTime > 0.0 && coTime <= _lastDumpCoSec) { 660 /// if (!_bncComb) { 663 661 QString line = staID + ": Correction for one sat neglected because overaged by " + 664 QString().sprintf(" % ldsec",662 QString().sprintf(" %f sec", 665 663 _lastDumpCoSec - coTime + _waitCoTime); 666 664 messagePrivate(line.toAscii()); 667 665 emit( newMessage(line.toAscii(), true) ); 668 }666 /// } 669 667 return; 670 668 } … … 674 672 // Dump Corrections 675 673 // ---------------- 676 if (_waitCoTime == 0 ) {674 if (_waitCoTime == 0.0) { 677 675 dumpCorrs(); 678 676 } … … 685 683 // Dump Complete Correction Epochs 686 684 //////////////////////////////////////////////////////////////////////////// 687 void t_bncCore::dumpCorrs( long minTime, longmaxTime) {688 for ( long sec = minTime; sec <= maxTime; sec++) {685 void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) { 686 for (bncTime sec = minTime; sec <= maxTime; sec = sec + 1.0) { 689 687 QList<QString> allCorrs = _corrs->values(sec); 690 688 dumpCorrs(allCorrs); … … 697 695 void t_bncCore::dumpCorrs() { 698 696 QList<QString> allCorrs; 699 QMutableMapIterator< long, QString> it(*_corrs);697 QMutableMapIterator<bncTime, QString> it(*_corrs); 700 698 while (it.hasNext()) { 701 699 allCorrs << it.next().value();
Note:
See TracChangeset
for help on using the changeset viewer.