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

Ref T529, using sort order in model loader

Browse Source
This commit is contained in:
Klaus Basan
2019-02-05 15:57:54 +01:00
committed by Mat Sutcliffe
parent 728a76fc2c
commit 001d90bd6b
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackmisc/simulation/aircraftmodelloader.cpp
View File

@@ -144,6 +144,7 @@ namespace BlackMisc
u"Empty or not existing '%1' directory '%2', skipping read") u"Empty or not existing '%1' directory '%2', skipping read")
<< simulator.toQString() << modelDirectories.join(", "); << simulator.toQString() << modelDirectories.join(", ");
m_loadingMessages.push_back(status); m_loadingMessages.push_back(status);
m_loadingMessages.freezeOrder();
emit this->loadingFinished(m_loadingMessages, simulator, LoadingSkipped); emit this->loadingFinished(m_loadingMessages, simulator, LoadingSkipped);
return; return;
} }

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

@@ -104,6 +104,7 @@ namespace BlackMisc
} }
else else
{ {
m_loadingMessages.freezeOrder();
emit this->loadingFinished(m_loadingMessages, simulator, ParsedData); emit this->loadingFinished(m_loadingMessages, simulator, ParsedData);
} }
}); });
@@ -116,6 +117,7 @@ namespace BlackMisc
m_parsedCfgEntriesList = this->performParsing(modelDirs, excludedDirectoryPatterns, msgs); m_parsedCfgEntriesList = this->performParsing(modelDirs, excludedDirectoryPatterns, msgs);
const CAircraftModelList models(m_parsedCfgEntriesList.toAircraftModelList(simulator, true, msgs)); const CAircraftModelList models(m_parsedCfgEntriesList.toAircraftModelList(simulator, true, msgs));
m_loadingMessages = msgs; m_loadingMessages = msgs;
m_loadingMessages.freezeOrder();
const bool hasData = !models.isEmpty(); const bool hasData = !models.isEmpty();
if (hasData) if (hasData)
{ {

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

@@ -127,6 +127,7 @@ namespace BlackMisc
m_parserWorker->thenWithResult<CAircraftModelList>(this, [ = ](const auto & models) m_parserWorker->thenWithResult<CAircraftModelList>(this, [ = ](const auto & models)
{ {
this->updateInstalledModels(models); this->updateInstalledModels(models);
m_loadingMessages.freezeOrder();
emit this->loadingFinished(m_loadingMessages, simulator, ParsedData); emit this->loadingFinished(m_loadingMessages, simulator, ParsedData);
}); });
} }