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

integration refs #267 fix compile error in simulator_xplane introduced by commit:426dd4a0

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-06-25 19:12:33 +01:00
parent f2b27f5048
commit 72e350bc3c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -86,7 +86,7 @@ namespace BlackSimPlugin
m_traffic = new CXBusTrafficProxy(m_conn, this); m_traffic = new CXBusTrafficProxy(m_conn, this);
if (m_service->isValid() && m_traffic->isValid() && m_traffic->initialize()) if (m_service->isValid() && m_traffic->isValid() && m_traffic->initialize())
{ {
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::aircraftModelChanged); connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitAircraftModelChanged);
m_watcher->setConnection(m_conn); m_watcher->setConnection(m_conn);
emit statusChanged(ISimulator::Connected); emit statusChanged(ISimulator::Connected);
return true; return true;
@@ -126,7 +126,7 @@ namespace BlackSimPlugin
{ {
delete m_service; delete m_service;
m_service = new CXBusServiceProxy(m_conn, this); m_service = new CXBusServiceProxy(m_conn, this);
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::aircraftModelChanged); connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitAircraftModelChanged);
} }
else if (serviceName == CXBusTrafficProxy::InterfaceName()) else if (serviceName == CXBusTrafficProxy::InterfaceName())
{ {
@@ -148,6 +148,14 @@ namespace BlackSimPlugin
emit statusChanged(ISimulator::Disconnected); emit statusChanged(ISimulator::Disconnected);
} }
void CSimulatorXPlane::emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao)
{
emit aircraftModelChanged({ path, true });
Q_UNUSED(filename);
Q_UNUSED(livery);
Q_UNUSED(icao);
}
// convert xplane squawk mode to swift squawk mode // convert xplane squawk mode to swift squawk mode
BlackMisc::Aviation::CTransponder::TransponderMode xpdrMode(int xplaneMode, bool ident) BlackMisc::Aviation::CTransponder::TransponderMode xpdrMode(int xplaneMode, bool ident)
{ {
@@ -191,7 +199,7 @@ namespace BlackSimPlugin
BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const
{ {
if (! isConnected()) { return {}; } if (! isConnected()) { return {}; }
return m_xplaneData.aircraftModelPath; return { m_xplaneData.aircraftModelPath, true };
} }
bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft) bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft)

1
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -77,6 +77,7 @@ namespace BlackSimPlugin
private slots: private slots:
void serviceRegistered(const QString &serviceName); void serviceRegistered(const QString &serviceName);
void serviceUnregistered(); void serviceUnregistered();
void emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao);
void fastTimerTimeout(); void fastTimerTimeout();
void slowTimerTimeout(); void slowTimerTimeout();