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

refs #459 Removed CAircraftParts::m_correspondingCallsign per Slack discussion MS/RW.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-07 17:29:23 +01:00
parent d1955ba61f
commit 00cd4f4f87
24 changed files with 52 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ namespace BlackMisc
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshot
) = 0;

16
src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
View File

@@ -41,8 +41,8 @@ namespace BlackMisc
CAircraftPartsList CRemoteAircraftProviderDummy::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const
{
if (cutoffTimeBefore < 0) { return m_parts.findByCallsign(callsign); }
return m_parts.findByCallsign(callsign).findBefore(cutoffTimeBefore);
if (cutoffTimeBefore < 0) { return m_parts.value(callsign); }
return m_parts.value(callsign).findBefore(cutoffTimeBefore);
}
CAircraftSituationList CRemoteAircraftProviderDummy::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const
@@ -57,7 +57,7 @@ namespace BlackMisc
CCallsignSet CRemoteAircraftProviderDummy::remoteAircraftSupportingParts() const
{
return m_parts.getCallsigns();
return CCollection<CCallsign>(m_parts.keys());
}
bool CRemoteAircraftProviderDummy::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
@@ -68,7 +68,7 @@ namespace BlackMisc
QList<QMetaObject::Connection> CRemoteAircraftProviderDummy::connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void (const CAircraftSituation &)> situationSlot,
std::function<void (const CAircraftParts &)> partsSlot,
std::function<void (const BlackMisc::Aviation::CCallsign &, const CAircraftParts &)> partsSlot,
std::function<void (const CCallsign &)> removedAircraftSlot,
std::function<void (const CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
)
@@ -129,11 +129,11 @@ namespace BlackMisc
emit addedRemoteAircraftSituation(situation);
}
void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CAircraftParts &parts)
void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CCallsign &callsign, const CAircraftParts &parts)
{
this->m_parts.push_front(parts);
this->m_parts.sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftParts(parts);
this->m_parts[callsign].push_front(parts);
this->m_parts[callsign].sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftParts(callsign, parts);
}
void CRemoteAircraftProviderDummy::clear()

8
src/blackmisc/simulation/remoteaircraftproviderdummy.h
View File

@@ -63,7 +63,7 @@ namespace BlackMisc
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
) override;
@@ -87,7 +87,7 @@ namespace BlackMisc
void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! For testing, add new parts and fire signals
void insertNewAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
void insertNewAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts);
//! Clear all data
void clear();
@@ -97,7 +97,7 @@ namespace BlackMisc
void addedRemoteAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Added parts
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
void addedRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts);
//! Added aircraft
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
@@ -108,7 +108,7 @@ namespace BlackMisc
private:
BlackMisc::Simulation::CSimulatedAircraftList m_aircraft;
BlackMisc::Aviation::CAircraftSituationList m_situations;
BlackMisc::Aviation::CAircraftPartsList m_parts;
CPartsPerCallsign m_parts;
};
} // namespace