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

refs #369, prepared for aircraft parts and removed addAircraftSituation

Browse Source
This commit is contained in:
Klaus Basan
2015-02-07 14:29:03 +01:00
parent ee3417ff8b
commit 915492670c
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/airspace_monitor.cpp
View File

@@ -423,6 +423,7 @@ namespace BlackCore
emit removedAircraft(aircraft.getCallsign());
}
m_aircraftSituations.clear();
m_aircraftParts.clear();
m_aircraftInRange.clear();
m_flightPlanCache.clear();
m_icaoCodeCache.clear();

9
src/blackcore/airspace_monitor.h
View File

@@ -55,7 +55,13 @@ namespace BlackCore
//! \copydoc IRenderedAircraftProvider::renderedAircraftSituations
virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override { return m_aircraftSituations; }
//! \copydoc IRenderedAircraftProvider::updateAircraftEnabled
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override { return m_aircraftParts; }
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override { return m_aircraftParts; }
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
//! \copydoc IRenderedAircraftProvider::updateAircraftModel
@@ -130,6 +136,7 @@ namespace BlackCore
BlackMisc::Network::CClientList m_otherClients;
BlackMisc::Simulation::CSimulatedAircraftList m_aircraftInRange;
BlackMisc::Aviation::CAircraftSituationList m_aircraftSituations;
BlackMisc::Aviation::CAircraftPartsList m_aircraftParts;
QMap<BlackMisc::Aviation::CAirportIcao, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache;

12
src/blackcore/context_network_impl.cpp
View File

@@ -109,6 +109,18 @@ namespace BlackCore
return m_airspace->renderedAircraftSituations();
}
const CAircraftPartsList &CContextNetwork::renderedAircraftParts() const
{
Q_ASSERT(this->m_airspace);
return m_airspace->renderedAircraftParts();
}
CAircraftPartsList &CContextNetwork::renderedAircraftParts()
{
Q_ASSERT(this->m_airspace);
return m_airspace->renderedAircraftParts();
}
void CContextNetwork::gracefulShutdown()
{
if (this->m_vatsimBookingReader) { this->m_vatsimBookingReader->quit(); }

6
src/blackcore/context_network_impl.h
View File

@@ -60,6 +60,12 @@ namespace BlackCore
//! \copydoc IRenderedAircraftProviderReadOnly::renderedAircraftSituations
virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override;
public slots:
//! \copydoc IContextNetwork::readAtcBookingsFromSource()

7
src/blackcore/context_simulator_impl.cpp
View File

@@ -314,13 +314,6 @@ namespace BlackCore
this->m_simulator->addRemoteAircraft(remoteAircraft);
}
void CContextSimulator::ps_addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation)
{
Q_ASSERT(this->m_simulator);
if (!this->m_simulator) { return; }
this->m_simulator->addAircraftSituation(callsign, situation);
}
void CContextSimulator::ps_removeRemoteAircraft(const CCallsign &callsign)
{
Q_ASSERT(this->m_simulator);

3
src/blackcore/context_simulator_impl.h
View File

@@ -126,9 +126,6 @@ namespace BlackCore
//! \copydoc ISimulator::addRemoteAircraft
void ps_addRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft);
//! \copydoc ISimulator::addAircraftSituation
void ps_addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation);
//! \copydoc ISimulator::removeRemoteAircraft
void ps_removeRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);