From 71fbe5b6040cfcbe90129eb62a86a29b4b00ebf7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 3 May 2019 15:09:04 +0200 Subject: [PATCH] Allow to filter by combined type --- .../aircraftcombinedtypeselector.cpp | 39 +- .../components/aircraftcombinedtypeselector.h | 11 +- .../filters/aircraftmodelfilterbar.cpp | 15 +- src/blackgui/filters/aircraftmodelfilterbar.h | 3 + .../filters/aircraftmodelfilterbar.ui | 363 ++++++++++-------- .../filters/aircraftmodelfilterdialog.ui | 4 +- src/blackgui/models/aircraftmodelfilter.cpp | 93 ++--- src/blackgui/models/aircraftmodelfilter.h | 26 +- 8 files changed, 309 insertions(+), 245 deletions(-) diff --git a/src/blackgui/components/aircraftcombinedtypeselector.cpp b/src/blackgui/components/aircraftcombinedtypeselector.cpp index 56e16e5f0..8ef4a970b 100644 --- a/src/blackgui/components/aircraftcombinedtypeselector.cpp +++ b/src/blackgui/components/aircraftcombinedtypeselector.cpp @@ -14,6 +14,7 @@ #include #include +#include #include using namespace BlackMisc::Aviation; @@ -28,11 +29,11 @@ namespace BlackGui { ui->setupUi(this); connect(ui->le_CombinedType, &QLineEdit::editingFinished, this, &CAircraftCombinedTypeSelector::combinedTypeEntered); - connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::combinedTypeEntered); + connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::combinedTypeEntered); connect(ui->cb_EngineCount, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox); - connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox); - connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox); + connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox); + connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox); ui->le_CombinedType->setValidator(new CUpperCaseValidator(this)); } @@ -43,19 +44,26 @@ namespace BlackGui void CAircraftCombinedTypeSelector::setCombinedType(const QString &combinedCode) { QString engineCount, engineType, aircraftType; - QString cc(combinedCode.trimmed().toUpper().left(3)); + const QString cc(combinedCode.trimmed().toUpper().left(3)); + if (m_cc == cc) { return; } + m_cc = cc; + if (cc.length() > 0) { aircraftType = cc.left(1); } - if (cc.length() > 1) { engineCount = cc.mid(1, 1); } - if (cc.length() > 2) { engineType = cc.mid(2, 1); } + if (cc.length() > 1) { engineCount = cc.mid(1, 1); } + if (cc.length() > 2) { engineType = cc.mid(2, 1); } - CGuiUtility::setComboBoxValueByStartingString(ui->cb_EngineCount, engineCount, "unspecified"); - CGuiUtility::setComboBoxValueByStartingString(ui->cb_EngineType, engineType, "unspecified"); - CGuiUtility::setComboBoxValueByStartingString(ui->cb_Type, aircraftType, "unspecified"); + if (this->getCombinedTypeFromComboBoxes() != cc) + { + CGuiUtility::setComboBoxValueByStartingString(ui->cb_EngineCount, engineCount, "unspecified"); + CGuiUtility::setComboBoxValueByStartingString(ui->cb_EngineType, engineType, "unspecified"); + CGuiUtility::setComboBoxValueByStartingString(ui->cb_Type, aircraftType, "unspecified"); + } - ui->le_CombinedType->setText(cc); + if (ui->le_CombinedType->text() != cc) { ui->le_CombinedType->setText(cc); } + emit this->changedCombinedType(cc); } - void CAircraftCombinedTypeSelector::setCombinedType(const BlackMisc::Aviation::CAircraftIcaoCode &icao) + void CAircraftCombinedTypeSelector::setCombinedType(const CAircraftIcaoCode &icao) { this->setCombinedType(icao.getCombinedType()); } @@ -77,6 +85,7 @@ namespace BlackGui QString CAircraftCombinedTypeSelector::getCombinedType() const { QString ct(ui->le_CombinedType->text().trimmed().toUpper()); + if (ct.isEmpty() || ct == QStringView(u"---")) { return {}; } if (CAircraftIcaoCode::isValidCombinedType(ct)) { return ct; } QString ct2(getCombinedTypeFromComboBoxes()); @@ -85,15 +94,17 @@ namespace BlackGui void CAircraftCombinedTypeSelector::combinedTypeEntered() { - QString cc(ui->le_CombinedType->text().trimmed().toUpper()); - this->setCombinedType(cc); + const QString cc(ui->le_CombinedType->text().trimmed().toUpper() % u"---"); + this->setCombinedType(cc.left(3)); } void CAircraftCombinedTypeSelector::changedComboBox(const QString &text) { Q_UNUSED(text); - QString ct(getCombinedTypeFromComboBoxes()); + const QString ct(this->getCombinedTypeFromComboBoxes()); + if (ui->le_CombinedType->text() == ct) { return; } ui->le_CombinedType->setText(ct); + emit this->changedCombinedType(ct); } QString CAircraftCombinedTypeSelector::getCombinedTypeFromComboBoxes() const diff --git a/src/blackgui/components/aircraftcombinedtypeselector.h b/src/blackgui/components/aircraftcombinedtypeselector.h index c6f6b9f0e..5aac61837 100644 --- a/src/blackgui/components/aircraftcombinedtypeselector.h +++ b/src/blackgui/components/aircraftcombinedtypeselector.h @@ -19,10 +19,8 @@ #include #include -class QWidget; - -namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace Ui { class CAircraftCombinedTypeSelector; } +namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace BlackGui { namespace Components @@ -39,7 +37,7 @@ namespace BlackGui explicit CAircraftCombinedTypeSelector(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftCombinedTypeSelector(); + virtual ~CAircraftCombinedTypeSelector() override; //! Set comined code, e.g. L1P void setCombinedType(const QString &combinedCode); @@ -56,6 +54,10 @@ namespace BlackGui //! Get the combined type, e.g. "L2P" QString getCombinedType() const; + signals: + //! Combined type has beend changed + void changedCombinedType(const QString &cominedType); + private: //! Code has been entered void combinedTypeEntered(); @@ -66,6 +68,7 @@ namespace BlackGui //! Combined type from comboboxes QString getCombinedTypeFromComboBoxes() const; + QString m_cc; QScopedPointer ui; }; } // ns diff --git a/src/blackgui/filters/aircraftmodelfilterbar.cpp b/src/blackgui/filters/aircraftmodelfilterbar.cpp index bb85eed58..535f57f93 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.cpp +++ b/src/blackgui/filters/aircraftmodelfilterbar.cpp @@ -87,7 +87,7 @@ namespace BlackGui mf = CAircraftModel::Exclude; } - BlackMisc::Db::DbKeyStateFilter dbf = BlackMisc::Db::All; + DbKeyStateFilter dbf = BlackMisc::Db::All; if (ui->cbt_Db->checkState() == Qt::Checked) { dbf = BlackMisc::Db::Valid; @@ -111,6 +111,7 @@ namespace BlackGui ui->le_AirlineName->text(), ui->le_LiveryCode->text(), ui->le_FileName->text(), + ui->comp_CombinedType->getCombinedType(), ui->comp_SimulatorSelector->getValue(), ui->comp_DistributorSelector->getDistributor() ); @@ -133,6 +134,7 @@ namespace BlackGui ui->le_FileName->clear(); ui->comp_SimulatorSelector->checkAll(); ui->comp_DistributorSelector->clear(); + ui->comp_CombinedType->clear(); ui->cbt_IncludeExclude->setCheckState(Qt::PartiallyChecked); ui->cbt_Db->setCheckState(Qt::PartiallyChecked); ui->cbt_Military->setCheckState(Qt::PartiallyChecked); @@ -151,6 +153,12 @@ namespace BlackGui this->triggerFilter(); } + void CAircraftModelFilterBar::onCombinedTypeChanged(const QString &combinedType) + { + Q_UNUSED(combinedType); + this->triggerFilter(); + } + void CAircraftModelFilterBar::onCheckBoxChanged(bool state) { Q_UNUSED(state); @@ -163,7 +171,7 @@ namespace BlackGui connect(ui->le_AircraftManufacturer, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); connect(ui->le_AirlineIcao, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); connect(ui->le_AirlineName, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); - connect(ui->le_LiveryCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); + connect(ui->le_LiveryCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); connect(ui->le_Id, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); connect(ui->le_ModelDescription, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); connect(ui->le_ModelString, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter); @@ -174,8 +182,9 @@ namespace BlackGui connect(ui->cbt_Military, &QCheckBox::clicked, this, &CAircraftModelFilterBar::onCheckBoxChanged); connect(ui->cbt_ColorLiveries, &QCheckBox::clicked, this, &CAircraftModelFilterBar::onCheckBoxChanged); - connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CAircraftModelFilterBar::onSimulatorSelectionChanged); + connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CAircraftModelFilterBar::onSimulatorSelectionChanged); connect(ui->comp_DistributorSelector, &CDbDistributorSelectorComponent::changedDistributor, this, &CAircraftModelFilterBar::onDistributorChanged); + connect(ui->comp_CombinedType, &CAircraftCombinedTypeSelector::changedCombinedType, this, &CAircraftModelFilterBar::onCombinedTypeChanged); } } // ns } // ns diff --git a/src/blackgui/filters/aircraftmodelfilterbar.h b/src/blackgui/filters/aircraftmodelfilterbar.h index 5615aa029..ab9bb83b5 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.h +++ b/src/blackgui/filters/aircraftmodelfilterbar.h @@ -63,6 +63,9 @@ namespace BlackGui //! Distributor changed void onDistributorChanged(const BlackMisc::Simulation::CDistributor &distributor); + //! Combined type changed + void onCombinedTypeChanged(const QString &combinedType); + //! Checkbox has been changed void onCheckBoxChanged(bool state); diff --git a/src/blackgui/filters/aircraftmodelfilterbar.ui b/src/blackgui/filters/aircraftmodelfilterbar.ui index 014c2e3f4..fb03c574c 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.ui +++ b/src/blackgui/filters/aircraftmodelfilterbar.ui @@ -6,8 +6,8 @@ 0 0 - 651 - 72 + 535 + 85 @@ -38,16 +38,10 @@ 2 - - - - Included/excluded models? - - - Incl. - - - true + + + + Airline name @@ -64,151 +58,6 @@ - - - - Distributor: - - - - - - - Military - - - Mil. - - - true - - - - - - - filename e.g. FSX/SimObjects/MyAircraft - - - - - - - File: - - - - - - - - 50 - 16777215 - - - - ICAO - - - - - - - Key, i.e. model key - - - - - - - - 50 - 16777215 - - - - 4 - - - ICAO - - - - - - - Manufacturer - - - - - - - Model: - - - - - - - Airline name - - - - - - - Aircraft: - - - - - - - DB data? - - - DB - - - true - - - - - - - Airline: - - - - - - - - - - Livery: - - - - - - - - - - Description - - - - - - - Code - - - @@ -231,7 +80,7 @@ - + @@ -260,13 +109,60 @@ - - - - QFrame::StyledPanel + + + + File: - - QFrame::Raised + + + + + + filename e.g. FSX/SimObjects/MyAircraft + + + + + + + Key, i.e. model key + + + + + + + + 50 + 16777215 + + + + ICAO + + + + + + + Manufacturer + + + + + + + + 50 + 16777215 + + + + 4 + + + ICAO @@ -280,8 +176,136 @@ - - + + + + Distributor: + + + + + + + Aircraft: + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + Model: + + + + + + + Military + + + Mil. + + + true + + + + + + + Code + + + + + + + DB data? + + + DB + + + true + + + + + + + Included/excluded models? + + + Incl. + + + true + + + + + + + + + + Description + + + + + + + Airline: + + + + + + + + + + Livery: + + + + + + + + 125 + 0 + + + + + + + + Combined: + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + @@ -304,6 +328,12 @@
blackgui/components/dbdistributorselectorcomponent.h
1 + + BlackGui::Components::CAircraftCombinedTypeSelector + QFrame +
blackgui/components/aircraftcombinedtypeselector.h
+ 1 + cbt_Db @@ -312,6 +342,7 @@ le_ModelDescription le_AircraftIcao le_AircraftManufacturer + le_Id cbt_Military le_LiveryCode cbt_ColorLiveries diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.ui b/src/blackgui/filters/aircraftmodelfilterdialog.ui index 2d2988fdf..5413ba718 100644 --- a/src/blackgui/filters/aircraftmodelfilterdialog.ui +++ b/src/blackgui/filters/aircraftmodelfilterdialog.ui @@ -6,8 +6,8 @@ 0 0 - 336 - 95 + 400 + 150 diff --git a/src/blackgui/models/aircraftmodelfilter.cpp b/src/blackgui/models/aircraftmodelfilter.cpp index 22018ba47..759a6b05c 100644 --- a/src/blackgui/models/aircraftmodelfilter.cpp +++ b/src/blackgui/models/aircraftmodelfilter.cpp @@ -22,8 +22,9 @@ namespace BlackGui CAircraftModel::ModelModeFilter modelMode, BlackMisc::Db::DbKeyStateFilter dbKeyFilter, Qt::CheckState military, Qt::CheckState colorLiveries, const QString &aircraftIcao, const QString &aircraftManufacturer, - const QString &airlineIcao, const QString &airlineName, - const QString &liveryCode, const QString &fileName, + const QString &airlineIcao, const QString &airlineName, + const QString &liveryCode, const QString &fileName, + const QString &combinedType, const CSimulatorInfo &simInfo, const CDistributor &distributor) : m_id(id), @@ -33,13 +34,14 @@ namespace BlackGui m_airlineIcao(airlineIcao.trimmed().toUpper()), m_airlineName(airlineName.trimmed().toUpper()), m_liveryCode(liveryCode.trimmed().toUpper()), m_fileName(fileName), + m_combinedType(combinedType), m_simulatorInfo(simInfo), m_distributor(distributor) { - m_valid = valid(); + m_valid = this->valid(); } - BlackMisc::Simulation::CAircraftModelList CAircraftModelFilter::filter(const CAircraftModelList &inContainer) const + CAircraftModelList CAircraftModelFilter::filter(const CAircraftModelList &inContainer) const { if (!this->isEnabled()) { return inContainer; } CAircraftModelList outContainer; @@ -58,90 +60,95 @@ namespace BlackGui if (!m_simulatorInfo.isAllSimulators()) { - if (!this->m_simulatorInfo.matchesAny(model.getSimulator())) { continue; } + if (!m_simulatorInfo.matchesAny(model.getSimulator())) { continue; } } - if (!this->m_modelKey.isEmpty()) + if (!m_modelKey.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getModelString(), this->m_modelKey)) { continue; } + if (!this->stringMatchesFilterExpression(model.getModelString(), m_modelKey)) { continue; } } - if (this->m_military != Qt::PartiallyChecked) + if (m_military != Qt::PartiallyChecked) { - if (this->m_military == Qt::Checked) + if (m_military == Qt::Checked) { // military only if (!model.isMilitary()) { continue; } } - else if (this->m_military == Qt::Unchecked) + else if (m_military == Qt::Unchecked) { // civilian only if (model.isMilitary()) { continue; } } } - if (this->m_colorLiveries != Qt::PartiallyChecked) + if (m_colorLiveries != Qt::PartiallyChecked) { - if (this->m_colorLiveries == Qt::Checked) + if (m_colorLiveries == Qt::Checked) { // only color liveries if (!model.getLivery().isColorLivery()) { continue; } } - else if (this->m_colorLiveries == Qt::Unchecked) + else if (m_colorLiveries == Qt::Unchecked) { // Only airline liveries if (model.getLivery().isColorLivery()) { continue; } } } - if (!this->m_description.isEmpty()) + if (!m_description.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getDescription(), this->m_description)) { continue; } + if (!this->stringMatchesFilterExpression(model.getDescription(), m_description)) { continue; } } - if (this->m_modelMode != CAircraftModel::All && this->m_modelMode != CAircraftModel::Undefined) + if (m_modelMode != CAircraftModel::All && m_modelMode != CAircraftModel::Undefined) { - if (!model.matchesMode(this->m_modelMode)) { continue; } + if (!model.matchesMode(m_modelMode)) { continue; } } - if (this->m_dbKeyFilter != BlackMisc::Db::All && this->m_dbKeyFilter != BlackMisc::Db::Undefined) + if (m_dbKeyFilter != BlackMisc::Db::All && m_dbKeyFilter != BlackMisc::Db::Undefined) { - if (!model.matchesDbKeyState(this->m_dbKeyFilter)) { continue; } + if (!model.matchesDbKeyState(m_dbKeyFilter)) { continue; } } - if (!this->m_fileName.isEmpty()) + if (!m_fileName.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getFileName(), this->m_fileName)) { continue; } + if (!this->stringMatchesFilterExpression(model.getFileName(), m_fileName)) { continue; } } - if (!this->m_aircraftIcao.isEmpty()) + if (!m_aircraftIcao.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getAircraftIcaoCodeDesignator(), this->m_aircraftIcao)) { continue; } + if (!this->stringMatchesFilterExpression(model.getAircraftIcaoCodeDesignator(), m_aircraftIcao)) { continue; } } - if (!this->m_aircraftManufacturer.isEmpty()) + if (!m_aircraftManufacturer.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getAircraftIcaoCode().getManufacturer(), this->m_aircraftManufacturer)) { continue; } + if (!this->stringMatchesFilterExpression(model.getAircraftIcaoCode().getManufacturer(), m_aircraftManufacturer)) { continue; } } - if (!this->m_airlineIcao.isEmpty()) + if (!m_airlineIcao.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getAirlineIcaoCodeDesignator(), this->m_airlineIcao)) { continue; } + if (!this->stringMatchesFilterExpression(model.getAirlineIcaoCodeDesignator(), m_airlineIcao)) { continue; } } - if (!this->m_airlineName.isEmpty()) + if (!m_airlineName.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getAirlineIcaoCode().getName(), this->m_airlineName)) { continue; } + if (!this->stringMatchesFilterExpression(model.getAirlineIcaoCode().getName(), m_airlineName)) { continue; } } - if (!this->m_liveryCode.isEmpty()) + if (!m_liveryCode.isEmpty()) { - if (!this->stringMatchesFilterExpression(model.getLivery().getCombinedCode(), this->m_liveryCode)) { continue; } + if (!this->stringMatchesFilterExpression(model.getLivery().getCombinedCode(), m_liveryCode)) { continue; } } - if (this->m_distributor.hasValidDbKey()) + if (m_distributor.hasValidDbKey()) { - if (!model.getDistributor().matchesKeyOrAlias(this->m_distributor)) { continue; } + if (!model.getDistributor().matchesKeyOrAlias(m_distributor)) { continue; } + } + + if (!m_combinedType.isEmpty()) + { + if (!model.getAircraftIcaoCode().matchesCombinedType(m_combinedType)) { continue; } } outContainer.push_back(model); @@ -153,17 +160,17 @@ namespace BlackGui { const bool allEmpty = m_id < 0 && - this->m_modelKey.isEmpty() && this->m_description.isEmpty() && - this->m_aircraftManufacturer.isEmpty() && this->m_aircraftIcao.isEmpty() && - this->m_airlineIcao.isEmpty() && this->m_airlineName.isEmpty() && - this->m_liveryCode.isEmpty() && this->m_fileName.isEmpty(); + m_modelKey.isEmpty() && m_description.isEmpty() && + m_aircraftManufacturer.isEmpty() && m_aircraftIcao.isEmpty() && + m_airlineIcao.isEmpty() && m_airlineName.isEmpty() && + m_liveryCode.isEmpty() && m_fileName.isEmpty() && m_combinedType.isEmpty(); if (!allEmpty) { return true; } - const bool noSim = this->m_simulatorInfo.isNoSimulator() || this->m_simulatorInfo.isAllSimulators(); - const bool noModelMode = this->m_modelMode == CAircraftModel::Undefined || this->m_modelMode == CAircraftModel::All; - const bool noDbState = this->m_dbKeyFilter == BlackMisc::Db::Undefined || this->m_dbKeyFilter == BlackMisc::Db::All; - const bool noKey = !this->m_distributor.hasValidDbKey(); - const bool noColorRestriction = this->m_colorLiveries == Qt::PartiallyChecked; - const bool noMilitary = this->m_military == Qt::PartiallyChecked; + const bool noSim = m_simulatorInfo.isNoSimulator() || m_simulatorInfo.isAllSimulators(); + const bool noModelMode = (m_modelMode == CAircraftModel::Undefined || m_modelMode == CAircraftModel::All); + const bool noDbState = (m_dbKeyFilter == BlackMisc::Db::Undefined || m_dbKeyFilter == BlackMisc::Db::All); + const bool noKey = !m_distributor.hasValidDbKey(); + const bool noColorRestriction = (m_colorLiveries == Qt::PartiallyChecked); + const bool noMilitary = (m_military == Qt::PartiallyChecked); return !(noSim && noModelMode && noDbState && noKey && noMilitary && noColorRestriction); } } // namespace diff --git a/src/blackgui/models/aircraftmodelfilter.h b/src/blackgui/models/aircraftmodelfilter.h index 3b93db2b9..72f3b93e6 100644 --- a/src/blackgui/models/aircraftmodelfilter.h +++ b/src/blackgui/models/aircraftmodelfilter.h @@ -30,19 +30,18 @@ namespace BlackGui { public: //! Constructor - CAircraftModelFilter( - int id, - const QString &modelKey, const QString &description, - BlackMisc::Simulation::CAircraftModel::ModelModeFilter modelMode, - BlackMisc::Db::DbKeyStateFilter dbKeyFilter, - Qt::CheckState military, Qt::CheckState colorLiveries, - const QString &aircraftIcao, const QString &aircraftManufacturer, - const QString &airlineIcao, const QString &airlineName, - const QString &liveryCode, - const QString &fileName, - const BlackMisc::Simulation::CSimulatorInfo &simInfo = BlackMisc::Simulation::CSimulatorInfo::allSimulators(), - const BlackMisc::Simulation::CDistributor &distributor = BlackMisc::Simulation::CDistributor() - ); + CAircraftModelFilter(int id, + const QString &modelKey, const QString &description, + BlackMisc::Simulation::CAircraftModel::ModelModeFilter modelMode, + BlackMisc::Db::DbKeyStateFilter dbKeyFilter, + Qt::CheckState military, Qt::CheckState colorLiveries, + const QString &aircraftIcao, const QString &aircraftManufacturer, + const QString &airlineIcao, const QString &airlineName, + const QString &liveryCode, + const QString &fileName, + const QString &combinedType, + const BlackMisc::Simulation::CSimulatorInfo &simInfo = BlackMisc::Simulation::CSimulatorInfo::allSimulators(), + const BlackMisc::Simulation::CDistributor &distributor = BlackMisc::Simulation::CDistributor()); //! \copydoc IModelFilter::filter virtual BlackMisc::Simulation::CAircraftModelList filter(const BlackMisc::Simulation::CAircraftModelList &inContainer) const override; @@ -61,6 +60,7 @@ namespace BlackGui QString m_airlineName; QString m_liveryCode; QString m_fileName; + QString m_combinedType; BlackMisc::Simulation::CSimulatorInfo m_simulatorInfo; BlackMisc::Simulation::CDistributor m_distributor; bool valid() const;