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

Clean up

Browse Source
This commit is contained in:
Lars Toenning
2019-02-19 20:23:31 +01:00
committed by Mat Sutcliffe
parent 5902fb7028
commit 8bae56a36c
22 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp
View File

@@ -28,34 +28,31 @@ namespace BlackMisc{
Simulation::CAircraftModelList AircraftModelLoaderFlightgear::parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories)
{
Q_UNUSED(excludeDirectories);
if (rootDirectory.isEmpty()) { return {}; }
//Q_UNUSED(excludeDirectories);
//if (rootDirectory.isEmpty()) { return {}; }
Simulation::CAircraftModelList installedModels;
QDir searchPath(rootDirectory, fileFilterFlyable());
QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
//QDir searchPath(rootDirectory, fileFilterFlyable());
//QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
int i = 0;
while (aircraftIt.hasNext()) {
aircraftIt.next();
if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
i++;
Simulation::CAircraftModel model;
model.setAircraftIcaoCode(QString::fromStdString("A320"));
model.setDescription(QString::fromStdString("Flyable"));
model.setName(aircraftIt.fileName());
model.setModelString(QString::fromStdString(std::to_string(i)));
//while (aircraftIt.hasNext()) {
//aircraftIt.next();
//if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
//Simulation::CAircraftModel model;
//model.setAircraftIcaoCode(QString::fromStdString("A320"));
//model.setDescription(QString::fromStdString("Flyable"));
//model.setName(aircraftIt.fileName());
//model.setModelString(aircraftIt.filePath() + aircraftIt.fileName());
model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
model.setSimulator(CSimulatorInfo::fg());
//model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
//model.setSimulator(CSimulatorInfo::fg());
//model.setCG(PhysicalQuantities::CLength());
model.setFileDetailsAndTimestamp(aircraftIt.fileInfo());
model.setModelMode(CAircraftModel::Include);
//model.setFileDetailsAndTimestamp(aircraftIt.fileInfo());
//model.setModelMode(CAircraftModel::Include);
addUniqueModel(model,installedModels);
//addUniqueModel(model,installedModels);
//TODO Add livery adding
}
//}
return installedModels;
}
@@ -74,9 +71,6 @@ namespace BlackMisc{
while (aircraftIt.hasNext()) {
aircraftIt.next();
if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
//QString base = "main";
//if(base.compare(aircraftIt.fileName())){ continue;}
Simulation::CAircraftModel model;
model.setDescription(QString::fromStdString("AI"));
std::string modelName = aircraftIt.fileName().toStdString();
@@ -121,7 +115,7 @@ namespace BlackMisc{
CAircraftModelList allModels;
for (const QString &rootDirectory : rootDirectories)
{
//TODO Make paths variable
//TODO Make paths changeable (using env variable)
allModels.push_back(parseAIAirplanes("X:/Flightsim/Flightgear/2018.3/data/AI/Aircraft", excludeDirectories));
//allModels.push_back(parseFlyableAirplanes("X:/Flightsim/Flightgear/2018.3/data/Aircraft", excludeDirectories));
}

3
src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h
View File

@@ -40,5 +40,4 @@ namespace BlackMisc{
}
}
}

0
src/blackmisc/simulation/settings/mysettings.h → src/blackmisc/simulation/settings/fgsettings.h
View File