Changeset 8418 in ntrip for branches/BNC_2.12
- Timestamp:
- Jul 13, 2018, 1:14:56 PM (6 years ago)
- Location:
- branches/BNC_2.12/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/BNC_2.12/src/bncgetthread.cpp
r8273 r8418 53 53 #include "bnccore.h" 54 54 #include "bncutils.h" 55 #include "bnctime.h" 55 56 #include "bnczerodecoder.h" 56 57 #include "bncnetqueryv0.h" … … 620 621 if (!_rawFile) { 621 622 QString prn(obs._prn.toString().c_str()); 622 long iSec = long(floor(obs._time.gpssec() + 0.5)); 623 long obsTime = obs._time.gpsw() * 7 * 24 * 3600 + iSec; 624 QMap<QString, long>::const_iterator it = _prnLastEpo.find(prn); 623 bncTime obsTime = obs._time; 624 QMap<QString, bncTime>::const_iterator it = _prnLastEpo.find(prn); 625 625 if (it != _prnLastEpo.end()) { 626 longoldTime = it.value();626 bncTime oldTime = it.value(); 627 627 if (obsTime < oldTime) { 628 emit(newMessage(_staID + ": old observation " + prn.toAscii(), 629 false)); 628 emit(newMessage(_staID + ": old observation " + prn.toLatin1(), false)); 630 629 continue; 631 630 } else if (obsTime == oldTime) { 632 emit(newMessage( 633 _staID + ": observation coming more than once " 634 + prn.toAscii(), false)); 631 emit(newMessage(_staID + ": observation coming more than once " 632 + prn.toLatin1(), false)); 635 633 continue; 636 634 } … … 638 636 _prnLastEpo[prn] = obsTime; 639 637 } 638 640 639 641 640 decoder()->dumpRinexEpoch(obs, _format); -
branches/BNC_2.12/src/bncgetthread.h
r8272 r8418 138 138 bool _rawOutput; 139 139 bool _latencycheck; 140 QMap<QString, long>_prnLastEpo;140 QMap<QString, bncTime> _prnLastEpo; 141 141 QMap<char, QVector<QString> > _rnxTypes; 142 142 QStringList _gloSlots; -
branches/BNC_2.12/src/bncrinex.cpp
r8398 r8418 496 496 // ------------- 497 497 const t_satObs& fObs = obsList.first(); 498 QDateTime datTimNom = dateAndTimeFromGPSweek(fObs._time.gpsw(), f loor(fObs._time.gpssec()+0.5));498 QDateTime datTimNom = dateAndTimeFromGPSweek(fObs._time.gpsw(), fObs._time.gpssec()); 499 499 500 500 // Close the file -
branches/BNC_2.12/src/bnctime.cpp
r8373 r8418 6 6 #include <sstream> 7 7 #include <iomanip> 8 #include <iostream> 8 9 9 10 #include "bnctime.h" … … 82 83 if(msec/1000.0 < sec - 86400.0) 83 84 ++week; 84 return set(week, msec/1000.0);85 return set(week, double(msec/1000.0)); 85 86 } 86 87 … … 118 119 intsec = sec; 119 120 updatetime(&week, &intsec, msec, 0); /* Moscow -> GPS */ 120 sec = intsec+ (msec%1000)/1000.0;121 sec = intsec+double((msec%1000)/1000.0); 121 122 return set(week, sec); 122 123 } … … 132 133 msec -= 7*24*60*60*1000; 133 134 currentGPSWeeks(week, sec); 134 if( msec/1000.0 < sec - 86400.0)135 if((msec/1000.0) < (sec - 86400.0)) { 135 136 ++week; 136 return set(week, msec/1000.0);137 } 138 137 } 138 return set(week, double(msec/1000.0)); 139 } 139 140 // 140 141 ////////////////////////////////////////////////////////////////////////////// -
branches/BNC_2.12/src/bncutils.cpp
r8064 r8418 251 251 bool checkForWrongObsEpoch(bncTime obsEpoch) { 252 252 const double maxDt = 600.0; 253 long iSec = long(floor(obsEpoch.gpssec()+0.5)); 254 long obsTime = obsEpoch.gpsw()*7*24*3600 + iSec; 253 bncTime obsTime = obsEpoch; 255 254 int week; 256 255 double sec; 257 256 currentGPSWeeks(week, sec); 258 long currTime = week * 7*24*3600 + long(sec);257 bncTime currTime(week, sec); 259 258 260 259 if (fabs(currTime - obsTime) > maxDt) { … … 575 574 const ColumnVector& yi, // vector of the initial y-values 576 575 double dx, // the step size for the integration 577 double* acc, // ad itional acceleration576 double* acc, // additional acceleration 578 577 ColumnVector (*der)(double x, const ColumnVector& y, double* acc) 579 578 // A pointer to a function that computes the
Note:
See TracChangeset
for help on using the changeset viewer.