diff options
| author |  Jocke <j.bygdell@gmail.com> | 2018-07-16 18:25:21 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-11 11:19:07 -0700 |
| commit | f9e81c73269d9205ed4851cd86e946a24a8f5b5b (patch) | |
| tree | 13e65a262e8e0f80959653e8bde52147693f504a /core/subsurface-qt | |
| parent | 94428b9a1823fd7df9f2f0f7815900efca2213a4 (diff) | |
| download | subsurface-f9e81c73269d9205ed4851cd86e946a24a8f5b5b.tar.gz | |
Mobile: return all used gasmixes as a list
Planning ahead for full edit capabilities of dives that uses multiple cylinders.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'core/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 9 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 5ac144c07..23fa8a09f 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -417,9 +417,12 @@ QString DiveObjectHelper::endPressure() const return endPressure; } -QString DiveObjectHelper::firstGas() const +QStringList DiveObjectHelper::firstGas() const { - QString gas; - gas = get_gas_string(m_dive->cylinder[0].gasmix); + QStringList gas; + for (int i = 0; i < MAX_CYLINDERS; i++) { + if (is_cylinder_used(m_dive, i)) + gas << get_gas_string(m_dive->cylinder[i].gasmix); + } return gas; } diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index 1c9228365..118197ac3 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -48,7 +48,7 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList getCylinder READ getCylinder CONSTANT) Q_PROPERTY(QString startPressure READ startPressure CONSTANT) Q_PROPERTY(QString endPressure READ endPressure CONSTANT) - Q_PROPERTY(QString firstGas READ firstGas CONSTANT) + Q_PROPERTY(QStringList firstGas READ firstGas CONSTANT) public: DiveObjectHelper(struct dive *dive = NULL); ~DiveObjectHelper(); @@ -92,7 +92,7 @@ public: QStringList getCylinder() const; QString startPressure() const; QString endPressure() const; - QString firstGas() const; + QStringList firstGas() const; private: struct dive *m_dive; |