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

Dive list: implement custom lessThan function

Browse source 
The dive list was sorted using the default-sorter of
QSortFilterProxy model. This is mighty inflexible as it
considers only one column. This has the funky effect that
for rows with identical elements, the sort order depends
on the previous sorting.

Implement a lessThan() function in the MultiFilterSortModel,
which simply hands the sorting down to the actual model.
This might be considered a layering violation, but it makes
things so much easier.

Sadly, it seems like the column-to-be-sorted is transported
in the provided indices. Therefore, the comparison is chosen
using a switch for *every* comparison. It would seem much
more logical to set a function pointer once and use that.
Further investigations are necessary.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-29 20:17:53 +01:00 • committed by Dirk Hohndel
parent 6fb3a499e6
commit ab894c9b64
4 changed files with 97 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-models/filtermodels.cpp
View file

@ -560,12 +560,12 @@ void LocationFilterModel::addName(const QString &newName)
MultiFilterSortModel::MultiFilterSortModel(QObject *parent) : QSortFilterProxyModel(parent),
divesDisplayed(0),
curr_dive_site(NULL)
curr_dive_site(NULL),
model(DiveTripModel::instance())
{
setSortRole(DiveTripModel::SORT_ROLE);
setFilterKeyColumn(-1); // filter all columns
setFilterCaseSensitivity(Qt::CaseInsensitive);
setSourceModel(DiveTripModel::instance());
setSourceModel(model);
}
void MultiFilterSortModel::setLayout(DiveTripModel::Layout layout)
@ -707,3 +707,9 @@ void MultiFilterSortModel::stopFilterDiveSite()
curr_dive_site = NULL;
myInvalidate();
}
bool MultiFilterSortModel::lessThan(const QModelIndex &i1, const QModelIndex &i2) const
{
// Hand sorting down to the source model.
return model->lessThan(i1, i2);
}