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

refs #369, thread safe access to aircraft parts, situations

Browse Source
This commit is contained in:
Klaus Basan
2015-02-13 21:54:53 +01:00
parent c47871b813
commit 38a8c45b9e
8 changed files with 165 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/airspace_monitor.h
View File

@@ -44,22 +44,22 @@ namespace BlackCore
CAirspaceMonitor(QObject *parent, const BlackMisc::Simulation::IOwnAircraftProviderReadOnly *ownAircraft, INetwork *network, CVatsimBookingReader *bookings, CVatsimDataFileReader *dataFile);
//! \copydoc IRenderedAircraftProviderReadOnly::renderedAircraft
virtual const BlackMisc::Simulation::CSimulatedAircraftList &renderedAircraft() const override { return m_aircraftInRange; }
virtual const BlackMisc::Simulation::CSimulatedAircraftList &renderedAircraft() const override;
//! \copydoc IRenderedAircraftProvider::renderedAircraft
virtual BlackMisc::Simulation::CSimulatedAircraftList &renderedAircraft() override { return m_aircraftInRange; }
virtual BlackMisc::Simulation::CSimulatedAircraftList &renderedAircraft() override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftSituations
virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const override { return m_aircraftSituations; }
virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftSituations
virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override { return m_aircraftSituations; }
virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override { return m_aircraftParts; }
virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override { return m_aircraftParts; }
virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override;
//! \copydoc IRenderedAircraftProvider::renderedAircraftParts
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
@@ -95,6 +95,9 @@ namespace BlackCore
//! Returns the closest ATC station operating on the given frequency, if any
BlackMisc::Aviation::CAtcStation getAtcStationForComUnit(const BlackMisc::Aviation::CComSystem &comSystem);
//! Clear the contents
void clear();
//! Request to update other clients' data from the network
void requestDataUpdates();
@@ -104,6 +107,13 @@ namespace BlackCore
//! Create dummy entries for performance tests
void testCreateDummyOnlineAtcStations(int number);
public slots:
//! \copydoc IRenderedAircraftProviderReadOnly::getRenderedAircraftSituations
virtual BlackMisc::Aviation::CAircraftSituationList getRenderedAircraftSituations() const override;
//! \copydoc IRenderedAircraftProviderReadOnly::getRenderedAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList getRenderedAircraftParts() const override;
signals:
//! Online ATC stations were changed
void changedAtcStationsOnline();
@@ -126,10 +136,6 @@ namespace BlackCore
//! Read for model matching
void readyForModelMatching(const BlackMisc::Simulation::CSimulatedAircraft &renderedAircraft);
public:
//! Clear the contents
void clear();
private:
BlackMisc::Aviation::CAtcStationList m_atcStationsOnline;
BlackMisc::Aviation::CAtcStationList m_atcStationsBooked;