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

refs #576, remove models with string by container

Browse Source 
(improved CAircraftModel::matchesModelString)
This commit is contained in:
Klaus Basan
2016-01-23 02:21:30 +01:00
parent 394edc67a0
commit ae43c4038c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -125,6 +125,11 @@ namespace BlackGui
return delta; return delta;
} }
int CAircraftModelView::removeModelsWithModelString(const CAircraftModelList &models, Qt::CaseSensitivity sensitivity)
{
return this->removeModelsWithModelString(models.getModelStrings(), sensitivity);
}
void CAircraftModelView::setHighlightModelStrings(const QStringList &highlightModels) void CAircraftModelView::setHighlightModelStrings(const QStringList &highlightModels)
{ {
this->derivedModel()->setHighlightModelStrings(highlightModels); this->derivedModel()->setHighlightModelStrings(highlightModels);
@@ -249,7 +254,7 @@ namespace BlackGui
// this function requires that someone provides the model strings to be highlighted // this function requires that someone provides the model strings to be highlighted
QAction *a = menu.addAction(CIcons::appDbStash16(), "Highlight stashed", this, SLOT(ps_toggleHighlightStashedModels())); QAction *a = menu.addAction(CIcons::appDbStash16(), "Highlight stashed", this, SLOT(ps_toggleHighlightStashedModels()));
a->setCheckable(true); a->setCheckable(true);
a->setChecked(this->derivedModel()->highlightDbData()); a->setChecked(this->derivedModel()->highlightModelStrings());
} }
if (this->m_menus.testFlag(MenuHighlightInvalid)) if (this->m_menus.testFlag(MenuHighlightInvalid))
{ {

3
src/blackgui/views/aircraftmodelview.h
View File

@@ -55,6 +55,9 @@ namespace BlackGui
//! Remove models with model strings //! Remove models with model strings
int removeModelsWithModelString(const QStringList &modelStrings, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive); int removeModelsWithModelString(const QStringList &modelStrings, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
//! Remove models with model strings
int removeModelsWithModelString(const BlackMisc::Simulation::CAircraftModelList &models, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &) //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
void setHighlightModelStrings(const QStringList &highlightModels); void setHighlightModelStrings(const QStringList &highlightModels);

11
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -349,15 +349,8 @@ namespace BlackMisc
bool CAircraftModel::matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const bool CAircraftModel::matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const
{ {
if (sensitivity == Qt::CaseSensitive) return this->m_modelString.length() == modelString.length() &&
{ this->m_modelString.startsWith(modelString, sensitivity);
return modelString == this->m_modelString;
}
else
{
return this->m_modelString.length() == modelString.length() &&
this->m_modelString.indexOf(modelString) == 0;
}
} }
CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const