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

Ref T28, removed areModelFilesUpdated and info if loading was from cache

Browse Source 
* removed CacheUntilNewer
* did not really work and had some problems
* cache timestamp not really a good value to compare with
* too slow with remote file
This commit is contained in:
Klaus Basan
2017-05-04 01:46:32 +02:00
committed by Mathew Sutcliffe
parent 6fc48ab160
commit c3ed0bc394
6 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,15 +57,21 @@ namespace BlackMisc
NotSet = 0,
LoadDirectly = 1 << 0, //!< load syncronously (blocking), normally for testing
LoadInBackground = 1 << 1, //!< load in background, asyncronously
CacheUntilNewer = 1 << 2, //!< use cache until newer data re available
CacheFirst = 1 << 3, //!< always use cache (if it has data)
CacheSkipped = 1 << 4, //!< ignore cache
CacheOnly = 1 << 5, //!< only read cache, never load from disk
CacheFirst = 1 << 2, //!< always use cache (if it has data)
CacheSkipped = 1 << 3, //!< ignore cache
CacheOnly = 1 << 4, //!< only read cache, never load from disk
InBackgroundWithCache = LoadInBackground | CacheFirst, //!< Background, cached
InBackgroundNoCache = LoadInBackground | CacheSkipped //!< Background, not cached
};
Q_DECLARE_FLAGS(LoadMode, LoadModeFlag)
//! Load mode
enum LoadFinishedInfo
{
CacheLoaded, //!< cache was loaded
ParsedData //!< parsed data
};
//! Destructor
virtual ~IAircraftModelLoader();
@@ -98,9 +104,6 @@ namespace BlackMisc
//! Count of loaded models
int getAircraftModelsCount() const { return getAircraftModels().size(); }
//! Model files updated?
virtual bool areModelFilesUpdated() const = 0;
//! Which simulator is supported by that very loader
const CSimulatorInfo getSimulator() const;
@@ -155,7 +158,7 @@ namespace BlackMisc
signals:
//! Parsing is finished or cache has been loaded
void loadingFinished(const BlackMisc::CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator);
void loadingFinished(const BlackMisc::CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, LoadFinishedInfo info);
protected:
//! Constructor
@@ -181,7 +184,7 @@ namespace BlackMisc
protected slots:
//! Loading finished, also logs messages
void ps_loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator);
void ps_loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, LoadFinishedInfo info);
//! A cache has been changed
void ps_cacheChanged(const CSimulatorInfo &simInfo);
@@ -191,6 +194,7 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::IAircraftModelLoader::LoadMode)
Q_DECLARE_METATYPE(BlackMisc::Simulation::IAircraftModelLoader::LoadModeFlag)
Q_DECLARE_METATYPE(BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo)
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackMisc::Simulation::IAircraftModelLoader::LoadMode)
#endif // guard