mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Filter: move num_shown logic from model to core

Browse source 
Since the number of shown dives is stored in the core, let's also
keep it updated there.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-17 18:32:35 +01:00 • committed by Dirk Hohndel
parent b76f207158
commit 9ffafbc326
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
qt-models/filtermodels.cpp
View file

@ -57,8 +57,6 @@ void MultiFilterSortModel::myInvalidate()
// as a consequence of the filterFinished signal right after the local scope.
auto marker = diveListNotifier.enterCommand();
shown_dives = 0;
DiveFilter *filter = DiveFilter::instance();
for (int i = 0; i < m->rowCount(QModelIndex()); ++i) {
QModelIndex idx = m->index(i, 0, QModelIndex());
@ -75,18 +73,14 @@ void MultiFilterSortModel::myInvalidate()
continue;
}
bool show = filter->showDive(d);
if (show) {
shown_dives++;
if (show)
showTrip = true;
}
m->setData(idx2, show, DiveTripModelBase::SHOWN_ROLE);
}
m->setData(idx, showTrip, DiveTripModelBase::SHOWN_ROLE);
} else {
dive *d = m->data(idx, DiveTripModelBase::DIVE_ROLE).value<dive *>();
bool show = (d != NULL) && filter->showDive(d);
if (show)
shown_dives++;
m->setData(idx, show, DiveTripModelBase::SHOWN_ROLE);
}
}
@ -103,14 +97,8 @@ void MultiFilterSortModel::myInvalidate()
bool MultiFilterSortModel::updateDive(struct dive *d)
{
bool oldStatus = !d->hidden_by_filter;
bool newStatus = DiveFilter::instance()->showDive(d);
bool changed = oldStatus != newStatus;
if (changed) {
filter_dive(d, newStatus);
shown_dives += newStatus - oldStatus;
}
return changed;
return filter_dive(d, newStatus);
}
bool MultiFilterSortModel::lessThan(const QModelIndex &i1, const QModelIndex &i2) const