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

Provide photos summary on dive list

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

50
qt-models/divetripmodel.cpp
View file

@ -22,6 +22,7 @@ static QVariant dive_table_alignment(int column)
case DiveTripModel::TOTALWEIGHT:
case DiveTripModel::SAC:
case DiveTripModel::OTU:
case DiveTripModel::PHOTOS:
case DiveTripModel::MAXCNS:
// Right align numeric columns
retVal = int(Qt::AlignRight | Qt::AlignVCenter);
@ -80,6 +81,8 @@ QVariant TripItem::data(int column, int role) const
QVariant DiveItem::data(int column, int role) const
{
QVariant retVal;
int iconIndex;
QString icon_names[4] = {":zero",":duringPhoto", ":outsidePhoto", ":inAndOutPhoto" };
struct dive *dive = get_dive_by_uniq_id(diveId);
if (!dive)
return QVariant();
@ -130,6 +133,9 @@ QVariant DiveItem::data(int column, int role) const
case MAXCNS:
retVal = dive->maxcns;
break;
case PHOTOS:
retVal = countPhotos(dive);
break;
case LOCATION:
retVal = QString(get_dive_location(dive));
break;
@ -171,6 +177,8 @@ QVariant DiveItem::data(int column, int role) const
case MAXCNS:
retVal = dive->maxcns;
break;
case PHOTOS:
break;
case LOCATION:
retVal = QString(get_dive_location(dive));
break;
@ -182,11 +190,21 @@ QVariant DiveItem::data(int column, int role) const
}
break;
case Qt::DecorationRole:
if (column == LOCATION)
switch (column) {
case LOCATION:
if (dive_has_gps_location(dive)) {
IconMetrics im = defaultIconMetrics();
retVal = QIcon(":satellite").pixmap(im.sz_small, im.sz_small);
retVal = QIcon(":globe-icon").pixmap(im.sz_small, im.sz_small);
}
break;
case PHOTOS: // if enabled, show photos icon: fish= photos during dive; sun=photos before/after dive
if (dive->picture_list) // sun+fish=photos during dive as well as before/after
{
IconMetrics im = defaultIconMetrics();
retVal = QIcon(icon_names[countPhotos(dive)]).pixmap(im.sz_small, im.sz_small);
}
break;
}
break;
case Qt::ToolTipRole:
switch (column) {
@ -231,6 +249,9 @@ QVariant DiveItem::data(int column, int role) const
case MAXCNS:
retVal = tr("Max CNS");
break;
case PHOTOS:
retVal = tr("Photos before/during/after dive");
break;
case LOCATION:
retVal = tr("Location");
break;
@ -301,6 +322,25 @@ QString DiveItem::displayDepthWithUnit() const
return get_depth_string(dive->maxdepth, true);
}
int DiveItem::countPhotos(dive *dive) const
{
int diveDuration = dive->duration.seconds;
int pic_offset, icon_index = 0;
struct picture *pic_list = dive->picture_list; // Point to 1st picture of dive
if (!pic_list) return 0; // This dive does not contain pictures
do {
pic_offset = pic_list->offset.seconds;
if ((pic_offset < 0) | (pic_offset > diveDuration)) {
icon_index |= 0x02; // If picture is before/after the dive
} // then set the appropriate bit ...
else {
icon_index |= 0x01; // else set the bit for picture during the dive
}
pic_list = pic_list->next; // look at next photo
} while (pic_list);
return icon_index; // return value: 0=no pictures; 1=pictures during dive;
} // 2=pictures before/after; 3=pictures during as well as before/after
QString DiveItem::displayDuration() const
{
int hrs, mins, fullmins, secs;
@ -430,6 +470,9 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
case MAXCNS:
ret = tr("Max CNS");
break;
case PHOTOS:
ret = tr("█");
break;
case LOCATION:
ret = tr("Location");
break;
@ -478,6 +521,9 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
case MAXCNS:
ret = tr("Max CNS");
break;
case PHOTOS:
ret = tr("Photos before/during/after dive");
break;
case LOCATION:
ret = tr("Location");
break;