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

refs #641, moved last simulator selection to caches

Browse Source 
* removed from component cache
* kept renamed component caches as stubs for later usage

refs #646, removed gui state cache as it causes build issues on Jenkins
(idea was to keep the classes as stubs for later usage)
This commit is contained in:
Klaus Basan
2016-04-25 01:08:10 +02:00
parent 48bcb105cd
commit 43f9515eaa
20 changed files with 320 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ namespace BlackMisc
if (m_rootDirectory.isEmpty())
{
this->clearCache();
emit loadingFinished(false, this->m_simulatorInfo);
emit loadingFinished(false, this->getSimulator());
return;
}
@@ -105,7 +105,7 @@ namespace BlackMisc
void CAircraftModelLoaderXPlane::updateInstalledModels(const CAircraftModelList &models)
{
this->setCachedModels(models);
emit loadingFinished(true, this->m_simulatorInfo);
emit loadingFinished(true, this->getSimulator());
}
QString CAircraftModelLoaderXPlane::CSLPlane::getModelName() const
@@ -155,7 +155,7 @@ namespace BlackMisc
CAircraftModel model;
model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
model.setSimulator(m_simulatorInfo);
model.setSimulator(this->getSimulator());
model.setFileName(aircraftIt.filePath());
model.setModelString(modelString);
@@ -208,9 +208,9 @@ namespace BlackMisc
while (it.hasNext())
{
QString packageFile = it.next();
//! \todo KB I would consider exclude dirs here CFileUtils::matchesExcludeDirectory()
if (CFileUtils::isExcludedDirectory(it.filePath(), excludeDirectories)) { continue; }
QString packageFilePath = it.fileInfo().absolutePath();
const QString packageFilePath = it.fileInfo().absolutePath();
QFile file(packageFile);
file.open(QIODevice::ReadOnly);
QString content;
@@ -219,7 +219,7 @@ namespace BlackMisc
content.append(ts.readAll());
file.close();
auto package = parsePackageHeader(packageFilePath, content);
const auto package = parsePackageHeader(packageFilePath, content);
if (package.hasValidHeader()) m_cslPackages.push_back(package);
}
@@ -262,7 +262,7 @@ namespace BlackMisc
CDistributor distributor(package.name);
model.setDistributor(distributor);
model.setSimulator(m_simulatorInfo);
model.setSimulator(this->getSimulator());
installedModels.push_back(model);
}
}