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

Ref T348, get specialized settings

Browse Source 
Related: Ref T317 Ref T247 Ref T335
This commit is contained in:
Klaus Basan
2018-09-13 01:58:56 +02:00
parent a07d18aa44
commit da2a7f6506
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/simulator.cpp
View File

@@ -737,10 +737,10 @@ namespace BlackCore
void ISimulator::initSimulatorInternals() void ISimulator::initSimulatorInternals()
{ {
const CSimulatorSettings s = this->getSimulatorSettings(); const CSpecializedSimulatorSettings s = this->getSimulatorSettings();
m_simulatorInternals.setSimulatorName(this->getSimulatorName()); m_simulatorInternals.setSimulatorName(this->getSimulatorName());
m_simulatorInternals.setSwiftPluginName(this->getSimulatorPluginInfo().toQString()); m_simulatorInternals.setSwiftPluginName(this->getSimulatorPluginInfo().toQString());
m_simulatorInternals.setSimulatorInstallationDirectory(s.getSimulatorDirectory()); m_simulatorInternals.setSimulatorInstallationDirectory(s.getSimulatorDirectoryOrDefault());
} }
void ISimulator::rememberElevationAndCG(const CCallsign &callsign, const QString &modelString, const Geo::CElevationPlane &elevation, const CLength &cg) void ISimulator::rememberElevationAndCG(const CCallsign &callsign, const QString &modelString, const Geo::CElevationPlane &elevation, const CLength &cg)

2
src/blackcore/simulator.h
View File

@@ -182,7 +182,7 @@ namespace BlackCore
void reloadWeatherSettings(); void reloadWeatherSettings();
//! Settings for current simulator //! Settings for current simulator
BlackMisc::Simulation::Settings::CSimulatorSettings getSimulatorSettings() const { return m_settings.getSettings(this->getSimulatorInfo()); } BlackMisc::Simulation::Settings::CSpecializedSimulatorSettings getSimulatorSettings() const { return m_settings.getSpecializedSettings(this->getSimulatorInfo()); }
//! Driver will be unloaded //! Driver will be unloaded
virtual void unload(); virtual void unload();

5
src/blackmisc/simulation/settings/simulatorsettings.h
View File

@@ -126,13 +126,16 @@ namespace BlackMisc
//! Ctor //! Ctor
CSpecializedSimulatorSettings(const QString &simulatorDir, const CSimulatorInfo &simulator) : m_genericSettings(CSimulatorSettings(simulatorDir)), m_simulator(simulator) {} CSpecializedSimulatorSettings(const QString &simulatorDir, const CSimulatorInfo &simulator) : m_genericSettings(CSimulatorSettings(simulatorDir)), m_simulator(simulator) {}
//! The generic settings
const CSimulatorSettings &getSimulatorSettings() const { return m_genericSettings; }
//! Default simulator path per simulator //! Default simulator path per simulator
const QString &getDefaultSimulatorDirectory() const; const QString &getDefaultSimulatorDirectory() const;
//! Simulator directory or empty if default dir //! Simulator directory or empty if default dir
const QString &getSimulatorDirectoryIfNotDefault() const; const QString &getSimulatorDirectoryIfNotDefault() const;
//! Simulator directory or default model path //! Simulator directory or default path
const QString &getSimulatorDirectoryOrDefault() const; const QString &getSimulatorDirectoryOrDefault() const;
//! Model directories or default //! Model directories or default