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

Ref T681, renamed to rememberElevationAndSimulatorCG and style

Browse Source
This commit is contained in:
Klaus Basan
2019-06-12 01:43:57 +02:00
committed by Mat Sutcliffe
parent 30609ef7ad
commit 71e09b008f
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -116,6 +116,7 @@ namespace BlackCore
signals:
//! Changed aircraft model
//! \private Use ISimulatorContext::ownAircraftModelChanged
//! \remark used for cross context updates
void ps_changedModel(const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &identifier);
public slots:

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

@@ -106,7 +106,7 @@ namespace BlackCore
{
if (simulator.isSingleSimulator())
{
const QString simDir = m_simulatorSettings.getSimulatorDirectoryOrDefault(simulator);
const QString simDir = m_multiSimulatorSettings.getSimulatorDirectoryOrDefault(simulator);
m_validator->setCurrentSimulator(simulator, simDir);
}
else
@@ -149,15 +149,15 @@ namespace BlackCore
if (!p.isValid()) { return {}; }
const CSimulatorInfo sim = p.getSimulatorInfo();
if (!sim.isSingleSimulator()) { return {}; }
return m_simulatorSettings.getSettings(sim);
return m_multiSimulatorSettings.getSettings(sim);
}
bool CContextSimulator::setSimulatorSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator)
{
if (!simulator.isSingleSimulator()) { return false; }
CSimulatorSettings simSettings = m_simulatorSettings.getSettings(simulator);
CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator);
if (simSettings == settings) { return false; }
const CStatusMessage msg = m_simulatorSettings.setSettings(settings, simulator);
const CStatusMessage msg = m_multiSimulatorSettings.setSettings(settings, simulator);
CLogMessage::preformatted(msg);
return true;
}
@@ -323,7 +323,7 @@ namespace BlackCore
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_validator) { return false; }
const QString simDir = simulator.isSingleSimulator() ? m_simulatorSettings.getSimulatorDirectoryOrDefault(simulator) : "";
const QString simDir = simulator.isSingleSimulator() ? m_multiSimulatorSettings.getSimulatorDirectoryOrDefault(simulator) : "";
return m_validator->triggerValidation(simulator, simDir);
}
@@ -933,7 +933,7 @@ namespace BlackCore
return msgs;
}
const QStringList modelDirs = m_simulatorSettings.getModelDirectoriesOrDefault(simulator);
const QStringList modelDirs = m_multiSimulatorSettings.getModelDirectoriesOrDefault(simulator);
if (modelDirs.isEmpty() || modelDirs.front().isEmpty())
{
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityError, u"No model directory"));

2
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -282,7 +282,7 @@ namespace BlackCore
BlackMisc::CSettingReadOnly<Application::TEnabledSimulators> m_enabledSimulators { this, &CContextSimulator::changeEnabledSimulators };
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< matching settings (all simulators)
BlackMisc::CData<BlackMisc::Simulation::Data::TSimulatorLastSelection> m_modelSetSimulator { this }; //!< current simulator used for model set
BlackMisc::Simulation::Settings::CMultiSimulatorSettings m_simulatorSettings { this }; //!< individual for simulator, for validation of models
BlackMisc::Simulation::Settings::CMultiSimulatorSettings m_multiSimulatorSettings { this }; //!< individual for simulator, for validation of models
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TInterpolationAndRenderingSetupGlobal> m_renderSettings { this }; //!< rendering/interpolation settings (all simulators)
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSimulatorMessages> m_messageSettings { this }; //!< settings for messages (all simulators)
};