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

Ref T171, made remote aircraft provider and web service "protected slots" -> "protected"

Browse Source 
* Unlike in other cases, the remote aircraft provider slots are also very frequently called. So besides "style", it might be also useful here to avoid the extra MOC layers.
* Also renamed 2 web service signals and made web service connections Qt::QueuedConnection
This commit is contained in:
Klaus Basan
2017-10-09 18:20:08 +02:00
parent 3c28f8a2de
commit b6333e69d8
12 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -526,7 +526,7 @@ namespace BlackSimPlugin
return true;
}
void CSimulatorXPlane::ps_remoteProviderAddAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation)
void CSimulatorXPlane::onRemoteProviderAddedAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation)
{
if (!isConnected()) { return; } //! \fixme why is this method called when not connected?
using namespace BlackMisc::PhysicalQuantities;
@@ -567,11 +567,11 @@ namespace BlackSimPlugin
{
parts.setLights({ true, false, false, true, true, true, true, true });
}
ps_remoteProviderAddAircraftParts(situation.getCallsign(), parts);
onRemoteProviderAddedAircraftParts(situation.getCallsign(), parts);
}
}
void CSimulatorXPlane::ps_remoteProviderAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts)
void CSimulatorXPlane::onRemoteProviderAddedAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts)
{
if (!isConnected()) { return; } //! \fixme why is this method called when not connected?
m_traffic->addPlaneSurfaces(callsign.asString(), parts.isGearDown() ? 1 : 0,
@@ -582,7 +582,7 @@ namespace BlackSimPlugin
m_traffic->setPlaneTransponder(callsign.asString(), 2000, true, false);
}
void CSimulatorXPlane::ps_remoteProviderRemovedAircraft(const CCallsign &callsign)
void CSimulatorXPlane::onRemoteProviderRemovedAircraft(const CCallsign &callsign)
{
Q_UNUSED(callsign);
//! \todo call removeRemoteAircraft or just let removeRemoteAircraft handle it?

17
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -106,17 +106,14 @@ namespace BlackSimPlugin
//! Creates an appropriate dbus connection from the string describing it
static QDBusConnection connectionFromString(const QString &str);
protected slots:
//! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderAddAircraftSituation
virtual void ps_remoteProviderAddAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
//! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderAddAircraftParts
virtual void ps_remoteProviderAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts) override;
//! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderRemovedAircraft
virtual void ps_remoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
protected:
//! \name Remote aircraft provider overrides
//! @{
virtual void onRemoteProviderAddedAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
virtual void onRemoteProviderAddedAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts) override;
virtual void onRemoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! @}
//! \copydoc BlackCore::ISimulator::isConnected
virtual bool isConnected() const override;