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>
This commit is contained in:
Willem Ferguson 2016-11-19 14:23:54 +02:00 committed by Dirk Hohndel
parent 2aeb2b8d8b
commit 1fa855e1c0
7 changed files with 62 additions and 5 deletions

View file

@ -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
};