From e0fcf99d0ac3ec23e6009a55b6e59c47c668081b Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 6 Sep 2018 22:03:03 +0200 Subject: Filter: reload only when checkstate changed Currently, the filter is recalculated if a filter-entry is changed. This also happens if the counts of a filter-entry changes. This is to be avoided, as it causes unnecessary churn. Therefore, send the proper role with the dataChanged() signal and add a new slot, which invalidates only if a field with the Qt::CheckStateRole is changed. Signed-off-by: Berthold Stoeger --- qt-models/filtermodels.cpp | 12 ++++++++++-- qt-models/filtermodels.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index 1491dbacf..c8ed16274 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -228,7 +228,7 @@ bool FilterModelBase::setData(const QModelIndex &index, const QVariant &value, i break; } } - dataChanged(index, index); + dataChanged(index, index, { role }); return true; } return false; @@ -631,6 +631,14 @@ bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &s return false; } +void MultiFilterSortModel::filterChanged(const QModelIndex &from, const QModelIndex &to, const QVector &roles) +{ + // Only redo the filter if a checkbox changed. If the count of an entry changed, + // we do *not* want to recalculate the filters. + if (roles.contains(Qt::CheckStateRole)) + myInvalidate(); +} + void MultiFilterSortModel::myInvalidate() { #if !defined(SUBSURFACE_MOBILE) @@ -683,7 +691,7 @@ void MultiFilterSortModel::myInvalidate() void MultiFilterSortModel::addFilterModel(FilterModelBase *model) { models.append(model); - connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(myInvalidate())); + connect(model, &FilterModelBase::dataChanged, this, &MultiFilterSortModel::filterChanged); } void MultiFilterSortModel::removeFilterModel(FilterModelBase *model) diff --git a/qt-models/filtermodels.h b/qt-models/filtermodels.h index 3f5ca5f01..2fd5ef2b2 100644 --- a/qt-models/filtermodels.h +++ b/qt-models/filtermodels.h @@ -131,6 +131,7 @@ slots: void clearFilter(); void startFilterDiveSite(uint32_t uuid); void stopFilterDiveSite(); + void filterChanged(const QModelIndex &from, const QModelIndex &to, const QVector &roles); signals: void filterFinished(); -- cgit v1.2.3-70-g09d2