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

Ref T259, Ref T243 set elevation for provider if available in airspace monitor

Browse Source
This commit is contained in:
Klaus Basan
2018-03-22 03:24:30 +01:00
parent 7d396d94bd
commit d76ce109bd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/airspacemonitor.cpp
View File

@@ -189,19 +189,19 @@ namespace BlackCore
bool CAirspaceMonitor::isRemoteAircraftSupportingParts(const CCallsign &callsign) const bool CAirspaceMonitor::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
{ {
QReadLocker l(&m_lockParts); QReadLocker l(&m_lockParts);
return m_aircraftSupportingParts.contains(callsign); return m_aircraftWithParts.contains(callsign);
} }
int CAirspaceMonitor::getRemoteAircraftSupportingPartsCount() const int CAirspaceMonitor::getRemoteAircraftSupportingPartsCount() const
{ {
QReadLocker l(&m_lockParts); QReadLocker l(&m_lockParts);
return m_aircraftSupportingParts.size(); return m_aircraftWithParts.size();
} }
CCallsignSet CAirspaceMonitor::remoteAircraftSupportingParts() const CCallsignSet CAirspaceMonitor::remoteAircraftSupportingParts() const
{ {
QReadLocker l(&m_lockParts); QReadLocker l(&m_lockParts);
return m_aircraftSupportingParts; return m_aircraftWithParts;
} }
QList<QMetaObject::Connection> CAirspaceMonitor::connectRemoteAircraftProviderSignals( QList<QMetaObject::Connection> CAirspaceMonitor::connectRemoteAircraftProviderSignals(
@@ -592,7 +592,7 @@ namespace BlackCore
} }
// locked members // locked members
{ QWriteLocker l(&m_lockParts); m_partsByCallsign.clear(); m_aircraftSupportingParts.clear(); } { QWriteLocker l(&m_lockParts); m_partsByCallsign.clear(); m_aircraftWithParts.clear(); }
{ QWriteLocker l(&m_lockSituations); m_situationsByCallsign.clear(); } { QWriteLocker l(&m_lockSituations); m_situationsByCallsign.clear(); }
{ QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); } { QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); }
{ QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); } { QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); }
@@ -1153,7 +1153,7 @@ namespace BlackCore
// in case of inconsistencies I always remove here // in case of inconsistencies I always remove here
this->removeFromAircraftCachesAndLogs(callsign); this->removeFromAircraftCachesAndLogs(callsign);
{ QWriteLocker l1(&m_lockParts); m_partsByCallsign.remove(callsign); m_aircraftSupportingParts.remove(callsign); } { QWriteLocker l1(&m_lockParts); m_partsByCallsign.remove(callsign); m_aircraftWithParts.remove(callsign); }
{ QWriteLocker l2(&m_lockSituations); m_situationsByCallsign.remove(callsign); } { QWriteLocker l2(&m_lockSituations); m_situationsByCallsign.remove(callsign); }
{ QWriteLocker l4(&m_lockPartsHistory); m_aircraftPartsHistory.remove(callsign); } { QWriteLocker l4(&m_lockPartsHistory); m_aircraftPartsHistory.remove(callsign); }
this->removeClient(callsign); this->removeClient(callsign);
@@ -1300,7 +1300,7 @@ namespace BlackCore
correctiveParts = partsList; correctiveParts = partsList;
// aircraft supporting parts // aircraft supporting parts
m_aircraftSupportingParts.insert(callsign); // mark as callsign which supports parts m_aircraftWithParts.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");

6
src/blackcore/airspacemonitor.h
View File

@@ -241,9 +241,9 @@ namespace BlackCore
QMap<BlackMisc::Aviation::CCallsign, FsInnPacket> m_tempFsInnPackets; QMap<BlackMisc::Aviation::CCallsign, FsInnPacket> m_tempFsInnPackets;
// hashs, because not sorted by key but keeping order // hashs, because not sorted by key but keeping order
CSituationsPerCallsign m_situationsByCallsign; //!< situations, for performance reasons per callsign, thread safe access required CSituationsPerCallsign m_situationsByCallsign; //!< situations, for performance reasons per callsign, thread safe access required
CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign, thread safe access required CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign, thread safe access required
BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts, thread safe access required BlackMisc::Aviation::CCallsignSet m_aircraftWithParts; //!< aircraft supporting parts, thread safe access required
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache; //!< flight plan information retrieved from network and cached QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache; //!< flight plan information retrieved from network and cached