diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2020-12-11 17:31:04 +0100 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2020-12-12 16:37:29 +0100 |
| commit | e7a18456c90f80433b6a6306dfdbd3b7bf016b76 (patch) | |
| tree | 5d145155471c555331684415f35ef10566605968 | |
| parent | 11eec0a503df9df5619a294c2769437c4fee36ea (diff) | |
| download | subsurface-e7a18456c90f80433b6a6306dfdbd3b7bf016b76.tar.gz | |
Add surge etc to printing template variables
Signed-off-by: Robert C. Helling <helling@atdotde.de>
| -rw-r--r-- | core/subsurface-qt/diveobjecthelper.cpp | 4 | ||||
| -rw-r--r-- | core/subsurface-qt/diveobjecthelper.h | 8 | ||||
| -rw-r--r-- | desktop-widgets/templatelayout.cpp | 8 |
3 files changed, 20 insertions, 0 deletions
diff --git a/core/subsurface-qt/diveobjecthelper.cpp b/core/subsurface-qt/diveobjecthelper.cpp index bbf51ed12..1df949b0f 100644 --- a/core/subsurface-qt/diveobjecthelper.cpp +++ b/core/subsurface-qt/diveobjecthelper.cpp @@ -270,6 +270,10 @@ DiveObjectHelper::DiveObjectHelper(const struct dive *d) : id(d->id), rating(d->rating), visibility(d->visibility), + wavesize(d->wavesize), + current(d->current), + surge(d->surge), + chill(d->chill), timestamp(d->when), location(get_dive_location(d) ? QString::fromUtf8(get_dive_location(d)) : QString()), gps(d->dive_site ? printGPSCoords(&d->dive_site->location) : QString()), diff --git a/core/subsurface-qt/diveobjecthelper.h b/core/subsurface-qt/diveobjecthelper.h index a10fe83f1..a1fddd1c8 100644 --- a/core/subsurface-qt/diveobjecthelper.h +++ b/core/subsurface-qt/diveobjecthelper.h @@ -15,6 +15,10 @@ class DiveObjectHelper { Q_PROPERTY(int id MEMBER id CONSTANT) Q_PROPERTY(int rating MEMBER rating CONSTANT) Q_PROPERTY(int visibility MEMBER visibility CONSTANT) + Q_PROPERTY(int wavesize MEMBER wavesize CONSTANT) + Q_PROPERTY(int current MEMBER current CONSTANT) + Q_PROPERTY(int surge MEMBER surge CONSTANT) + Q_PROPERTY(int chill MEMBER chill CONSTANT) Q_PROPERTY(QString date READ date CONSTANT) Q_PROPERTY(QString time READ time CONSTANT) Q_PROPERTY(int timestamp MEMBER timestamp CONSTANT) @@ -53,6 +57,10 @@ public: int id; int rating; int visibility; + int wavesize; + int current; + int surge; + int chill; QString date() const; timestamp_t timestamp; QString time() const; diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index 76d6e771f..10907767b 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -480,6 +480,14 @@ QVariant TemplateLayout::getValue(QString list, QString property, QVariant optio return object.rating; } else if (property == "visibility") { return object.visibility; + } else if (property == "wavesize") { + return object.wavesize; + } else if (property == "current") { + return object.current; + } else if (property == "surge") { + return object.surge; + } else if (property == "chill") { + return object.chill; } else if (property == "date") { return object.date(); } else if (property == "time") { |