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

Ref T259, Ref T243 unify ground details when a new situation is received

Browse Source
This commit is contained in:
Klaus Basan
2018-04-04 05:15:11 +02:00
parent bc4875afbb
commit aa21d9ea92
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspacemonitor.cpp
View File

@@ -938,7 +938,7 @@ namespace BlackCore
else if (client.hasCapability(CClient::FsdWithAircraftConfig)) else if (client.hasCapability(CClient::FsdWithAircraftConfig))
{ {
const CAircraftPartsList parts = this->remoteAircraftParts(callsign); const CAircraftPartsList parts = this->remoteAircraftParts(callsign);
if (!parts.isEmpty()) { correctedSituation.adjustGroundFlag(parts); } if (!parts.isEmpty()) { correctedSituation.adjustGroundFlag(parts, true); }
} }
} }

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

@@ -181,6 +181,12 @@ namespace BlackMisc
situationList.push_frontKeepLatestFirstAdjustOffset(situation, IRemoteAircraftProvider::MaxSituationsPerCallsign); situationList.push_frontKeepLatestFirstAdjustOffset(situation, IRemoteAircraftProvider::MaxSituationsPerCallsign);
} }
// unify all inbound ground information
if (situation.hasInboundGroundInformation())
{
situationList.setOnGroundDetails(situation.getOnGroundDetails());
}
// check sort order // check sort order
Q_ASSERT_X(situationList.isSortedAdjustedLatestFirst(), Q_FUNC_INFO, "wrong sort order"); Q_ASSERT_X(situationList.isSortedAdjustedLatestFirst(), Q_FUNC_INFO, "wrong sort order");
Q_ASSERT_X(situationList.size() <= IRemoteAircraftProvider::MaxSituationsPerCallsign, Q_FUNC_INFO, "Wrong size"); Q_ASSERT_X(situationList.size() <= IRemoteAircraftProvider::MaxSituationsPerCallsign, Q_FUNC_INFO, "Wrong size");

4
tests/blackmisc/testinterpolatorparts.cpp
View File

@@ -117,11 +117,11 @@ namespace BlackMiscTest
} }
CAircraftSituation s0 = situations[0]; CAircraftSituation s0 = situations[0];
s0.adjustGroundFlag(partsOnGround); s0.adjustGroundFlag(partsOnGround, true);
QVERIFY2(s0.getOnGround(), "Supposed to be on ground"); QVERIFY2(s0.getOnGround(), "Supposed to be on ground");
s0 = situations[0]; s0 = situations[0];
s0.adjustGroundFlag(partsNotOnGround); s0.adjustGroundFlag(partsNotOnGround, true);
QVERIFY2(!s0.getOnGround(), "Supposed to be not on ground"); QVERIFY2(!s0.getOnGround(), "Supposed to be not on ground");
qint64 distanceMs = -1; qint64 distanceMs = -1;