flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-23 13:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T299, renaming

Browse Source
This commit is contained in:
Klaus Basan
2018-08-01 23:08:14 +02:00
parent ff9d6147c8
commit d05b4da2a9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspacemonitor.cpp
View File

@@ -971,7 +971,7 @@ namespace BlackCore
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign"); BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
if (callsign.isEmpty()) { return situation; } if (callsign.isEmpty()) { return situation; }
CAircraftSituation correctedSituation(allowTestOffset ? this->testAddAltitudeOffsetToSituation(situation) : situation); CAircraftSituation correctedSituation(allowTestOffset ? this->addTestAltitudeOffsetToSituation(situation) : situation);
bool haveRequestedElevation = false; bool haveRequestedElevation = false;
const bool canLikelySkipNearGround = correctedSituation.canLikelySkipNearGroundInterpolation(); const bool canLikelySkipNearGround = correctedSituation.canLikelySkipNearGroundInterpolation();
if (!correctedSituation.hasGroundElevation() && !canLikelySkipNearGround) if (!correctedSituation.hasGroundElevation() && !canLikelySkipNearGround)

4
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -234,7 +234,7 @@ namespace BlackMisc
} }
// add offset (for testing only) // add offset (for testing only)
CAircraftSituation situationCorrected(allowTestOffset ? this->testAddAltitudeOffsetToSituation(situation) : situation); CAircraftSituation situationCorrected(allowTestOffset ? this->addTestAltitudeOffsetToSituation(situation) : situation);
// CG, model // CG, model
const CAircraftModel aircraftModel = this->getAircraftInRangeModelForCallsign(cs); const CAircraftModel aircraftModel = this->getAircraftInRangeModelForCallsign(cs);
@@ -608,7 +608,7 @@ namespace BlackMisc
return m_testOffset.contains(callsign); return m_testOffset.contains(callsign);
} }
CAircraftSituation CRemoteAircraftProvider::testAddAltitudeOffsetToSituation(const CAircraftSituation &situation) const CAircraftSituation CRemoteAircraftProvider::addTestAltitudeOffsetToSituation(const CAircraftSituation &situation) const
{ {
// for global offset testing set "true" // for global offset testing set "true"
constexpr bool globalOffsetTest = false; constexpr bool globalOffsetTest = false;

2
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -408,7 +408,7 @@ namespace BlackMisc
bool guessOnGroundAndUpdateModelCG(Aviation::CAircraftSituation &situation, const Aviation::CAircraftSituationChange &change, const CAircraftModel &aircraftModel); bool guessOnGroundAndUpdateModelCG(Aviation::CAircraftSituation &situation, const Aviation::CAircraftSituationChange &change, const CAircraftModel &aircraftModel);
//! Add an offset for testing //! Add an offset for testing
Aviation::CAircraftSituation testAddAltitudeOffsetToSituation(const Aviation::CAircraftSituation &situation) const; Aviation::CAircraftSituation addTestAltitudeOffsetToSituation(const Aviation::CAircraftSituation &situation) const;
private: private:
//! Store the latest changes //! Store the latest changes