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

refs #366 cleanup

Browse Source 
* Removed obsolete signal from IContextSimulator
* Removed connectToSimulator() method from IContextSimulator as it is no
longer relevant
* CSimulatorComponent updates automatically when simulator disconnects
* FS9 & FSX drivers update (including FSCommon)
This commit is contained in:
Michał Garapich
2015-03-23 19:56:59 +01:00
committed by Roland Winklmeier
parent 63e48ae332
commit 4d4acb20bc
22 changed files with 68 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/context_simulator.h
View File

@@ -65,10 +65,8 @@ namespace BlackCore
virtual ~IContextSimulator() {}
signals:
//! Simulator started or stopped
void startedChanged(bool startedChanged);
//! Simulator combined status
//! \sa ISimulator::SimulatorStatus
void simulatorStatusChanged(int status);
//! Only a limited number of aircraft displayed
@@ -84,7 +82,6 @@ namespace BlackCore
void ownAircraftModelChanged(BlackMisc::Simulation::CSimulatedAircraft aircraft);
public slots:
//! Return list of available simulator plugins
virtual BlackSim::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const = 0;
@@ -93,14 +90,9 @@ namespace BlackCore
virtual bool isConnected() const = 0;
//! Can we connect?
//! \todo Remove?
virtual bool canConnect() const = 0;
//! Connect to simulator
virtual bool connectToSimulator() = 0;
//! Connect to simulator (asynchronous version)
virtual void asyncConnectToSimulator() = 0;
//! Disconnect from simulator
virtual bool disconnectFromSimulator() = 0;

31
src/blackcore/context_simulator_impl.cpp
View File

@@ -36,9 +36,8 @@ namespace BlackCore
m_mapper(new QSignalMapper(this))
{
findSimulatorPlugins();
// Maps listener instance
connect(m_mapper, static_cast<void (QSignalMapper::*)(QObject *)>(&QSignalMapper::mapped), this, &CContextSimulator::ps_simulatorStarted);
// do not load plugin here, as it depends on settings
// it has to be guaranteed the settings are alredy loaded
}
CContextSimulator::~CContextSimulator()
@@ -111,26 +110,6 @@ namespace BlackCore
return m_simulator->simulator->canConnect();
}
bool CContextSimulator::connectToSimulator()
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulator)
return false;
Q_ASSERT(m_simulator->simulator);
return m_simulator->simulator->connectTo();
}
void CContextSimulator::asyncConnectToSimulator()
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulator || m_canConnectResult.isRunning())
return; // already checking
Q_ASSERT(m_simulator->simulator);
m_simulator->simulator->asyncConnectTo();
}
bool CContextSimulator::disconnectFromSimulator()
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
@@ -210,7 +189,7 @@ namespace BlackCore
return;
}
Q_ASSERT(m_simulator->simulator);
m_simulator->reloadInstalledModels();
m_simulator->simulator->reloadInstalledModels();
}
CAircraftIcao CContextSimulator::getIcaoForModelString(const QString &modelString) const
@@ -419,10 +398,10 @@ namespace BlackCore
settingsChanged(static_cast<uint>(IContextSettings::SettingsSimulator));
// try to connect
asyncConnectToSimulator();
m_simulator->simulator->asyncConnectTo();
// info about what is going on
CLogMessage(this).info("Simulator plugin loaded: %1") << this->m_simulator->getSimulatorInfo().toQString(true);
CLogMessage(this).info("Simulator plugin loaded: %1") << this->m_simulator->info.toQString(true);
return true;
}
@@ -567,7 +546,7 @@ namespace BlackCore
m_simulator->simulator->removeRemoteAircraft(callsign);
}
void CContextSimulator::ps_onConnectionStatusChanged(ISimulator::ConnectionStatus status)
void CContextSimulator::ps_onSimulatorStatusChanged(int status)
{
Q_ASSERT(m_simulator);
Q_ASSERT(m_simulator->simulator);

6
src/blackcore/context_simulator_impl.h
View File

@@ -56,12 +56,6 @@ namespace BlackCore
//! \copydoc IContextSimulator::canConnect
virtual bool canConnect() const override;
//! \copydoc IContextSimulator::connectTo
virtual bool connectToSimulator() override;
//! \copydoc IContextSimulator::asyncConnectTo
virtual void asyncConnectToSimulator() override;
//! \copydoc IContextSimulator::disconnectFrom
virtual bool disconnectFromSimulator() override;

10
src/blackcore/context_simulator_proxy.cpp
View File

@@ -69,16 +69,6 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("canConnect"));
}
bool CContextSimulatorProxy::connectToSimulator()
{
return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("connectToSimulator"));
}
void CContextSimulatorProxy::asyncConnectToSimulator()
{
m_dBusInterface->callDBus(QLatin1Literal("asyncConnectToSimulator"));
}
bool CContextSimulatorProxy::disconnectFromSimulator()
{
return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("disconnectFromSimulator"));

6
src/blackcore/context_simulator_proxy.h
View File

@@ -53,12 +53,6 @@ namespace BlackCore
//! \copydoc IContextSimulator::canConnect
virtual bool canConnect() const override;
//! \copydoc IContextSimulator::connectTo
virtual bool connectToSimulator() override;
//! \copydoc IContextSimulator::asyncConnectTo
virtual void asyncConnectToSimulator() override;
//! \copydoc IContextSimulator::disconnectFrom
virtual bool disconnectFromSimulator() override;

4
src/blackcore/network_vatlib.cpp
View File

@@ -259,9 +259,9 @@ namespace BlackCore
VatSimType CNetworkVatlib::convertToSimType(CSimulatorPluginInfo &simInfo)
{
/* TODO Define recognized simulators somewhere */
if (simInfo.simulator() == "fs9" || simInfo.simulator() == "fsx") {
if (simInfo.getSimulator() == "fs9" || simInfo.getSimulator() == "fsx") {
return vatSimTypeMSCFS;
} else if (simInfo.simulator() == "xplane") {
} else if (simInfo.getSimulator() == "xplane") {
return vatSimTypeXPLANE;
} else {
return vatSimTypeUnknown;