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

Ref T197, adjusted emulated driver

Browse Source
This commit is contained in:
Klaus Basan
2017-11-17 17:48:14 +01:00
parent d77200a49a
commit 8b55bcc178
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,10 @@ namespace BlackSimPlugin
Q_ASSERT_X(sApp && sApp->getIContextSimulator(), Q_FUNC_INFO, "Need context"); Q_ASSERT_X(sApp && sApp->getIContextSimulator(), Q_FUNC_INFO, "Need context");
CSimulatorEmulated::registerHelp(); CSimulatorEmulated::registerHelp();
this->setObjectName(info.getSimulatorInfo()); this->onSettingsChanged(); // init from settings
m_myAircraft = this->getOwnAircraft(); // sync with provider m_myAircraft = this->getOwnAircraft(); // sync with provider
m_monitorWidget.reset(new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWindow())); m_monitorWidget.reset(new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWindow()));
this->onSettingsChanged();
connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor); connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor);
connect(&m_interpolatorFetchTimer, &QTimer::timeout, this, &CSimulatorEmulated::fetchFromInterpolator); connect(&m_interpolatorFetchTimer, &QTimer::timeout, this, &CSimulatorEmulated::fetchFromInterpolator);
@@ -355,6 +355,8 @@ namespace BlackSimPlugin
const CSimulatorInfo simulator = settings.getEmulatedSimulator(); const CSimulatorInfo simulator = settings.getEmulatedSimulator();
const CSimulatorPluginInfoList plugins = sApp->getIContextSimulator()->getAvailableSimulatorPlugins(); const CSimulatorPluginInfoList plugins = sApp->getIContextSimulator()->getAvailableSimulatorPlugins();
const CSimulatorPluginInfo plugin = plugins.findBySimulator(simulator); const CSimulatorPluginInfo plugin = plugins.findBySimulator(simulator);
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "need single simulator");
if (plugin.isValid()) if (plugin.isValid())
{ {
// ? restart driver, disconnect/reconnect // ? restart driver, disconnect/reconnect
@@ -362,14 +364,13 @@ namespace BlackSimPlugin
} }
else else
{ {
CLogMessage(this).validationError("No valid plugin for %1") << settings.getEmulatedSimulator().getSimulator(); CLogMessage(this).validationError("No valid plugin for '%1'") << simulator.toQString();
} }
// update provider // update provider, own name, title
this->updateOwnModel(settings.getOwnModel()); this->updateOwnModel(settings.getOwnModel());
// own name
this->setObjectName(simulator); this->setObjectName(simulator);
if (m_monitorWidget) { m_monitorWidget->updateWindowTitle(simulator); }
} }
void CSimulatorEmulated::connectOwnSignals() void CSimulatorEmulated::connectOwnSignals()