Changeset 6442 in ntrip for trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
- Timestamp:
- Dec 26, 2014, 12:03:26 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
r6441 r6442 73 73 } 74 74 else { 75 _usedEph = new QMap<QString, t_eph*>;75 _usedEph = new QMap<QString, const t_eph*>; 76 76 } 77 77 … … 348 348 in >> prn; 349 349 350 t_eph* eph = 0;351 const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(prn);352 if (ephPair) {353 354 eph = ephPair->last;350 const t_eph* ephLast = _ephUser->ephLast(prn); 351 const t_eph* ephPrev = _ephUser->ephPrev(prn); 352 const t_eph* eph = ephLast; 353 354 if (eph) { 355 355 356 356 // Use previous ephemeris if the last one is too recent 357 357 // ---------------------------------------------------- 358 358 const int MINAGE = 60; // seconds 359 if (ephP air->prev && eph->receptDateTime().isValid() &&359 if (ephPrev && eph->receptDateTime().isValid() && 360 360 eph->receptDateTime().secsTo(currentDateAndTimeGPS()) < MINAGE) { 361 eph = ephP air->prev;361 eph = ephPrev; 362 362 } 363 363 … … 371 371 eph = 0; 372 372 if (_usedEph->contains(prn)) { 373 t_eph* usedEph = _usedEph->value(prn);374 if (usedEph == eph Pair->last) {375 eph = eph Pair->last;376 } 377 else if (usedEph == ephP air->prev) {378 eph = ephP air->prev;373 const t_eph* usedEph = _usedEph->value(prn); 374 if (usedEph == ephLast) { 375 eph = ephLast; 376 } 377 else if (usedEph == ephPrev) { 378 eph = ephPrev; 379 379 } 380 380 } … … 638 638 // 639 639 //////////////////////////////////////////////////////////////////////////// 640 void bncRtnetUploadCaster::processSatellite( t_eph* eph, int GPSweek,640 void bncRtnetUploadCaster::processSatellite(const t_eph* eph, int GPSweek, 641 641 double GPSweeks, const QString& prn, 642 642 const ColumnVector& rtnAPC,
Note:
See TracChangeset
for help on using the changeset viewer.