flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T515, utility functions for modellist, renamed to find "findFsFamilyModels"

Browse Source
This commit is contained in:
Klaus Basan
2019-01-28 19:36:21 +01:00
committed by Mat Sutcliffe
parent 33736ca5af
commit 070577dae8
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/db/databaseutils.cpp
View File

@@ -295,7 +295,7 @@ namespace BlackCore
CAircraftModelList CDatabaseUtils::updateSimulatorForFsFamily(const CAircraftModelList &ownModels, CStatusMessageList *updateInfo, int maxToStash, IProgressIndicator *progressIndicator, bool processEvents) CAircraftModelList CDatabaseUtils::updateSimulatorForFsFamily(const CAircraftModelList &ownModels, CStatusMessageList *updateInfo, int maxToStash, IProgressIndicator *progressIndicator, bool processEvents)
{ {
if (!sApp || !sApp->getWebDataServices() || sApp->isShuttingDown()) { return CAircraftModelList(); } if (!sApp || !sApp->getWebDataServices() || sApp->isShuttingDown()) { return CAircraftModelList(); }
const CAircraftModelList dbFsFamilyModels(sApp->getWebDataServices()->getModels().getAllFsFamilyModels()); const CAircraftModelList dbFsFamilyModels(sApp->getWebDataServices()->getModels().findFsFamilyModels());
CAircraftModelList stashModels; CAircraftModelList stashModels;
if (dbFsFamilyModels.isEmpty() || ownModels.isEmpty()) { return stashModels; } if (dbFsFamilyModels.isEmpty() || ownModels.isEmpty()) { return stashModels; }
const QSet<QString> dbKeys = dbFsFamilyModels.getModelStringSet(); const QSet<QString> dbKeys = dbFsFamilyModels.getModelStringSet();

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

@@ -358,7 +358,7 @@ namespace BlackMisc
}); });
} }
CAircraftModelList CAircraftModelList::getAllFsFamilyModels() const CAircraftModelList CAircraftModelList::findFsFamilyModels() const
{ {
return this->findBy([](const CAircraftModel & model) return this->findBy([](const CAircraftModel & model)
{ {
@@ -366,6 +366,14 @@ namespace BlackMisc
}); });
} }
CAircraftModelList CAircraftModelList::findNonFsFamilyModels() const
{
return this->findBy([](const CAircraftModel & model)
{
return !model.getSimulator().isMicrosoftOrPrepare3DSimulator();
});
}
CAircraftModelList CAircraftModelList::getAllIncludedModels() const CAircraftModelList CAircraftModelList::getAllIncludedModels() const
{ {
return this->findBy([](const CAircraftModel & model) return this->findBy([](const CAircraftModel & model)
@@ -734,7 +742,7 @@ namespace BlackMisc
int CAircraftModelList::removeIfNotFsFamily() int CAircraftModelList::removeIfNotFsFamily()
{ {
if (this->isEmpty()) { return 0; } if (this->isEmpty()) { return 0; }
CAircraftModelList fsOnly = this->getAllFsFamilyModels(); CAircraftModelList fsOnly = this->findFsFamilyModels();
if (fsOnly.size() == this->size()) { return 0; } if (fsOnly.size() == this->size()) { return 0; }
const int delta = this->size() - fsOnly.size(); const int delta = this->size() - fsOnly.size();
*this = fsOnly; *this = fsOnly;
@@ -1325,8 +1333,8 @@ namespace BlackMisc
} }
// Summary // Summary
const CStatusMessage m1(this, CStatusMessage::SeverityInfo, QStringLiteral("File validation valid models: %1").arg(validModels.size())); const CStatusMessage m1(this, CStatusMessage::SeverityInfo, QStringLiteral("File validation, valid models: %1").arg(validModels.size()));
const CStatusMessage m2(this, CStatusMessage::SeverityWarning, QStringLiteral("File validation invalid models: %1").arg(invalidModels.size())); const CStatusMessage m2(this, CStatusMessage::SeverityWarning, QStringLiteral("File validation, invalid models: %1").arg(invalidModels.size()));
msgs.push_back(m1); msgs.push_back(m1);
msgs.push_back(m2); msgs.push_back(m2);

5
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -223,7 +223,10 @@ namespace BlackMisc
CAircraftModelList findDuplicateModelStrings() const; CAircraftModelList findDuplicateModelStrings() const;
//! All models of the FS (FSX, P3D, FS9) family //! All models of the FS (FSX, P3D, FS9) family
CAircraftModelList getAllFsFamilyModels() const; CAircraftModelList findFsFamilyModels() const;
//! All models NOT of the FS (FSX, P3D, FS9) family
CAircraftModelList findNonFsFamilyModels() const;
//! All included models //! All included models
CAircraftModelList getAllIncludedModels() const; CAircraftModelList getAllIncludedModels() const;