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

Minor improvements for XP model loader, file path concatenation

Browse Source
This commit is contained in:
Klaus Basan
2019-06-08 21:57:34 +02:00
parent b71b814aac
commit 1b03480fab
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,21 +6,23 @@
* or distributed except according to the terms contained in the LICENSE file. * or distributed except according to the terms contained in the LICENSE file.
*/ */
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/simulation/distributor.h" #include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h" #include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h"
#include "blackmisc/simulation/xplane/xplaneutil.h" #include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/simulation/xplane/qtfreeutils.h" #include "blackmisc/simulation/xplane/qtfreeutils.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/stringutils.h" #include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/worker.h" #include "blackmisc/worker.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
#include "blackconfig/buildconfig.h"
#include <string.h> #include <string.h>
#include <QChar> #include <QChar>
@@ -39,6 +41,7 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
@@ -216,8 +219,8 @@ namespace BlackMisc
addUniqueModel(model, installedModels); addUniqueModel(model, installedModels);
const QString baseModelString = model.getModelString(); const QString baseModelString = model.getModelString();
QDirIterator liveryIt(aircraftIt.fileInfo().canonicalPath() + "/liveries", QDir::Dirs | QDir::NoDotAndDotDot); QDirIterator liveryIt(CFileUtils::appendFilePaths(aircraftIt.fileInfo().canonicalPath(), QStringLiteral("liveries")), QDir::Dirs | QDir::NoDotAndDotDot);
emit loadingProgress(this->getSimulator(), QStringLiteral("Parsing flyable liveries in '%1'").arg(aircraftIt.fileInfo().canonicalPath()), -1); emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing flyable liveries in '%1'").arg(aircraftIt.fileInfo().canonicalPath()), -1);
while (liveryIt.hasNext()) while (liveryIt.hasNext())
{ {
liveryIt.next(); liveryIt.next();
@@ -260,7 +263,7 @@ namespace BlackMisc
// Now we do a full run // Now we do a full run
for (auto &package : m_cslPackages) for (auto &package : m_cslPackages)
{ {
const QString packageFile = CFileUtils::appendFilePaths(package.path, "/xsb_aircraft.txt"); const QString packageFile = CFileUtils::appendFilePaths(package.path, QStringLiteral("xsb_aircraft.txt"));
emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1); emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1);
QFile file(packageFile); QFile file(packageFile);
@@ -286,6 +289,10 @@ namespace BlackMisc
const QFileInfo modelFileInfo(plane.filePath); const QFileInfo modelFileInfo(plane.filePath);
model.setFileDetailsAndTimestamp(modelFileInfo); model.setFileDetailsAndTimestamp(modelFileInfo);
model.setAircraftIcaoCode(icao); model.setAircraftIcaoCode(icao);
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(modelFileInfo.exists(), Q_FUNC_INFO, "Model does NOT exist");
}
CLivery livery; CLivery livery;
livery.setCombinedCode(plane.livery); livery.setCombinedCode(plane.livery);