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

Use simulator from plugin if plugin is connected

Browse Source
This commit is contained in:
Klaus Basan
2019-09-10 23:00:07 +02:00
parent 6352f088ab
commit d7aa0af723
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -221,7 +221,7 @@ namespace BlackCore
CAircraftModelList CContextSimulator::getModelSet() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
const CSimulatorInfo simulator = m_modelSetSimulator.get();
const CSimulatorInfo simulator = this->getModelSetLoaderSimulator();
if (!simulator.isSingleSimulator()) { return CAircraftModelList(); }
CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator);
@@ -231,6 +231,18 @@ namespace BlackCore
CSimulatorInfo CContextSimulator::getModelSetLoaderSimulator() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (m_simulatorPlugin.second)
{
if (m_simulatorPlugin.second->isConnected())
{
if (m_simulatorPlugin.second->isEmulatedDriver())
{
// specialized version returning the "emulated info"
return this->getSimulatorPluginInfo().getSimulatorInfo();
}
return m_simulatorPlugin.first.getSimulatorInfo();
}
}
return m_modelSetSimulator.get();
}
@@ -238,7 +250,7 @@ namespace BlackCore
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (this->isSimulatorAvailable()) { return; }
if (this->isSimulatorAvailable()) { return; } // if a plugin is loaded, do ignore this
m_modelSetSimulator.set(simulator);
const CAircraftModelList models = this->getModelSet(); // cache synced
m_aircraftMatcher.setModelSet(models, simulator, false);

5
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -211,6 +211,11 @@ namespace BlackSimPlugin
this->emitSimulatorCombinedStatus();
}
CSimulatorInfo CSimulatorEmulated::getEmulatedSimulator() const
{
return m_pluginSettings.get().getEmulatedSimulator();
}
bool CSimulatorEmulated::changeInternalCom(const CSimulatedAircraft &aircraft)
{
bool changed = false;

3
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -90,6 +90,9 @@ namespace BlackSimPlugin
//! UI setter
void setCombinedStatus(bool connected, bool simulating, bool paused);
//! The emulated simulated simulator
BlackMisc::Simulation::CSimulatorInfo getEmulatedSimulator() const;
//! Internal own aircraft
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
const BlackMisc::Simulation::CSimulatedAircraft &getInternalOwnAircraft() const { return m_myAircraft; }