summaryrefslogtreecommitdiffstats
path: root/templatelayout.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-28 13:35:04 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-28 13:37:14 -0700
commita4608f7c91138401e9987ff0478bbe42408a37a7 (patch)
treec9f48cf556a1ca39604fe5045acfe2e44087b38e /templatelayout.h
parentbe47ce624170cfce7e9763e5530f0be3555c187d (diff)
downloadsubsurface-a4608f7c91138401e9987ff0478bbe42408a37a7.tar.gz
Printing: fix dive lookup for profile generation
The existing code (and templates) looked up dives by number and then used that as index into the dive table. This worked exactly in one case: if all dives were numbered consecutively starting with 1. While that is not an entirely unreasonable case, it's of course not an acceptable assumption to make. This commit adds the necessary changes to instead look up dives by their unique id. That's what it's there fore, after all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'templatelayout.h')
-rw-r--r--templatelayout.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/templatelayout.h b/templatelayout.h
index 5f4678923..c545f5a05 100644
--- a/templatelayout.h
+++ b/templatelayout.h
@@ -31,6 +31,7 @@ signals:
class Dive {
private:
int m_number;
+ int m_id;
QString m_date;
QString m_time;
QString m_location;
@@ -56,6 +57,7 @@ public:
: dive(dive)
{
m_number = dive->number;
+ m_id = dive->id;
put_date_time();
put_location();
put_duration();
@@ -68,6 +70,7 @@ public:
Dive();
~Dive();
int number() const;
+ int id() const;
QString date() const;
QString time() const;
QString location() const;
@@ -87,6 +90,8 @@ Q_DECLARE_METATYPE(print_options)
GRANTLEE_BEGIN_LOOKUP(Dive)
if (property == "number")
return object.number();
+else if (property == "id")
+ return object.id();
else if (property == "date")
return object.date();
else if (property == "time")