From e3fc72d77522a13845d22a5848caa8528c5fbe7e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 13 Aug 2016 00:51:06 +0200 Subject: [PATCH] refs #720, fixed: display all models when only selected models are consolidated * in same step fixed location of error message * minor renaming --- src/blackgui/components/dbownmodelscomponent.cpp | 3 ++- src/blackmisc/simulation/aircraftmodelloader.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 490fc3140..866ee4dd1 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -145,7 +145,8 @@ namespace BlackGui void CDbOwnModelsComponent::updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) { this->modelLoader()->replaceOrAddCachedModels(models, simulator); - ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(models); + const CAircraftModelList allModels(this->m_modelLoader->getAircraftModels()); + ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(allModels); } bool CDbOwnModelsComponent::initModelLoader(const CSimulatorInfo &simulator) diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp index a602d402b..aae78ec8d 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelloader.cpp @@ -49,16 +49,14 @@ namespace BlackMisc CStatusMessage IAircraftModelLoader::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) { - const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); - if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); } + const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); // support default value return this->m_caches.setCachedModels(models, sim); } CStatusMessage IAircraftModelLoader::replaceOrAddCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) { if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); } - const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); - if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); } + const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); // support default values CAircraftModelList allModels(this->m_caches.getSyncronizedCachedModels(sim)); int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive); if (c > 0) @@ -159,9 +157,9 @@ namespace BlackMisc return this->getSimulator().toQString(); } - bool IAircraftModelLoader::supportsSimulator(const CSimulatorInfo &info) + bool IAircraftModelLoader::supportsSimulator(const CSimulatorInfo &simulator) { - return getSimulator().matchesAny(info); + return getSimulator().matchesAny(simulator); } void IAircraftModelLoader::cancelLoading()