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

refs #487 Finish IAircraftModelLoader::createModelLoader factory method

Browse Source
This commit is contained in:
Roland Winklmeier
2015-10-08 20:33:04 +02:00
committed by Mathew Sutcliffe
parent 35cb4e2067
commit 94901b7846
8 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/dbmappingcomponent.cpp
View File

@@ -83,8 +83,7 @@ namespace BlackGui
// unload old
if (this->m_modelLoader) { this->m_modelLoader->cancelLoading(); }
//! \todo appropriate model loader or loaders via factory?
this->m_modelLoader.reset(IAircraftModelLoader::createModelLoader(simInfo));
this->m_modelLoader = IAircraftModelLoader::createModelLoader(simInfo);
if (!this->m_modelLoader || !this->m_modelLoader->supportsSimulator(simInfo))
{
CLogMessage(this).error("Failed to init model loader %1") << simInfo.toQString();
@@ -93,7 +92,7 @@ namespace BlackGui
}
else
{
bool c = connect(this->m_modelLoader.data(), &IAircraftModelLoader::loadingFinished, this, &CDbMappingComponent::ps_onInstalledModelLoadingFinished);
bool c = connect(this->m_modelLoader.get(), &IAircraftModelLoader::loadingFinished, this, &CDbMappingComponent::ps_onInstalledModelLoadingFinished);
Q_ASSERT_X(c, Q_FUNC_INFO, "Failed connect for model loader");
Q_UNUSED(c);
return true;

2
src/blackgui/components/dbmappingcomponent.h
View File

@@ -105,7 +105,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CDbMappingComponent> ui;
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader;
QScopedPointer<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader;
std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader;
bool m_withVPilot = false;
//! Consolidated aircraft model