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

Add surge etc to printing template variables

Browse source 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2020-12-11 17:31:04 +01:00 • committed by bstoeger
parent 11eec0a503
commit e7a18456c9
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/subsurface-qt/diveobjecthelper.cpp
View file

@ -270,6 +270,10 @@ DiveObjectHelper::DiveObjectHelper(const struct dive *d) :
id(d->id), id(d->id),
rating(d->rating), rating(d->rating),
visibility(d->visibility), visibility(d->visibility),
wavesize(d->wavesize),
current(d->current),
surge(d->surge),
chill(d->chill),
timestamp(d->when), timestamp(d->when),
location(get_dive_location(d) ? QString::fromUtf8(get_dive_location(d)) : QString()), location(get_dive_location(d) ? QString::fromUtf8(get_dive_location(d)) : QString()),
gps(d->dive_site ? printGPSCoords(&d->dive_site->location) : QString()), gps(d->dive_site ? printGPSCoords(&d->dive_site->location) : QString()),

8
core/subsurface-qt/diveobjecthelper.h
View file

@ -15,6 +15,10 @@ class DiveObjectHelper {
Q_PROPERTY(int id MEMBER id CONSTANT) Q_PROPERTY(int id MEMBER id CONSTANT)
Q_PROPERTY(int rating MEMBER rating CONSTANT) Q_PROPERTY(int rating MEMBER rating CONSTANT)
Q_PROPERTY(int visibility MEMBER visibility 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 date READ date CONSTANT)
Q_PROPERTY(QString time READ time CONSTANT) Q_PROPERTY(QString time READ time CONSTANT)
Q_PROPERTY(int timestamp MEMBER timestamp CONSTANT) Q_PROPERTY(int timestamp MEMBER timestamp CONSTANT)
@ -53,6 +57,10 @@ public:
int id; int id;
int rating; int rating;
int visibility; int visibility;
int wavesize;
int current;
int surge;
int chill;
QString date() const; QString date() const;
timestamp_t timestamp; timestamp_t timestamp;
QString time() const; QString time() const;

8
desktop-widgets/templatelayout.cpp
View file

@ -480,6 +480,14 @@ QVariant TemplateLayout::getValue(QString list, QString property, QVariant optio
return object.rating; return object.rating;
} else if (property == "visibility") { } else if (property == "visibility") {
return object.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") { } else if (property == "date") {
return object.date(); return object.date();
} else if (property == "time") { } else if (property == "time") {