flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T261, minor adjustment of testAddAltitudeOffsetToSituation

Browse Source
This commit is contained in:
Klaus Basan
2018-05-08 09:38:49 +02:00
committed by Roland Winklmeier
parent 2e7e210010
commit 3ef18a788a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,8 +197,7 @@ namespace BlackMisc
const qint64 ts = QDateTime::currentMSecsSinceEpoch();
// for testing only
CAircraftSituation situationOffset(situation);
this->testAddAltitudeOffsetToSituation(situationOffset);
const CAircraftSituation situationOffset(this->testAddAltitudeOffsetToSituation(situation));
// verify
if (CBuildConfig::isLocalDeveloperDebugBuild())
@@ -479,13 +478,13 @@ namespace BlackMisc
return m_testOffset.contains(callsign);
}
bool CRemoteAircraftProvider::testAddAltitudeOffsetToSituation(CAircraftSituation &situation) const
CAircraftSituation CRemoteAircraftProvider::testAddAltitudeOffsetToSituation(const CAircraftSituation &situation) const
{
// for global offset testing set "true"
constexpr bool globalOffsetTest = false;
const CCallsign cs(situation.getCallsign());
if (!globalOffsetTest && !this->hasTestAltitudeOffset(cs)) { return false; }
if (!globalOffsetTest && !this->hasTestAltitudeOffset(cs)) { return situation; }
CLength os;
if (globalOffsetTest)
{
@@ -496,9 +495,11 @@ namespace BlackMisc
QReadLocker l(&m_lockSituations);
os = m_testOffset.value(cs);
}
if (os.isNull() || os.isZeroEpsilonConsidered()) { return situation; }
const CAltitude newAlt = situation.getAltitude().withOffset(os);
situation.setAltitude(newAlt);
return true;
CAircraftSituation newSituation(situation);
newSituation.setAltitude(newAlt);
return newSituation;
}
CStatusMessageList CRemoteAircraftProvider::getAircraftPartsHistory(const CCallsign &callsign) const