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

Ref T292, Ref T285 CCentralMultiSimulatorModelCachesProviderBase base class to create model/model set providers

Browse Source
This commit is contained in:
Klaus Basan
2018-07-22 19:54:45 +02:00
parent 0d67497a2f
commit 1d29b6b36f
2 changed files with 107 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/blackmisc/simulation/data/modelcaches.cpp
View File

@@ -492,60 +492,6 @@ namespace BlackMisc
break; break;
} }
} }
CCentralMultiSimulatorModelCachesProvider &CCentralMultiSimulatorModelCachesProvider::modelCachesInstance()
{
static CCentralMultiSimulatorModelCachesProvider c;
return c;
}
CAircraftModelList CCentralMultiSimulatorModelCachesProvider::getCachedModels(const CSimulatorInfo &simulator) const
{
return instanceCaches().getCachedModels(simulator);
}
CStatusMessage CCentralMultiSimulatorModelCachesProvider::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
return instanceCaches().setCachedModels(models, simulator);
}
QDateTime CCentralMultiSimulatorModelCachesProvider::getCacheTimestamp(const CSimulatorInfo &simulator) const
{
return instanceCaches().getCacheTimestamp(simulator);
}
CStatusMessage CCentralMultiSimulatorModelCachesProvider::setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator)
{
return instanceCaches().setCacheTimestamp(ts, simulator);
}
void CCentralMultiSimulatorModelCachesProvider::synchronizeCache(const CSimulatorInfo &simulator)
{
return instanceCaches().synchronizeCache(simulator);
}
void CCentralMultiSimulatorModelCachesProvider::admitCache(const CSimulatorInfo &simulator)
{
return instanceCaches().admitCache(simulator);
}
QString CCentralMultiSimulatorModelCachesProvider::getFilename(const CSimulatorInfo &simulator) const
{
return instanceCaches().getFilename(simulator);
}
bool CCentralMultiSimulatorModelCachesProvider::isSaved(const CSimulatorInfo &simulator) const
{
return instanceCaches().isSaved(simulator);
}
QString CCentralMultiSimulatorModelCachesProvider::getDescription() const
{
return instanceCaches().getDescription();
}
CCentralMultiSimulatorModelCachesProvider::CCentralMultiSimulatorModelCachesProvider(QObject *parent) : IMultiSimulatorModelCaches(parent)
{ }
} // ns } // ns
} // ns } // ns
} // ns } // ns

150
src/blackmisc/simulation/data/modelcaches.h
View File

