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

refs #585, adjusted loaders

Browse Source 
* use paths from settings
* no longer pass model directory and exclude directories
This commit is contained in:
Klaus Basan
2016-06-12 03:06:17 +02:00
parent 1ef1cc0021
commit bc344c73fc
6 changed files with 59 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -16,6 +16,7 @@
#include "blackmisc/simulation/aircraftmodelinterfaces.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/data/modelcaches.h"
#include "blackmisc/simulation/settings/settingssimulator.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/statusmessage.h"
@@ -71,12 +72,6 @@ namespace BlackMisc
//! Optional DB models can be passed and used for data consolidation.
void startLoading(LoadMode mode = InBackgroundWithCache, const CAircraftModelList &dbModels = {});
//! Change the directory
bool changeRootDirectory(const QString &directory);
//! Current root directory
QString getRootDirectory() const { return this->m_rootDirectory; }
//! Loading finished?
virtual bool isLoadingFinished() const = 0;
@@ -99,6 +94,12 @@ namespace BlackMisc
//! Is the given simulator supported?
bool supportsSimulator(const BlackMisc::Simulation::CSimulatorInfo &info);
//! Current root directory
QString getModelDirectory() const;
//! Exclude directories
QStringList getModelExcludeDirectories(bool relative) const;
//! Cancel read
void cancelLoading();
@@ -131,7 +132,7 @@ namespace BlackMisc
protected:
//! Constructor
IAircraftModelLoader(const CSimulatorInfo &simulator, const QString &rootDirectory, const QStringList &excludeDirs = {});
IAircraftModelLoader(const CSimulatorInfo &simulator);
//! Cache timestamp
QDateTime getCacheTimestamp() const;
@@ -148,11 +149,10 @@ namespace BlackMisc
//! Start the loading process from disk
virtual void startLoadingFromDisk(LoadMode mode, const BlackMisc::Simulation::CAircraftModelList &dbModels) = 0;
std::atomic<bool> m_cancelLoading { false }; //!< flag
std::atomic<bool> m_loadingInProgress { false }; //!< Loading in progress
QString m_rootDirectory; //!< root directory parsing aircraft.cfg files
QStringList m_excludedDirectories; //!< directories not to be parsed
BlackMisc::Simulation::Data::CModelCaches m_caches { this }; //!< caches
std::atomic<bool> m_cancelLoading { false }; //!< flag
std::atomic<bool> m_loadingInProgress { false }; //!< Loading in progress
BlackMisc::Simulation::Data::CModelCaches m_caches { this }; //!< caches
BlackMisc::Simulation::Settings::CMultiSimulatorSimulatorSettings m_settings { this }; //!< settings
protected slots:
//! Loading finished