diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-20 07:37:51 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-20 16:08:55 -0400 |
| commit | 158a2ec1591598973dbde0cedd80a4494f34045a (patch) | |
| tree | 80a3a2cc527dff4d3323d6fe58eae2638fc1118c /qt-models | |
| parent | 32ae3810ce3844bd517002477e41afb78e493f2f (diff) | |
| download | subsurface-158a2ec1591598973dbde0cedd80a4494f34045a.tar.gz | |
Mobile: remove remaining accesses to DiveObjectHelper from QML
Add a couple more roles and remove the dive role that allows accesss to
the DiveObjectHelper in the first place.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divelistmodel.cpp | 6 | ||||
| -rw-r--r-- | qt-models/divelistmodel.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index d0a309330..99d8bc588 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -241,7 +241,6 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const if (!d) return QVariant(); switch(role) { - case DiveRole: return QVariant::fromValue(DiveObjectHelper(d)); case DiveDateRole: return (qlonglong)d->when; // We have to return a QString as trip-id, because that will be used as section // variable in the QtQuick list view. That has to be a string because it will try @@ -276,6 +275,8 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const case NoDiveRole: return d->duration.seconds == 0 && d->dc.duration.seconds == 0; case DiveSiteRole: return QVariant::fromValue(d->dive_site); case CylinderRole: return formatGetCylinder(d).join(", "); + case GetCylinderRole: return formatGetCylinder(d); + case CylinderListRole: return getFullCylinderList(); case SingleWeightRole: return d->weightsystems.nr <= 1; case StartPressureRole: return getStartPressure(d); case EndPressureRole: return getEndPressure(d); @@ -287,7 +288,6 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const QHash<int, QByteArray> DiveListModel::roleNames() const { QHash<int, QByteArray> roles; - roles[DiveRole] = "dive"; roles[DiveDateRole] = "date"; roles[TripIdRole] = "tripId"; roles[TripNrDivesRole] = "tripNrDives"; @@ -313,6 +313,8 @@ QHash<int, QByteArray> DiveListModel::roleNames() const roles[NoDiveRole] = "noDive"; roles[DiveSiteRole] = "diveSite"; roles[CylinderRole] = "cylinder"; + roles[GetCylinderRole] = "getCylinder"; + roles[CylinderListRole] = "cylinderList"; roles[SingleWeightRole] = "singleWeight"; roles[StartPressureRole] = "startPressure"; roles[EndPressureRole] = "endPressure"; diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index 2f8985235..d9e0928dc 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -36,15 +36,14 @@ QStringList formatGetCylinder(const dive *d); QStringList getStartPressure(const dive *d); QStringList getEndPressure(const dive *d); QStringList getFirstGas(const dive *d); - +QStringList getFullCylinderList(); class DiveListModel : public QAbstractListModel { Q_OBJECT public: enum DiveListRoles { - DiveRole = Qt::UserRole + 1, - DiveDateRole, + DiveDateRole = Qt::UserRole + 1, TripIdRole, TripNrDivesRole, DateTimeRole, @@ -69,6 +68,8 @@ public: NoDiveRole, DiveSiteRole, CylinderRole, + GetCylinderRole, + CylinderListRole, SingleWeightRole, StartPressureRole, EndPressureRole, |