flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #829, consolidated settings for simulator/messages

Browse Source 
* move traits from blackcore to blackmisc
* renamed CSimulatorSettings/Messages
This commit is contained in:
Klaus Basan
2016-12-10 05:31:42 +01:00
parent 763e92cc2a
commit b69008e0b3
22 changed files with 151 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/blackmiscsim/samplesfscommon.cpp
View File

@@ -14,7 +14,7 @@
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "blackmisc/simulation/simulationsettings.h"
#include "blackmisc/simulation/simulatorsettings.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include <QByteArray>
@@ -41,8 +41,8 @@ namespace BlackSample
const CSimulatorInfo sim = fsDir.toLower().contains("simobjects") ? CSimulatorInfo::FSX : CSimulatorInfo::FS9;
CMultiSimulatorSettings multiSettings;
const CSettings originalSettings = multiSettings.getSettings(sim);
CSettings newSettings(originalSettings);
const CSimulatorSettings originalSettings = multiSettings.getSettings(sim);
CSimulatorSettings newSettings(originalSettings);
newSettings.setModelDirectory(fsDir);
multiSettings.setSettings(newSettings, sim); // set, but do NOT(!) save

6
samples/blackmiscsim/samplesmodelmapping.cpp
View File

@@ -15,7 +15,7 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/simulationsettings.h"
#include "blackmisc/simulation/simulatorsettings.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
@@ -54,8 +54,8 @@ namespace BlackSample
const CSimulatorInfo sim = fsDir.toLower().contains("simobjects") ? CSimulatorInfo::FSX : CSimulatorInfo::FS9;
CMultiSimulatorSettings multiSettings;
const CSettings originalSettings = multiSettings.getSettings(sim);
CSettings newSettings(originalSettings);
const CSimulatorSettings originalSettings = multiSettings.getSettings(sim);
CSimulatorSettings newSettings(originalSettings);
newSettings.setModelDirectory(fsDir);
multiSettings.setSettings(newSettings, sim); // set, but do NOT(!) save