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

Ref T515, use model utils for validation

Browse Source
This commit is contained in:
Klaus Basan
2019-01-20 19:16:04 +01:00
committed by Mat Sutcliffe
parent 27b9c5e8c8
commit 4be8ff9e3d
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/views/aircraftmodelvalidationdialog.cpp
View File

@@ -45,9 +45,8 @@ namespace BlackGui
CAircraftModelList invalid; CAircraftModelList invalid;
const bool ignoreEmpty = false; const bool ignoreEmpty = false;
const int maxFailedFiles = 25; const int maxFailedFiles = 25;
const CStatusMessageList msgs = m_models.isLikelyFsFamilyModelList() ? bool wasStopped = false;
CFsCommonUtil::validateConfigFiles(m_models, valid, invalid, ignoreEmpty, maxFailedFiles) : const CStatusMessageList msgs = CAircraftModelUtilities::validateModelFiles(m_models, valid, invalid, ignoreEmpty, maxFailedFiles, wasStopped);
m_models.validateFiles(valid, invalid, ignoreEmpty, maxFailedFiles);
ui->comp_StatusMessage->clear(); ui->comp_StatusMessage->clear();
ui->comp_StatusMessage->appendStatusMessagesToList(msgs); ui->comp_StatusMessage->appendStatusMessagesToList(msgs);
} }

11
src/blackmisc/simulation/aircraftmodelutils.cpp
View File

@@ -7,8 +7,9 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/directoryutils.h" #include "blackmisc/directoryutils.h"
#include "blackmisc/verify.h" #include "blackmisc/verify.h"
@@ -137,5 +138,13 @@ namespace BlackMisc
const bool ok = CFileUtils::writeStringToFile(htmlTemplate.arg(html), dir.absoluteFilePath(fn)); const bool ok = CFileUtils::writeStringToFile(htmlTemplate.arg(html), dir.absoluteFilePath(fn));
return ok ? dir.absoluteFilePath(fn) : ""; return ok ? dir.absoluteFilePath(fn) : "";
} }
CStatusMessageList CAircraftModelUtilities::validateModelFiles(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmpty, int stopAtFailedFiles, bool &stopped)
{
// specifi checks for XPlane/FG would go here
return models.isLikelyFsFamilyModelList() ?
FsCommon::CFsCommonUtil::validateConfigFiles(models, validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped) :
models.validateFiles(validModels, invalidModels, ignoreEmpty, stopAtFailedFiles, stopped);
}
} // ns } // ns
} // ns } // ns

2
src/blackmisc/simulation/aircraftmodelutils.h
View File

@@ -35,6 +35,8 @@ namespace BlackMisc
//! Matrix airlines/aircraft ICAOs //! Matrix airlines/aircraft ICAOs
static QString createIcaoAirlineAircraftHtmlMatrixFile(const BlackMisc::Simulation::CAircraftModelList &models, const QString &tempDir); static QString createIcaoAirlineAircraftHtmlMatrixFile(const BlackMisc::Simulation::CAircraftModelList &models, const QString &tempDir);
//! Validate aircraft.cfg entries
static CStatusMessageList validateModelFiles(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmpty, int stopAtFailedFiles, bool &stopped);
}; };
} //namespace } //namespace
} // namespace } // namespace