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

refs #619, allow to directly manipulate cache in loader

Browse Source
This commit is contained in:
Klaus Basan
2016-03-22 08:04:17 +01:00
parent 6fdddf8f93
commit 5dc976caca
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackmisc/simulation/aircraftmodelloader.cpp
View File

@@ -39,12 +39,12 @@ namespace BlackMisc
return dir.exists(); return dir.exists();
} }
bool IAircraftModelLoader::mergeWithDbData(CAircraftModelList &modelsFromSimulator, const CAircraftModelList &dbModels) bool IAircraftModelLoader::mergeWithDbData(CAircraftModelList &modelsFromSimulator, const CAircraftModelList &dbModels, bool force)
{ {
if (dbModels.isEmpty() || modelsFromSimulator.isEmpty()) { return false; } if (dbModels.isEmpty() || modelsFromSimulator.isEmpty()) { return false; }
for (CAircraftModel &simModel : modelsFromSimulator) for (CAircraftModel &simModel : modelsFromSimulator)
{ {
if (simModel.hasValidDbKey()) { continue; } // already done if (!force && simModel.hasValidDbKey()) { continue; } // already done
CAircraftModel dbModel(dbModels.findFirstByModelStringOrDefault(simModel.getModelString())); CAircraftModel dbModel(dbModels.findFirstByModelStringOrDefault(simModel.getModelString()));
if (!dbModel.hasValidDbKey()) if (!dbModel.hasValidDbKey())
{ {
@@ -56,6 +56,36 @@ namespace BlackMisc
return true; return true;
} }
CStatusMessage IAircraftModelLoader::replaceCacheWithModelData(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->m_simulatorInfo;
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
const CStatusMessage m(this->m_caches.setModels(models, sim));
if (m.isSeverityInfoOrLess())
{
// set is asny
// emit loadingFinished(true, sim);
}
return m;
}
CStatusMessage IAircraftModelLoader::replaceOrAddModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); }
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->m_simulatorInfo;
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
CAircraftModelList allModels(this->m_caches.getModels(sim));
int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive);
if (c > 0)
{
return this->replaceCacheWithModelData(models, sim);
}
else
{
return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data changed");
}
}
void IAircraftModelLoader::ps_loadFinished(bool success) void IAircraftModelLoader::ps_loadFinished(bool success)
{ {
Q_UNUSED(success); Q_UNUSED(success);

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

@@ -91,11 +91,20 @@ namespace BlackMisc
//! Shutdown //! Shutdown
void gracefulShutdown(); void gracefulShutdown();
//! Create a loader //! Create a loader and syncronize caches
static std::unique_ptr<IAircraftModelLoader> createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simInfo); static std::unique_ptr<IAircraftModelLoader> createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simInfo);
//! Merge with DB data if possible //! Merge with DB data if possible
static bool mergeWithDbData(BlackMisc::Simulation::CAircraftModelList &modelsFromSimulator, const BlackMisc::Simulation::CAircraftModelList &dbModels); static bool mergeWithDbData(BlackMisc::Simulation::CAircraftModelList &modelsFromSimulator, const BlackMisc::Simulation::CAircraftModelList &dbModels, bool force = false);
public slots:
//! Set cache from outside, this should only be used in special cases.
//! But it allows to modify data elsewhere nd update the cache with manipulated data.
BlackMisc::CStatusMessage replaceCacheWithModelData(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
//! Set cache from outside, this should only be used in special cases.
//! But it allows to modify data elsewhere nd update the cache with manipulated data.
BlackMisc::CStatusMessage replaceOrAddModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
signals: signals:
//! Parsing is finished //! Parsing is finished