flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +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

9
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -9,6 +9,7 @@
#include "aircraftcfgparser.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/predicates.h"
#include "blackmisc/logmessage.h"
@@ -110,7 +111,7 @@ namespace BlackMisc
if (ok)
{
models = (aircraftCfgEntriesList.toAircraftModelList(this->getSimulator()));
this->mergeWithDbData(models, dbModels);
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
}
return std::make_tuple(aircraftCfgEntriesList, models, ok);
});
@@ -124,7 +125,7 @@ namespace BlackMisc
const bool hasData = !models.isEmpty();
if (hasData)
{
this->setModelsInCache(models); // not thread safe
this->setCachedModels(models); // not thread safe
}
// currently I treat no data as error
emit this->loadingFinished(hasData, this->m_simulatorInfo);
@@ -140,11 +141,11 @@ namespace BlackMisc
bool ok;
this->m_parsedCfgEntriesList = performParsing(m_rootDirectory, m_excludedDirectories, &ok);
CAircraftModelList models(this->m_parsedCfgEntriesList.toAircraftModelList(this->getSimulator()));
this->mergeWithDbData(models, dbModels);
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
const bool hasData = !models.isEmpty();
if (hasData)
{
this->setModelsInCache(models); // not thread safe
this->setCachedModels(models); // not thread safe
}
// currently I treat no data as error
emit this->loadingFinished(hasData, this->m_simulatorInfo);