flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 15:49:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T259, Ref T243 automatically adjust situation gnd.flag from parts in airspace monitor

Browse Source 
Turns parts GND flag into a situation gnd. flag, which would be compatible with network situation gnd flags.
This commit is contained in:
Klaus Basan
2018-03-10 18:06:16 +01:00
parent 61b71599bb
commit 9e29858f95
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/blackcore/airspacemonitor.cpp
View File

@@ -1241,10 +1241,14 @@ 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; } if (callsign.isEmpty()) { return; }
CAircraftSituation correctedSituation = situation;
const CAircraftPartsList parts = this->remoteAircraftParts(callsign);
if (!parts.isEmpty()) { correctedSituation.adjustGroundFlag(parts); }
// list from new to old // list from new to old
QWriteLocker lock(&m_lockSituations); QWriteLocker lock(&m_lockSituations);
CAircraftSituationList &situationList = m_situationsByCallsign[callsign]; CAircraftSituationList &situationList = m_situationsByCallsign[callsign];
situationList.push_frontKeepLatestFirstAdjustOffset(situation, IRemoteAircraftProvider::MaxSituationsPerCallsign); situationList.push_frontKeepLatestFirstAdjustOffset(correctedSituation, IRemoteAircraftProvider::MaxSituationsPerCallsign);
// 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");
@@ -1257,19 +1261,31 @@ namespace BlackCore
if (callsign.isEmpty()) { return; } if (callsign.isEmpty()) { return; }
// list sorted from new to old // list sorted from new to old
QWriteLocker lock(&m_lockParts); CAircraftPartsList correctiveParts;
CAircraftPartsList &partsList = m_partsByCallsign[callsign]; {
partsList.push_frontKeepLatestFirstAdjustOffset(parts, IRemoteAircraftProvider::MaxPartsPerCallsign); QWriteLocker lock(&m_lockParts);
CAircraftPartsList &partsList = m_partsByCallsign[callsign];
partsList.push_frontKeepLatestFirstAdjustOffset(parts, IRemoteAircraftProvider::MaxPartsPerCallsign);
// remove outdated parts (but never remove the most recent one) // remove outdated parts (but never remove the most recent one)
IRemoteAircraftProvider::removeOutdatedParts(partsList); IRemoteAircraftProvider::removeOutdatedParts(partsList);
correctiveParts = partsList;
// aircraft supporting parts // aircraft supporting parts
m_aircraftSupportingParts.insert(callsign); // mark as callsign which supports parts m_aircraftSupportingParts.insert(callsign); // mark as callsign which supports parts
// check sort order // check sort order
Q_ASSERT_X(partsList.isSortedAdjustedLatestFirst(), Q_FUNC_INFO, "wrong sort order"); Q_ASSERT_X(partsList.isSortedAdjustedLatestFirst(), Q_FUNC_INFO, "wrong sort order");
Q_ASSERT_X(partsList.size() <= IRemoteAircraftProvider::MaxPartsPerCallsign, Q_FUNC_INFO, "Wrong size"); Q_ASSERT_X(partsList.size() <= IRemoteAircraftProvider::MaxPartsPerCallsign, Q_FUNC_INFO, "Wrong size");
}
// adjust gnd.flag from parts
if (!correctiveParts.isEmpty())
{
QWriteLocker lock(&m_lockSituations);
CAircraftSituationList &situationList = m_situationsByCallsign[callsign];
situationList.adjustGroundFlag(parts);
}
} }
void CAirspaceMonitor::sendInitialAtcQueries(const CCallsign &callsign) void CAirspaceMonitor::sendInitialAtcQueries(const CCallsign &callsign)

1
src/blackcore/airspacemonitor.h
View File

@@ -290,6 +290,7 @@ namespace BlackCore
//! Store an aircraft situation //! Store an aircraft situation
//! \threadsafe //! \threadsafe
//! \remark sets gnd flag from parts if parts are available
void storeAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation); void storeAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Store an aircraft part //! Store an aircraft part