Changeset 2357 in ntrip for trunk/BNC/bncpppclient.cpp
- Timestamp:
- Mar 9, 2010, 8:26:55 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bncpppclient.cpp
r2342 r2357 68 68 } 69 69 70 if (settings.value("pppSPP").toString() == "PPP") { 71 _pppMode = true; 72 } 73 else { 74 _pppMode = false; 75 } 76 70 77 connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)), 71 78 this, SLOT(slotNewEphGPS(gpsephemeris))); … … 375 382 //////////////////////////////////////////////////////////////////////////// 376 383 t_irc bncPPPclient::getSatPos(const bncTime& tt, const QString& prn, 377 ColumnVector& xc, ColumnVector& vv, bool& corr) { 378 379 //const bool CORR_REQUIRED = true; 380 bncSettings settings; 384 ColumnVector& xc, ColumnVector& vv) { 385 381 386 const double MAXAGE = 120.0; 382 383 384 corr = false;385 387 386 388 if (_eph.contains(prn)) { … … 388 390 ee->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data()); 389 391 390 // if (CORR_REQUIRED) { 391 if (settings.value("pppSPP").toString() == "PPP") { 392 if (_pppMode) { 392 393 if (_corr.contains(prn)) { 393 394 t_corr* cc = _corr.value(prn); 394 395 if (ee->IOD() == cc->iod && (tt - cc->tt) < MAXAGE) { 395 corr = true;396 396 applyCorr(tt, cc, xc, vv); 397 397 return success; … … 443 443 ColumnVector xc(4); 444 444 ColumnVector vv(3); 445 bool corr = false; 446 if (getSatPos(ToT, satData->prn, xc, vv, corr) != success) { 445 if (getSatPos(ToT, satData->prn, xc, vv) != success) { 447 446 return failure; 448 447 } … … 455 454 satData->vv = vv; 456 455 satData->clk = clkSat * t_CST::c; 457 satData->clkCorr = corr;458 456 return success; 459 457 }
Note:
See TracChangeset
for help on using the changeset viewer.