diff options
author | Jan Mulder <jlmulder@xs4all.nl> | 2018-02-04 16:46:03 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-23 22:45:29 +0100 |
commit | 0bc0b6bfe8666744611f8afa775a58b95e686652 (patch) | |
tree | c5e1d70743c0c842759c827e46a6267d004c9541 /qt-models | |
parent | f1bb2c847896689a5e70b6f423b1cfdc923824de (diff) | |
download | subsurface-0bc0b6bfe8666744611f8afa775a58b95e686652.tar.gz |
Mobile/filtering: first attempt to filter on dive site
[Dirk Hohndel: this is the starting point of my following commits, I decided to
leave it in place to give Jan credit for the work he did on
figuring out some of the plumbing needed to get things to work]
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models')
-rw-r--r-- | qt-models/divelistmodel.cpp | 13 | ||||
-rw-r--r-- | qt-models/divelistmodel.h | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index 8dc119ad8..76c0db7e3 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -8,6 +8,17 @@ DiveListSortModel::DiveListSortModel(QObject *parent) : QSortFilterProxyModel(pa } +void DiveListSortModel::setFilter(QString f) +{ + setFilterRole(DiveListModel::DiveSiteRole); + setFilterRegExp(f); +} + +void DiveListSortModel::resetFilter() +{ + setFilterRegExp(""); +} + int DiveListSortModel::getDiveId(int idx) { DiveListModel *mySourceModel = qobject_cast<DiveListModel *>(sourceModel()); @@ -151,6 +162,7 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const switch(role) { case DiveRole: return QVariant::fromValue<QObject*>(curr_dive); case DiveDateRole: return (qlonglong)curr_dive->timestamp(); + case DiveSiteRole: return curr_dive->location(); } return QVariant(); @@ -161,6 +173,7 @@ QHash<int, QByteArray> DiveListModel::roleNames() const QHash<int, QByteArray> roles; roles[DiveRole] = "dive"; roles[DiveDateRole] = "date"; + roles[DiveSiteRole] = "site"; return roles; } diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index d7988f2d9..2773ce33d 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -17,6 +17,8 @@ public: public slots: int getDiveId(int idx); int getIdxForId(int id); + void setFilter(QString f); + void resetFilter(); }; class DiveListModel : public QAbstractListModel @@ -26,7 +28,8 @@ public: enum DiveListRoles { DiveRole = Qt::UserRole + 1, - DiveDateRole + DiveDateRole, + DiveSiteRole }; static DiveListModel *instance(); |