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

[Worker] In order to make background validation (worker) stoppable, using an "atomic bool stop flag"

Browse Source 
Originally Ref T145, Ref T647
This commit is contained in:
Klaus Basan
2020-03-06 18:54:05 +01:00
committed by Mat Sutcliffe
parent 9bcc16b94e
commit 7f6e3e5378
9 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -1527,7 +1527,7 @@ namespace BlackMisc
return msgs;
}
CStatusMessageList CAircraftModelList::validateFiles(CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &wasStopped, const QString &simRootDirectory, bool alreadySortedByFn) const
CStatusMessageList CAircraftModelList::validateFiles(CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, std::atomic_bool &wasStopped, const QString &simRootDirectory, bool alreadySortedByFn) const
{
wasStopped = false;
@@ -1575,7 +1575,7 @@ namespace BlackMisc
if (workingFiles.contains(fn) || model.hasExistingCorrespondingFile())
{
if (!simRootDirectory.isEmpty() && !fn.contains(simRootDir))
if (!simRootDirectory.isEmpty() && !fn.contains(simRootDir))
{
// check if in root directory
msgs.push_back(CStatusMessage(this).validationError(u"'%1', not in root directory '%2', '%3' skipped") << model.getModelStringAndDbKey() << simRootDir << model.getFileName());
@@ -1663,17 +1663,17 @@ namespace BlackMisc
// convert
{
CJsonScope scope("aircraftIcaos");
Q_UNUSED(scope);
Q_UNUSED(scope)
helper.getTable<CAircraftIcaoCode>().convertFromJson(aircraftIcaos.toObject());
}
{
CJsonScope scope("liveries");
Q_UNUSED(scope);
Q_UNUSED(scope)
helper.getTable<CLivery>().convertFromJson(liveries.toObject());
}
{
CJsonScope scope("distributors");
Q_UNUSED(scope);
Q_UNUSED(scope)
helper.getTable<CDistributor>().convertFromJson(distributors.toObject());
}
@@ -1681,7 +1681,7 @@ namespace BlackMisc
for (auto i = array.begin(); i != array.end(); ++i)
{
CJsonScope scope("containerbase", index++);
Q_UNUSED(scope);
Q_UNUSED(scope)
CAircraftModel value;
value.convertFromMemoizedJson(i->toObject(), helper);
this->push_back(value);