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

refs #585, adjusted loaders

Browse Source 
* use paths from settings
* no longer pass model directory and exclude directories
This commit is contained in:
Klaus Basan
2016-06-12 03:06:17 +02:00
parent 1ef1cc0021
commit bc344c73fc
6 changed files with 59 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,9 @@ namespace BlackMisc
{
namespace XPlane
{
//! Normalizes CSL model "designators" e.g. __XPFW_Jets:A320_a:A320_a_Austrian_Airlines.obj
static void normalizePath(QString &path)
{
//! \todo KB consider CFileUtil::normalizeFilePathToQtStandard ??
for (auto &e : path)
{
if (e == '/' || e == ':' || e == '\\')
@@ -59,8 +59,7 @@ namespace BlackMisc
}
}
CAircraftModelLoaderXPlane::CAircraftModelLoaderXPlane(const CSimulatorInfo &simInfo, const QString &rootDirectory, const QStringList &excludeDirs) :
IAircraftModelLoader(simInfo, rootDirectory, excludeDirs)
CAircraftModelLoaderXPlane::CAircraftModelLoaderXPlane() : IAircraftModelLoader(CSimulatorInfo::XPLANE)
{ }
CAircraftModelLoaderXPlane::~CAircraftModelLoaderXPlane()
@@ -71,22 +70,24 @@ namespace BlackMisc
void CAircraftModelLoaderXPlane::startLoadingFromDisk(LoadMode mode, const CAircraftModelList &dbModels)
{
if (m_rootDirectory.isEmpty())
const CSimulatorInfo simulator = this->getSimulator();
const QString modelDirectory(this->m_settings.getModelDirectoryOrDefault(simulator)); // copy
const QStringList excludedDirectories(this->m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator, true)); // copy
if (modelDirectory.isEmpty())
{
this->clearCache();
emit loadingFinished(false, this->getSimulator());
emit loadingFinished(false, simulator);
return;
}
if (mode.testFlag(LoadInBackground))
{
if (m_parserWorker && !m_parserWorker->isFinished()) { return; }
auto rootDirectory = m_rootDirectory;
auto excludedDirectories = m_excludedDirectories;
m_parserWorker = BlackMisc::CWorker::fromTask(this, "CAircraftModelLoaderXPlane::performParsing",
[this, rootDirectory, excludedDirectories, dbModels]()
[this, modelDirectory, excludedDirectories, dbModels]()
{
auto models = performParsing(rootDirectory, excludedDirectories);
auto models = performParsing(modelDirectory, excludedDirectories);
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
return models;
});
@@ -97,7 +98,7 @@ namespace BlackMisc
}
else if (mode.testFlag(LoadDirectly))
{
CAircraftModelList models(performParsing(m_rootDirectory, m_excludedDirectories));
CAircraftModelList models(performParsing(this->getModelDirectory(), excludedDirectories));
CAircraftModelUtilities::mergeWithDbData(models, dbModels);
updateInstalledModels(models);
}
@@ -112,7 +113,7 @@ namespace BlackMisc
{
const QDateTime cacheTs(getCacheTimestamp());
if (!cacheTs.isValid()) { return true; }
return CFileUtils::containsFileNewerThan(cacheTs, this->getRootDirectory(), true, {fileFilterCsl(), fileFilterFlyable()}, this->m_excludedDirectories);
return CFileUtils::containsFileNewerThan(cacheTs, this->getModelDirectory(), true, {fileFilterCsl(), fileFilterFlyable()}, this->getModelExcludeDirectories(false));
}

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

@@ -33,7 +33,7 @@ namespace BlackMisc
namespace XPlane
{
/*!
* \brief XPlane aircraft model loader
* XPlane aircraft model loader
* \todo Obj8Aircraft and Obj8 parsers are not yet implemented
*/
class BLACKMISC_EXPORT CAircraftModelLoaderXPlane : public BlackMisc::Simulation::IAircraftModelLoader
@@ -42,7 +42,7 @@ namespace BlackMisc
public:
//! Constructor
CAircraftModelLoaderXPlane(const BlackMisc::Simulation::CSimulatorInfo &simInfo, const QString &rootDirectory, const QStringList &exludes = {});
CAircraftModelLoaderXPlane();
//! Virtual destructor
virtual ~CAircraftModelLoaderXPlane();