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

refs #888, loadingFinished with CStatusMessage

Browse Source
This commit is contained in:
Klaus Basan
2017-02-24 21:14:08 +01:00
parent 8e55baaf85
commit 5a91f561be
6 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -65,6 +65,9 @@ namespace BlackMisc
void CAircraftCfgParser::startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory)
{
static const CStatusMessage statusLoadingOk(this, CStatusMessage::SeverityInfo, "Aircraft config parser loaded data");
static const CStatusMessage statusLoadingError(this, CStatusMessage::SeverityError, "Aircraft config parser did not load data");
const CSimulatorInfo simulator = this->getSimulator();
const QString modelDirectory(!directory.isEmpty() ? directory : this->m_settings.getFirstModelDirectoryOrDefault(simulator)); // expect only one directory
const QStringList excludedDirectoryPatterns(this->m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
@@ -100,11 +103,13 @@ namespace BlackMisc
this->setCachedModels(models, simulator); // not thread safe
}
// currently I treat no data as error
emit this->loadingFinished(hasData, simulator);
emit this->loadingFinished(hasData ? statusLoadingOk : statusLoadingError, simulator);
}
else
{
emit this->loadingFinished(false, simulator);
CStatusMessage status = this->m_loadingMessages.toSingleMessage();
status.setSeverity(CStatusMessage::SeverityError);
emit this->loadingFinished(status, simulator);
}
});
}
@@ -121,7 +126,7 @@ namespace BlackMisc
this->setCachedModels(models); // not thread safe
}
// currently I treat no data as error
emit this->loadingFinished(hasData, simulator);
emit this->loadingFinished(hasData ? statusLoadingOk : statusLoadingError, simulator);
}
}