diff options
author | Willem Ferguson <willemferguson@zoology.up.ac.za> | 2016-11-19 14:23:54 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-11-24 09:58:16 +0900 |
commit | 1fa855e1c091175afcdb0cc4a3395d3aecb96d1c (patch) | |
tree | 1f127c399e6f1f0cb367fba602c3b6045970f653 /qt-models/divetripmodel.h | |
parent | 2aeb2b8d8b045b317efa595aabb356680dbf4978 (diff) | |
download | subsurface-1fa855e1c091175afcdb0cc4a3395d3aecb96d1c.tar.gz |
Provide photos summary on dive list
1) Add an extra column to dive list, just left of Locality field.
2) For each dive, give summary of photos as follows:
i) no photos: no icon in that column
ii) photos taken during dive: show icon of fish
iii) photos taken before/after dive: show icon of sun
iv) photos taken during as well as before/after dive: show
icon with both fish and sun
3) Provide information for the sort operation to work on
this column of the dive list.
Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/divetripmodel.h')
-rw-r--r-- | qt-models/divetripmodel.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h index 7844d813f..01626448f 100644 --- a/qt-models/divetripmodel.h +++ b/qt-models/divetripmodel.h @@ -3,6 +3,7 @@ #include "treemodel.h" #include "core/dive.h" +#include <string> struct DiveItem : public TreeItem { Q_DECLARE_TR_FUNCTIONS(TripItem) @@ -21,6 +22,7 @@ public: SAC, OTU, MAXCNS, + PHOTOS, LOCATION, COLUMNS }; @@ -36,7 +38,9 @@ public: QString displayTemperature() const; QString displayWeight() const; QString displaySac() const; + int countPhotos(dive *dive) const; int weight() const; + QString icon_names[4]; }; struct TripItem : public TreeItem { @@ -63,6 +67,7 @@ public: SAC, OTU, MAXCNS, + PHOTOS, LOCATION, COLUMNS }; |