mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: return all used cylinders as a list

Browse source 
Planning ahead for full edit capabilities of dives that uses multiple cylinders.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Jocke 2018-07-12 11:57:21 +02:00 committed by Dirk Hohndel
parent a85d4a6447
commit 80df7dd441
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -395,9 +395,13 @@ QString DiveObjectHelper::sumWeight() const
return get_weight_string(sum, true);
}
QString DiveObjectHelper::getCylinder() const
QStringList DiveObjectHelper::getCylinder() const
{
QString getCylinder = m_dive->cylinder[0].type.description;
QStringList getCylinder;
for (int i = 0; i < MAX_CYLINDERS; i++) {
if (is_cylinder_used(m_dive, i))
getCylinder << m_dive->cylinder[i].type.description;
}
return getCylinder;
}

4
core/subsurface-qt/DiveObjectHelper.h
View file

@ -45,7 +45,7 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(int maxcns READ maxcns CONSTANT)
Q_PROPERTY(int otu READ otu CONSTANT)
Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT)
Q_PROPERTY(QString getCylinder READ getCylinder CONSTANT)
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)
@ -89,7 +89,7 @@ public:
int maxcns() const;
int otu() const;
QString sumWeight() const;
QString getCylinder() const;
QStringList getCylinder() const;
QString startPressure() const;
QString endPressure() const;
QString firstGas() const;