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

refs #614, use interfaces from last step to reuse mergeWithDb data in multiple components

Browse Source 
* adjusted menus
* adjusted loaders and components
This commit is contained in:
Klaus Basan
2016-04-08 14:11:40 +02:00
parent 43c69d2ed0
commit abca1fde52
12 changed files with 115 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -9,6 +9,7 @@
#include "aircraftmodelloaderxplane.h"
#include "xplaneutil.h"
#include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/predicates.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/fileutils.h"
@@ -80,7 +81,7 @@ namespace BlackMisc
[this, rootDirectory, excludedDirectories, dbModels]()
{
auto models = performParsing(rootDirectory, excludedDirectories);
mergeWithDbData(models, dbModels);
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
return models;
});
m_parserWorker->thenWithResult<CAircraftModelList>(this, [this](const auto & models)
@@ -91,7 +92,7 @@ namespace BlackMisc
else if (mode.testFlag(LoadDirectly))
{
CAircraftModelList models(performParsing(m_rootDirectory, m_excludedDirectories));
mergeWithDbData(models, dbModels);
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
updateInstalledModels(models);
}
}
@@ -111,7 +112,7 @@ namespace BlackMisc
void CAircraftModelLoaderXPlane::updateInstalledModels(const CAircraftModelList &models)
{
this->setModelsInCache(models);
this->setCachedModels(models);
emit loadingFinished(true, this->m_simulatorInfo);
}