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

refs #555, load models from directory

Browse Source 
* file dialog
* adjusted signatures to pass directory
This commit is contained in:
Klaus Basan
2016-08-20 18:08:14 +02:00
committed by Mathew Sutcliffe
parent 126df28d0c
commit 5789120ecc
8 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,11 +68,11 @@ namespace BlackMisc
if (this->m_parserWorker) { this->m_parserWorker->waitForFinished(); }
}
void CAircraftModelLoaderXPlane::startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation)
void CAircraftModelLoaderXPlane::startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory)
{
//! \todo according to meeting XP needs to support multiple directories
const CSimulatorInfo simulator = this->getSimulator();
const QString modelDirectory(this->getFirstModelDirectoryOrDefault()); // directory
const QString modelDirectory(!directory.isEmpty() ? directory : this->getFirstModelDirectoryOrDefault()); // directory
const QStringList excludedDirectoryPatterns(this->m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
if (modelDirectory.isEmpty())

2
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h
View File

@@ -60,7 +60,7 @@ namespace BlackMisc
protected:
//! \name Interface functions
//! @{
virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation) override;
virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory) override;
//! @}
private: