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

refs #335, refs #342 improved simulator states

Browse Source 
* new signal sending all 3 states together (connected, running, paused)
* renamed ISimulator::Status to ConnectionStatus
* consolidated some member / signal names
* for FS9/XPlane implemented stub functions
This commit is contained in:
Klaus Basan
2014-11-01 18:47:42 +01:00
committed by Roland Winklmeier
parent 326ae96def
commit a94bceddab
16 changed files with 202 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,14 +71,12 @@ namespace BlackSimPlugin
return m_service && m_traffic;
}
bool CSimulatorXPlane::canConnect()
bool CSimulatorXPlane::canConnect() const
{
if (isConnected()) { return true; }
auto conn = QDBusConnection::sessionBus(); // TODO make this configurable
auto dummy = new CXBusServiceProxy(conn, this, true);
bool ok = dummy->isValid();
delete dummy;
return ok;
CXBusServiceProxy dummy(conn, nullptr, true);
return dummy.isValid();
}
bool CSimulatorXPlane::connectTo()
@@ -94,7 +92,7 @@ namespace BlackSimPlugin
connect(m_service, &CXBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange);
m_service->updateAirportsInRange();
m_watcher->setConnection(m_conn);
emit statusChanged(ISimulator::Connected);
emit connectionStatusChanged(ISimulator::Connected);
return true;
}
else
@@ -116,7 +114,7 @@ namespace BlackSimPlugin
{
m_traffic->cleanup();
}
emit statusChanged(ISimulator::Disconnected);
emit connectionStatusChanged(ISimulator::Disconnected);
m_conn = QDBusConnection { "default" };
m_watcher->setConnection(m_conn);
delete m_service;
@@ -144,7 +142,7 @@ namespace BlackSimPlugin
}
if (m_service && m_traffic)
{
emit statusChanged(ISimulator::Connected);
emit connectionStatusChanged(ISimulator::Connected);
}
}
@@ -154,7 +152,7 @@ namespace BlackSimPlugin
delete m_traffic;
m_service = nullptr;
m_traffic = nullptr;
emit statusChanged(ISimulator::Disconnected);
emit connectionStatusChanged(ISimulator::Disconnected);
}
void CSimulatorXPlane::ps_emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao)

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

@@ -36,7 +36,16 @@ namespace BlackSimPlugin
virtual bool isConnected() const override;
//! \copydoc BlackCore::ISimulator::canConnect
virtual bool canConnect() override;
virtual bool canConnect() const override;
//! \copydoc ISimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?
//! \copydoc ISimulator::isSimPaused
virtual bool isPaused() const override { return false; }
//! \copydoc ISimulator::isRunning
virtual bool isRunning() const override { return isConnected(); }
public slots:
//! \copydoc BlackCore::ISimulator::connectTo
@@ -86,15 +95,9 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::setTimeSynchronization
virtual void setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override;
//! \copydoc ISimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?
//! \copydoc ISimulator::getTimeSynchronizationOffset
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override { return BlackMisc::PhysicalQuantities::CTime(0, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); }
//! \copydoc ISimulator::isSimPaused
virtual bool isSimPaused() const override { return false; }
private slots:
void ps_serviceRegistered(const QString &serviceName);
void ps_serviceUnregistered();