diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2015-11-17 00:29:21 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-16 15:06:32 -0800 |
| commit | 7e749e8ea4a4c73e01bca1b23dd96aaccbc4fa07 (patch) | |
| tree | 147e02a595f95979317d4710c09a58efdb1dd390 | |
| parent | c78a5604426e0055250b5201f276ec58e89fb178 (diff) | |
| download | subsurface-7e749e8ea4a4c73e01bca1b23dd96aaccbc4fa07.tar.gz | |
qthelper: also support "maxcns" and "otu" in Grantlee HTML
Fixes #962
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/templatelayout.h | 2 | ||||
| -rw-r--r-- | subsurface-core/qthelper.cpp | 20 | ||||
| -rw-r--r-- | subsurface-core/qthelper.h | 8 |
3 files changed, 30 insertions, 0 deletions
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index d8328534a..1ef9b5834 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -93,6 +93,8 @@ else _RETURN_DIVE_PROPERTY_IDX(weight, 2); else _RETURN_DIVE_PROPERTY_IDX(weight, 3); else _RETURN_DIVE_PROPERTY_IDX(weight, 4); else _RETURN_DIVE_PROPERTY_IDX(weight, 5); +else _RETURN_DIVE_PROPERTY(maxcns); +else _RETURN_DIVE_PROPERTY(otu); GRANTLEE_END_LOOKUP #undef _RETURN_DIVE_PROPERTY diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp index 049ebf6fc..c3ea37c97 100644 --- a/subsurface-core/qthelper.cpp +++ b/subsurface-core/qthelper.cpp @@ -178,6 +178,16 @@ QString Dive::trip() const return m_trip; } +QString Dive::maxcns() const +{ + return m_maxcns; +} + +QString Dive::otu() const +{ + return m_otu; +} + int Dive::rating() const { return m_rating; @@ -351,6 +361,16 @@ void Dive::put_trip() } } +void Dive::put_maxcns() +{ + m_maxcns = QString::number(dive->maxcns); +} + +void Dive::put_otu() +{ + m_otu = QString::number(dive->otu); +} + QString weight_string(int weight_in_grams) { QString str; diff --git a/subsurface-core/qthelper.h b/subsurface-core/qthelper.h index 86be073f8..4345afae0 100644 --- a/subsurface-core/qthelper.h +++ b/subsurface-core/qthelper.h @@ -32,6 +32,8 @@ private: QString m_suit; QStringList m_cylinders; QString m_trip; + QString m_maxcns; + QString m_otu; struct dive *dive; void put_date_time(); void put_timestamp(); @@ -49,6 +51,8 @@ private: void put_suit(); void put_cylinder(); void put_trip(); + void put_maxcns(); + void put_otu(); public: Dive(struct dive *dive) @@ -73,6 +77,8 @@ public: put_suit(); put_cylinder(); put_trip(); + put_maxcns(); + put_otu(); } Dive(); ~Dive(); @@ -99,6 +105,8 @@ public: QString cylinders() const; QString cylinder(int idx) const; QString trip() const; + QString maxcns() const; + QString otu() const; }; // global pointers for our translation |