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

refs #438, allow to stop and reinit parser/matcher

Browse Source 
* plugin changes, mapper/parser will be stopped.
  make sure worker is properly shutdown
* restarted FS/FSX. Allow to reset mapper/parser data from store
This commit is contained in:
Klaus Basan
2015-06-04 18:34:14 +02:00
parent d603b28697
commit dbce887946
5 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/simulator/fscommon/simulator_fscommon.cpp
View File

@@ -43,20 +43,20 @@ namespace BlackSimPlugin
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider> { BlackMisc::make_unique<CModelMappingsProviderVPilot>(true) };
m_modelMatcher.setModelMappingProvider(std::move(modelMappingsProvider));
connect(&m_aircraftCfgParser, &CAircraftCfgParser::parsingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);
CVariant aircraftCfg = getPluginData(this, "aircraft_cfg");
if (aircraftCfg.isValid())
{
m_modelMatcher.setInstalledModels(aircraftCfg.value<CAircraftCfgEntriesList>().toAircraftModelList());
m_modelMatcher.init();
// will behave like parsing was finished
m_aircraftCfgParser.updateCfgEntriesList(aircraftCfg.value<CAircraftCfgEntriesList>());
}
//
// reading from settings would go here
//
else
{
connect(&m_aircraftCfgParser, &CAircraftCfgParser::parsingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);
m_aircraftCfgParser.parse();
m_aircraftCfgParser.parse(CAircraftCfgParser::ModeAsync);
}
//
// reading from cache / settings would go here
//
}
CSimulatorFsCommon::~CSimulatorFsCommon() { }
@@ -135,7 +135,7 @@ namespace BlackSimPlugin
CAircraftModelList CSimulatorFsCommon::getInstalledModels() const
{
return m_aircraftCfgParser.getAircraftCfgEntriesList().toAircraftModelList();
return m_modelMatcher.getInstalledModelsList();
}
CAircraftIcaoData CSimulatorFsCommon::getIcaoForModelString(const QString &modelString) const
@@ -215,6 +215,7 @@ namespace BlackSimPlugin
void CSimulatorFsCommon::unload()
{
this->m_aircraftCfgParser.cancelParsing();
this->m_modelMatcher.cancelInit();
CSimulatorCommon::unload();
}