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

Add a "sort role" for sorting the dive list

Browse source 
By default, sorting is done by the display role, but then we end up
sorting by the string we display, which is almost always the wrong thing.

So this adds a new "SORT_ROLE" that is used for sorting, and then the
data lookup can return the raw data we want to sort by.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-05-29 14:54:39 +09:00 • committed by Dirk Hohndel
parent 8df20f4149
commit bb77f5a44e
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qt-ui/divelistview.cpp
View file

@ -21,6 +21,7 @@ DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelec
setUniformRowHeights(true);
setItemDelegateForColumn(TreeItemDT::RATING, new StarWidgetsDelegate());
QSortFilterProxyModel *model = new QSortFilterProxyModel(this);
model->setSortRole(TreeItemDT::SORT_ROLE);
setModel(model);
setSortingEnabled(false);
header()->setContextMenuPolicy(Qt::ActionsContextMenu);

27
qt-ui/models.cpp
View file

@ -822,6 +822,9 @@ QVariant TripItem::data(int column, int role) const
{
QVariant ret;
if (role == SORT_ROLE)
return (qulonglong)trip->when;
if (role == Qt::DisplayRole) {
switch (column) {
case LOCATION:
@ -848,6 +851,13 @@ struct DiveItem : public TreeItemDT {
int weight() const;
};
static int nitrox_sort_value(struct dive *dive)
{
int o2, he, o2low;
get_dive_gas(dive, &o2, &he, &o2low);
return he*1000 + o2;
}
QVariant DiveItem::data(int column, int role) const
{
QVariant retVal;
@ -865,6 +875,23 @@ QVariant DiveItem::data(int column, int role) const
break;
}
break;
case SORT_ROLE:
switch (column) {
case NR: return dive->number;
case DATE: return (qulonglong) dive->when;
case DEPTH: return dive->maxdepth.mm;
case DURATION: return dive->duration.seconds;
case TEMPERATURE: return dive->watertemp.mkelvin;
case TOTALWEIGHT: return total_weight(dive);
case SUIT: return QString(dive->suit);
case CYLINDER: return QString(dive->cylinder[0].type.description);
case NITROX: return nitrox_sort_value(dive);
case SAC: return dive->sac;
case OTU: return dive->otu;
case MAXCNS: return dive->maxcns;
case LOCATION: return QString(dive->location);
}
break;
case Qt::DisplayRole:
switch (column) {
case NR:

2
qt-ui/models.h
View file

@ -124,7 +124,7 @@ public:
enum Column {NR, DATE, RATING, DEPTH, DURATION, TEMPERATURE, TOTALWEIGHT,
SUIT, CYLINDER, NITROX, SAC, OTU, MAXCNS, LOCATION, COLUMNS };
enum ExtraRoles{STAR_ROLE = Qt::UserRole + 1, DIVE_ROLE};
enum ExtraRoles{STAR_ROLE = Qt::UserRole + 1, DIVE_ROLE, SORT_ROLE};
virtual ~TreeItemDT();
int columnCount() const {