mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

DiveHelperObject: add the weightList and cylinderList properties

Browse source 
"weights" and "cylinders" are QStringList Q_PROPERTIES, and Grantlee
should be able to render them, but it doesn't.

To be able to print the whole list of weights and cylinders we
introduce two new QString properties "weightList" and "cylinderList".

The variable replacement in the previous patch deals with the
conversation of the user side HTML, e.g.:

USER                  ->   INTERNAL
"{{ dive.weights }}   ->   {{ dive.weightList }}"
"{{ dive.cylinders }} ->   {{ dive.cylinderList }}"

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2016-02-29 16:42:07 +02:00 • committed by Dirk Hohndel
parent 0aa8ef918d
commit 1d06c383a2
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,6 +201,18 @@ QString DiveObjectHelper::sac() const
return QString::number(value, 'f', decimal).append(unit); return QString::number(value, 'f', decimal).append(unit);
} }
QString DiveObjectHelper::weightList() const
{
QString weights;
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) {
QString w = getFormattedWeight(m_dive, i);
if (w == EMPTY_DIVE_STRING)
continue;
weights += w + "; ";
}
return weights;
}
QStringList DiveObjectHelper::weights() const QStringList DiveObjectHelper::weights() const
{ {
QStringList weights; QStringList weights;
@ -226,6 +238,18 @@ QString DiveObjectHelper::suit() const
return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING; return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING;
} }
QString DiveObjectHelper::cylinderList() const
{
QString cylinders;
for (int i = 0; i < MAX_CYLINDERS; i++) {
QString cyl = getFormattedCylinder(m_dive, i);
if (cyl == EMPTY_DIVE_STRING)
continue;
cylinders += cyl + "; ";
}
return cylinders;
}
QStringList DiveObjectHelper::cylinders() const QStringList DiveObjectHelper::cylinders() const
{ {
QStringList cylinders; QStringList cylinders;

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

@ -26,9 +26,11 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QString tags READ tags CONSTANT) Q_PROPERTY(QString tags READ tags CONSTANT)
Q_PROPERTY(QString gas READ gas CONSTANT) Q_PROPERTY(QString gas READ gas CONSTANT)
Q_PROPERTY(QString sac READ sac CONSTANT) Q_PROPERTY(QString sac READ sac CONSTANT)
Q_PROPERTY(QString weightList READ weightList CONSTANT)
Q_PROPERTY(QStringList weights READ weights CONSTANT) Q_PROPERTY(QStringList weights READ weights CONSTANT)
Q_PROPERTY(bool singleWeight READ singleWeight CONSTANT) Q_PROPERTY(bool singleWeight READ singleWeight CONSTANT)
Q_PROPERTY(QString suit READ suit CONSTANT) Q_PROPERTY(QString suit READ suit CONSTANT)
Q_PROPERTY(QString cylinderList READ cylinderList CONSTANT)
Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT)
Q_PROPERTY(QString trip READ trip CONSTANT) Q_PROPERTY(QString trip READ trip CONSTANT)
Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT) Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT)
@ -61,10 +63,12 @@ public:
QString tags() const; QString tags() const;
QString gas() const; QString gas() const;
QString sac() const; QString sac() const;
QString weightList() const;
QStringList weights() const; QStringList weights() const;
QString weight(int idx) const; QString weight(int idx) const;
bool singleWeight() const; bool singleWeight() const;
QString suit() const; QString suit() const;
QString cylinderList() const;
QStringList cylinders() const; QStringList cylinders() const;
QString cylinder(int idx) const; QString cylinder(int idx) const;
QString trip() const; QString trip() const;