mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Filter: reload only when checkstate changed

Browse source 
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 <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-09-06 22:03:03 +02:00 committed by Dirk Hohndel
parent 7150d1c6f6
commit e0fcf99d0a
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qt-models/filtermodels.cpp
View file

@ -228,7 +228,7 @@ bool FilterModelBase::setData(const QModelIndex &index, const QVariant &value, i
break; break;
} }
} }
dataChanged(index, index); dataChanged(index, index, { role });
return true; return true;
} }
return false; return false;
@ -631,6 +631,14 @@ bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &s
return false; return false;
} }
void MultiFilterSortModel::filterChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &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() void MultiFilterSortModel::myInvalidate()
{ {
#if !defined(SUBSURFACE_MOBILE) #if !defined(SUBSURFACE_MOBILE)
@ -683,7 +691,7 @@ void MultiFilterSortModel::myInvalidate()
void MultiFilterSortModel::addFilterModel(FilterModelBase *model) void MultiFilterSortModel::addFilterModel(FilterModelBase *model)
{ {
models.append(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) void MultiFilterSortModel::removeFilterModel(FilterModelBase *model)

1
qt-models/filtermodels.h
View file

@ -131,6 +131,7 @@ slots:
void clearFilter(); void clearFilter();
void startFilterDiveSite(uint32_t uuid); void startFilterDiveSite(uint32_t uuid);
void stopFilterDiveSite(); void stopFilterDiveSite();
void filterChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles);
signals: signals:
void filterFinished(); void filterFinished();