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 #438, allow to cancel parser

Browse Source 
* added flag for parsing success
* unload driver cancels parsing
* assert for invoke
* using waitForFinished
This commit is contained in:
Klaus Basan
2015-06-02 00:15:20 +02:00
parent a6dd7fdd09
commit 8e56a14caf
7 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,14 +40,18 @@ namespace BlackSimPlugin
{
// hack to init mapper
connect(&m_modelMatcher, &CAircraftMatcher::initializationFinished, this, &CSimulatorFsCommon::ps_mapperInitialized);
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider>{ BlackMisc::make_unique<CModelMappingsProviderVPilot>(true) };
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider> { BlackMisc::make_unique<CModelMappingsProviderVPilot>(true) };
m_modelMatcher.setModelMappingProvider(std::move(modelMappingsProvider));
CVariant aircraftCfg = getPluginData(this, "aircraft_cfg");
if (aircraftCfg.isValid())
{
m_modelMatcher.setInstalledModels(aircraftCfg.value<CAircraftCfgEntriesList>().toAircraftModelList());
m_modelMatcher.init();
}
//
// reading from settings would go here
//
else
{
connect(&m_aircraftCfgParser, &CAircraftCfgParser::parsingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);
@@ -55,8 +59,7 @@ namespace BlackSimPlugin
}
}
CSimulatorFsCommon::~CSimulatorFsCommon()
{ }
CSimulatorFsCommon::~CSimulatorFsCommon() { }
void CSimulatorFsCommon::ps_mapperInitialized()
{
@@ -209,8 +212,15 @@ namespace BlackSimPlugin
CSimulatorCommon::enableDebugMessages(driver, interpolator);
}
void CSimulatorFsCommon::ps_aircraftCfgParsingFinished()
void CSimulatorFsCommon::unload()
{
this->m_aircraftCfgParser.cancelParsing();
CSimulatorCommon::unload();
}
void CSimulatorFsCommon::ps_aircraftCfgParsingFinished(bool success)
{
if (!success) { return; }
setPluginData(this, "aircraft_cfg", CVariant::from(m_aircraftCfgParser.getAircraftCfgEntriesList()));
m_modelMatcher.setInstalledModels(m_aircraftCfgParser.getAircraftCfgEntriesList().toAircraftModelList());

10
src/plugins/simulator/fscommon/simulator_fscommon.h
View File

@@ -76,6 +76,9 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::enableDebuggingMessages
virtual void enableDebugMessages(bool driver, bool interpolator) override;
//! \copydoc ISimulator::unload
virtual void unload() override;
protected:
//! Constructor
CSimulatorFsCommon(const BlackMisc::Simulation::CSimulatorPluginInfo &info,
@@ -99,7 +102,9 @@ namespace BlackSimPlugin
BlackMisc::Aviation::CComSystem m_simCom2; //!< cockpit COM2 state in simulator
BlackMisc::Aviation::CTransponder m_simTransponder; //!< cockpit xpdr state in simulator
// parser / matcher
BlackMisc::Simulation::FsCommon::CAircraftCfgParser m_aircraftCfgParser; //!< aircraft.cfg parser
BlackMisc::Simulation::FsCommon::CAircraftMatcher m_modelMatcher; //!< Model matcher
//! Set own model
void setOwnAircraftModel(const BlackMisc::Simulation::CAircraftModel &model);
@@ -110,15 +115,12 @@ namespace BlackSimPlugin
//! Reverse lookup
void reverseLookupIcaoData(BlackMisc::Simulation::CAircraftModel &model);
BlackMisc::Simulation::FsCommon::CAircraftMatcher m_modelMatcher; //!< Model matcher
protected slots:
//! Mapper has been initialized
void ps_mapperInitialized();
//! aircraft.cfg files parsing is finished
void ps_aircraftCfgParsingFinished();
void ps_aircraftCfgParsingFinished(bool success);
};
} // namespace