@@ -157,6 +157,12 @@ namespace BlackMisc
Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorUpdatable) Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorUpdatable)
public: public:
//! \copydoc IModelsForSimulatorSetable::setModelsForSimulator
virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override;
//! \copydoc IModelsForSimulatorUpdatable::updateModelsForSimulator
virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override;
//! Models for simulator //! Models for simulator
//! \threadsafe //! \threadsafe
virtual CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const = 0; virtual CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const = 0;
@@ -187,6 +193,7 @@ namespace BlackMisc
virtual QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const = 0; virtual QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const = 0;
//! Set cache timestamp //! Set cache timestamp
//! \threadsafe
virtual CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) = 0; virtual CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) = 0;
//! Cache saved? //! Cache saved?
@@ -198,6 +205,7 @@ namespace BlackMisc
CSimulatorInfo simulatorsWithInitializedCache() const; CSimulatorInfo simulatorsWithInitializedCache() const;
//! Timestamp //! Timestamp
//! \threadsafe
QDateTime getSynchronizedTimestamp(const CSimulatorInfo &simulator); QDateTime getSynchronizedTimestamp(const CSimulatorInfo &simulator);
//! Set cached models //! Set cached models
@@ -209,18 +217,13 @@ namespace BlackMisc
virtual CStatusMessage clearCachedModels(const CSimulatorInfo &simulator); virtual CStatusMessage clearCachedModels(const CSimulatorInfo &simulator);
//! Synchronize for given simulator //! Synchronize for given simulator
//! \threadsafe
virtual void synchronizeCache(const CSimulatorInfo &simulator) = 0; virtual void synchronizeCache(const CSimulatorInfo &simulator) = 0;
//! Admit the cache for given simulator //! Admit the cache for given simulator
//! \threadsafe //! \threadsafe
virtual void admitCache(const CSimulatorInfo &simulator) = 0; virtual void admitCache(const CSimulatorInfo &simulator) = 0;
//! \copydoc IModelsForSimulatorSetable::setModels
virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override;
//! \copydoc IModelsForSimulatorUpdatable::updateModels
virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override;
//! Info string about models in cache //! Info string about models in cache
QString getInfoString() const; QString getInfoString() const;
@@ -284,10 +287,10 @@ namespace BlackMisc
//! @} //! @}
private: private:
CData<Data::TModelCacheFsx> m_modelCacheFsx {this, &CModelCaches::changedFsx }; //!< FSX cache CData<Data::TModelCacheFsx> m_modelCacheFsx { this, &CModelCaches::changedFsx }; //!< FSX cache
CData<Data::TModelCacheFs9> m_modelCacheFs9 {this, &CModelCaches::changedFs9 }; //!< FS9 cache CData<Data::TModelCacheFs9> m_modelCacheFs9 { this, &CModelCaches::changedFs9 }; //!< FS9 cache
CData<Data::TModelCacheP3D> m_modelCacheP3D {this, &CModelCaches::changedP3D }; //!< P3D cache CData<Data::TModelCacheP3D> m_modelCacheP3D { this, &CModelCaches::changedP3D }; //!< P3D cache
CData<Data::TModelCacheXP> m_modelCacheXP {this, &CModelCaches::changedXP }; //!< XP cache CData<Data::TModelCacheXP> m_modelCacheXP { this, &CModelCaches::changedXP }; //!< XP cache
//! Non virtual version (can be used in ctor) //! Non virtual version (can be used in ctor)
void synchronizeCacheImpl(const CSimulatorInfo &simulator); void synchronizeCacheImpl(const CSimulatorInfo &simulator);
@@ -324,10 +327,10 @@ namespace BlackMisc
//! @} //! @}
private: private:
CData<Data::TModelSetCacheFsx> m_modelCacheFsx {this, &CModelSetCaches::changedFsx }; //!< FSX cache CData<Data::TModelSetCacheFsx> m_modelCacheFsx { this, &CModelSetCaches::changedFsx }; //!< FSX cache
CData<Data::TModelSetCacheFs9> m_modelCacheFs9 {this, &CModelSetCaches::changedFs9}; //!< FS9 cache CData<Data::TModelSetCacheFs9> m_modelCacheFs9 { this, &CModelSetCaches::changedFs9}; //!< FS9 cache
CData<Data::TModelSetCacheP3D> m_modelCacheP3D {this, &CModelSetCaches::changedP3D }; //!< P3D cache CData<Data::TModelSetCacheP3D> m_modelCacheP3D { this, &CModelSetCaches::changedP3D }; //!< P3D cache
CData<Data::TModelSetCacheXP> m_modelCacheXP {this, &CModelSetCaches::changedXP }; //!< XP cache CData<Data::TModelSetCacheXP> m_modelCacheXP { this, &CModelSetCaches::changedXP }; //!< XP cache
//! Non virtual version (can be used in ctor) //! Non virtual version (can be used in ctor)
void synchronizeCacheImpl(const CSimulatorInfo &simulator); void synchronizeCacheImpl(const CSimulatorInfo &simulator);
@@ -337,8 +340,42 @@ namespace BlackMisc
void admitCacheImpl(const CSimulatorInfo &simulator); void admitCacheImpl(const CSimulatorInfo &simulator);
}; };
//! One central instance of the caches //! One central instance of the caches base class
class BLACKMISC_EXPORT CCentralMultiSimulatorModelCachesProvider : public IMultiSimulatorModelCaches template <class TCaches, class Derived> class CCentralMultiSimulatorModelCachesProviderBase : public IMultiSimulatorModelCaches
{
public:
//! \name Interface implementations
//! @{
virtual CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const override { return instanceCaches().getCachedModels(simulator); }
virtual CStatusMessage setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { return instanceCaches().setCachedModels(models, simulator); }
virtual QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const override { return instanceCaches().getCacheTimestamp(simulator); }
virtual CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) override { return instanceCaches().setCacheTimestamp(ts, simulator); }
virtual void synchronizeCache(const CSimulatorInfo &simulator) override { return instanceCaches().synchronizeCache(simulator); }
virtual void admitCache(const CSimulatorInfo &simulator) override { return instanceCaches().admitCache(simulator); }
virtual QString getFilename(const CSimulatorInfo &simulator) const override { return instanceCaches().getFilename(simulator); }
virtual bool isSaved(const CSimulatorInfo &simulator) const override { return instanceCaches().isSaved(simulator); }
virtual QString getDescription() const override { return instanceCaches().getDescription(); }
//! @}
protected:
//! Ctor
CCentralMultiSimulatorModelCachesProviderBase(QObject *parent = nullptr) : IMultiSimulatorModelCaches(parent) { }
private:
TCaches m_caches { false, this }; //!< used caches
//! Singleton caches
TCaches &instanceCaches() { return this->isInstance() ? m_caches : Derived::modelCachesInstance().m_caches; }
//! Singleton caches
const TCaches &instanceCaches() const { return this->isInstance() ? m_caches : Derived::modelCachesInstance().m_caches; }
//! Is this object the central instance?
bool isInstance() const { return this == &Derived::modelCachesInstance(); }
};
//! One central instance of the model caches
class BLACKMISC_EXPORT CCentralMultiSimulatorModelCachesProvider : public CCentralMultiSimulatorModelCachesProviderBase<CModelCaches, CCentralMultiSimulatorModelCachesProvider>
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorSetable) Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorSetable)
@@ -346,37 +383,64 @@ namespace BlackMisc
public: public:
//! Central instance //! Central instance
static CCentralMultiSimulatorModelCachesProvider &modelCachesInstance(); static CCentralMultiSimulatorModelCachesProvider &modelCachesInstance()
{
//! \name Interface implementations static CCentralMultiSimulatorModelCachesProvider c;
//! @{ return c;
virtual CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const override; }
virtual CStatusMessage setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override;
virtual QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const override;
virtual CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) override;
virtual void synchronizeCache(const CSimulatorInfo &simulator) override;
virtual void admitCache(const CSimulatorInfo &simulator) override;
virtual QString getFilename(const CSimulatorInfo &simulator) const override;
virtual bool isSaved(const CSimulatorInfo &simulator) const override;
virtual QString getDescription() const override;
//! @}
protected: protected:
//! Ctor //! Ctor
CCentralMultiSimulatorModelCachesProvider(QObject *parent = nullptr); CCentralMultiSimulatorModelCachesProvider(QObject *parent = nullptr) : CCentralMultiSimulatorModelCachesProviderBase(parent) {}
private:
CModelCaches m_caches { this }; //!< the caches
//! Singleton caches
CModelCaches &instanceCaches() { return this->isInstance() ? m_caches : modelCachesInstance().m_caches; }
//! Singleton caches
const CModelCaches &instanceCaches() const { return this->isInstance() ? m_caches : modelCachesInstance().m_caches; }
//! Is this object the central instance?
bool isInstance() const { return this == &modelCachesInstance(); }
}; };
//! One central instance of the model set caches
class BLACKMISC_EXPORT CCentralMultiSimulatorModelSetCachesProvider : public CCentralMultiSimulatorModelCachesProviderBase<CModelSetCaches, CCentralMultiSimulatorModelSetCachesProvider>
{
Q_OBJECT
Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorSetable)
Q_INTERFACES(BlackMisc::Simulation::IModelsForSimulatorUpdatable)
public:
//! Central instance
static CCentralMultiSimulatorModelSetCachesProvider &modelCachesInstance()
{
static CCentralMultiSimulatorModelSetCachesProvider c;
return c;
}
protected:
//! Ctor
CCentralMultiSimulatorModelSetCachesProvider(QObject *parent = nullptr) : CCentralMultiSimulatorModelCachesProviderBase(parent) {}
};
//! Basically a QObject free (delegate based) version of CCentralMultiSimulatorModelSetCachesProvider
class BLACKMISC_EXPORT CCentralMultiSimulatorModelSetCachesAware:
public IModelsForSimulatorSetable,
public IModelsForSimulatorUpdatable
{
public:
//! \name Look like IMultiSimulatorModelCaches interface
//! @{
CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator); }
int getCachedModelsCount(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModelsCount(simulator); }
CStatusMessage setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().setCachedModels(models, simulator); }
QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCacheTimestamp(simulator); }
CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().setCacheTimestamp(ts, simulator); }
void synchronizeCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator); }
void admitCache(const CSimulatorInfo &simulator) { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().admitCache(simulator); }
QString getFilename(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getFilename(simulator); }
bool isSaved(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().isSaved(simulator); }
QString getDescription() const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getDescription(); }
//! @}
//! \copydoc IModelsForSimulatorSetable::setModelsForSimulator
virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().setModelsForSimulator(models, simulator); }
//! \copydoc IModelsForSimulatorUpdatable::updateModelsForSimulator
virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().updateModelsForSimulator(models, simulator); }
};
} // ns } // ns
} // ns } // ns
} // ns } // ns