From 1fa855e1c091175afcdb0cc4a3395d3aecb96d1c Mon Sep 17 00:00:00 2001 From: Willem Ferguson Date: Sat, 19 Nov 2016 14:23:54 +0200 Subject: 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 Signed-off-by: Dirk Hohndel --- qt-models/divetripmodel.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qt-models/divetripmodel.h') 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 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 }; -- cgit v1.2.3-70-g09d2