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

refs #720, fixed: display all models when only selected models are consolidated

Browse Source 
* in same step fixed location of error message
* minor renaming
This commit is contained in:
Klaus Basan
2016-08-13 00:51:06 +02:00
committed by Mathew Sutcliffe
parent 4582387684
commit e3fc72d775
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -145,7 +145,8 @@ namespace BlackGui
void CDbOwnModelsComponent::updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) void CDbOwnModelsComponent::updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{ {
this->modelLoader()->replaceOrAddCachedModels(models, 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) bool CDbOwnModelsComponent::initModelLoader(const CSimulatorInfo &simulator)

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

@@ -49,16 +49,14 @@ namespace BlackMisc
CStatusMessage IAircraftModelLoader::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) CStatusMessage IAircraftModelLoader::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{ {
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); // support default value
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
return this->m_caches.setCachedModels(models, sim); return this->m_caches.setCachedModels(models, sim);
} }
CStatusMessage IAircraftModelLoader::replaceOrAddCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) CStatusMessage IAircraftModelLoader::replaceOrAddCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{ {
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); } if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); }
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); // support default values
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
CAircraftModelList allModels(this->m_caches.getSyncronizedCachedModels(sim)); CAircraftModelList allModels(this->m_caches.getSyncronizedCachedModels(sim));
int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive); int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive);
if (c > 0) if (c > 0)
@@ -159,9 +157,9 @@ namespace BlackMisc
return this->getSimulator().toQString(); 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() void IAircraftModelLoader::cancelLoading()