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

Ref T451, added disable functionality in matcher

Browse Source
This commit is contained in:
Klaus Basan
2018-12-24 07:02:32 +01:00
committed by Mat Sutcliffe
parent b648960b59
commit 7f9182a1c4
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/aircraftmatcher.cpp
View File

@@ -753,6 +753,26 @@ namespace BlackCore
return models.size();
}
void CAircraftMatcher::disableModelsForMatching(const CAircraftModelList &removedModels, bool incremental)
{
if (incremental)
{
m_modelSet.removeModelsWithString(removedModels, Qt::CaseInsensitive);
m_disabledModels.push_back(removedModels);
}
else
{
this->restoreDisabledModels();
m_disabledModels = removedModels;
m_modelSet.removeModelsWithString(removedModels, Qt::CaseInsensitive);
}
}
void CAircraftMatcher::restoreDisabledModels()
{
m_modelSet.replaceOrAddModelsWithString(m_disabledModels, Qt::CaseInsensitive);
}
void CAircraftMatcher::setDefaultModel(const CAircraftModel &defaultModel)
{
m_defaultModel = defaultModel;

22
src/blackcore/aircraftmatcher.h
View File

@@ -189,6 +189,13 @@ namespace BlackCore
//! \note uses a set from "somewhere else" so it can also be used with arbitrary sets for testing
int setModelSet(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator, bool forced);
//! Remove a model for matching
//! \remark effective until new set is set
void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental);
//! Restore the models removed with CAircraftMatcher::disableModelForMatching
void restoreDisabledModels();
//! Default model
const BlackMisc::Simulation::CAircraftModel &getDefaultModel() const { return m_defaultModel; }
@@ -290,13 +297,14 @@ namespace BlackCore
//! \threadsafe
static bool isValidAirlineIcaoDesignator(const QString &designator, bool checkAgainstSwiftDb);
BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup
BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model
BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching
BlackMisc::Simulation::CAircraftModelList m_removedModels; //!< removed models
BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional)
BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics
QString m_modelSetInfo; //!< info string
BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup
BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model
BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching
BlackMisc::Simulation::CAircraftModelList m_removedModels; //!< removed models
BlackMisc::Simulation::CAircraftModelList m_disabledModels; //!< disabled models for matching
BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional)
BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics
QString m_modelSetInfo; //!< info string
};
} // namespace