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

Change modelString generation for AI aircrafts

Browse Source
This commit is contained in:
Lars Toenning
2019-02-23 11:41:46 +01:00
committed by Mat Sutcliffe
parent ce9e29f0e8
commit 193510dd29
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,8 @@ namespace BlackMisc{
Simulation::CAircraftModelList installedModels; Simulation::CAircraftModelList installedModels;
QDir searchPath(rootDirectory, fileFilterAI()); QDir searchPath(rootDirectory);
searchPath.setNameFilters(QStringList()<< "*.xml");
QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
@@ -72,13 +73,10 @@ namespace BlackMisc{
aircraftIt.next(); aircraftIt.next();
if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; } if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
Simulation::CAircraftModel model; Simulation::CAircraftModel model;
model.setDescription(QString::fromStdString("AI"));
std::string modelName = aircraftIt.fileName().toStdString(); std::string modelName = aircraftIt.fileName().toStdString();
modelName = modelName.substr(0,modelName.find(".xml")); modelName = modelName.substr(0,modelName.find(".xml"));
model.setName(QString::fromStdString(modelName)); model.setName(QString::fromStdString(modelName));
std::string modelString = aircraftIt.filePath().toStdString(); model.setModelString(QString::fromStdString(getModelString(aircraftIt.filePath().toStdString(),true)));
modelString = modelString.substr(modelString.find("Aircraft"));
model.setModelString(QString::fromStdString(modelString));
model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
model.setSimulator(CSimulatorInfo::fg()); model.setSimulator(CSimulatorInfo::fg());
model.setFileDetailsAndTimestamp(aircraftIt.fileInfo()); model.setFileDetailsAndTimestamp(aircraftIt.fileInfo());
@@ -97,13 +95,6 @@ namespace BlackMisc{
return f; return f;
} }
const QString &AircraftModelLoaderFlightgear::fileFilterAI()
{
static const QString f("*.xml");
return f;
}
void AircraftModelLoaderFlightgear::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models) void AircraftModelLoaderFlightgear::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models)
{ {
//TODO Add check //TODO Add check
@@ -116,7 +107,7 @@ namespace BlackMisc{
for (const QString &rootDirectory : rootDirectories) for (const QString &rootDirectory : rootDirectories)
{ {
//TODO Make paths changeable (using env variable) //TODO Make paths changeable (using env variable)
allModels.push_back(parseAIAirplanes("X:/Flightsim/Flightgear/2018.3/data/AI/Aircraft", excludeDirectories)); allModels.push_back(parseAIAirplanes(rootDirectory + "/AI/Aircraft", excludeDirectories));
//allModels.push_back(parseFlyableAirplanes("X:/Flightsim/Flightgear/2018.3/data/Aircraft", excludeDirectories)); //allModels.push_back(parseFlyableAirplanes("X:/Flightsim/Flightgear/2018.3/data/Aircraft", excludeDirectories));
} }
@@ -155,6 +146,18 @@ namespace BlackMisc{
} }
std::string AircraftModelLoaderFlightgear::getModelString(std::string filePath, bool ai)
{
std::string modelString = "FG ";
if(ai)
modelString.append("AI ");
std::string path = filePath;
filePath = filePath.substr(filePath.find("Aircraft")+9);
filePath = filePath.substr(0,filePath.find(".xml"));
modelString.append(filePath);
return modelString;
}
} }
} }

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

@@ -26,10 +26,10 @@ namespace BlackMisc{
void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override; void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override;
private: private:
std::string getModelString(std::string filePath,bool ai);
Simulation::CAircraftModelList parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories); Simulation::CAircraftModelList parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories);
Simulation::CAircraftModelList parseAIAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories); Simulation::CAircraftModelList parseAIAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories);
static const QString &fileFilterFlyable(); static const QString &fileFilterFlyable();
static const QString &fileFilterAI();
void addUniqueModel(const CAircraftModel &model, CAircraftModelList &models); void addUniqueModel(const CAircraftModel &model, CAircraftModelList &models);
QPointer<CWorker> m_parserWorker; QPointer<CWorker> m_parserWorker;
CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories); CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories);