diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 25 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 4 |
2 files changed, 22 insertions, 7 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 768d4a860..87fae7c06 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -5,6 +5,7 @@ #include "../qthelper.h" #include "../helpers.h" +#include "../../qt-models/tankinfomodel.h" static QString EMPTY_DIVE_STRING = QStringLiteral(""); enum returnPressureSelector {START_PRESSURE, END_PRESSURE}; @@ -252,15 +253,29 @@ QString DiveObjectHelper::suit() const return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING; } -QString DiveObjectHelper::cylinderList() const +QStringList DiveObjectHelper::cylinderList() const { - QString cylinders; - for (int i = 0; i < MAX_CYLINDERS; i++) { - QString cyl = getFormattedCylinder(m_dive, i); + QStringList cylinders; + struct dive *d; + int i = 0; + for_each_dive (i, d) { + for (int j = 0; j < MAX_CYLINDERS; j++) { + QString cyl = d->cylinder[j].type.description; + if (cyl == EMPTY_DIVE_STRING) + continue; + cylinders << cyl; + } + } + + for (i = 0; i < sizeof(tank_info) && tank_info[i].name != NULL; i++) { + QString cyl = tank_info[i].name; if (cyl == EMPTY_DIVE_STRING) continue; - cylinders += cyl + "; "; + cylinders << cyl; } + + cylinders.removeDuplicates(); + cylinders.sort(); return cylinders; } diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index c685690cf..8650f7a98 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -33,7 +33,7 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList weights READ weights CONSTANT) Q_PROPERTY(bool singleWeight READ singleWeight CONSTANT) Q_PROPERTY(QString suit READ suit CONSTANT) - Q_PROPERTY(QString cylinderList READ cylinderList CONSTANT) + Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QList<CylinderObjectHelper*> cylinderObjects READ cylinderObjects CONSTANT) Q_PROPERTY(QString trip READ trip CONSTANT) @@ -76,7 +76,7 @@ public: QString weight(int idx) const; bool singleWeight() const; QString suit() const; - QString cylinderList() const; + QStringList cylinderList() const; QStringList cylinders() const; QString cylinder(int idx) const; QList<CylinderObjectHelper*> cylinderObjects() const; |