mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-12 13:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch from date based to dive trip based grouping

Browse source 
Linus HATED the date based grouping - too much wasted space visually
("three levels of grouping are way too much") and asked for dive trip
based grouping instead.

This is a quick change to do just that, with an assumption that no
dive in 3 days means it's a new trip.

This also changes the summary entry to display a location for the trip,
for now we pick the location of the (chronologically) first dive of the
trip.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-08-16 04:27:03 -07:00
parent 621761233b
commit e6ecddfa3d
1 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
divelist.c
View file

@ -53,10 +53,8 @@ enum {
}; };
/* magic numbers that indicate (as negative values) model entries that /* magic numbers that indicate (as negative values) model entries that
* are summary entries for day / month / year */ * are summary entries for a divetrip */
#define NEW_DAY 1 #define NEW_TRIP 1
#define NEW_MON 2
#define NEW_YR 3
#ifdef DEBUG_MODEL #ifdef DEBUG_MODEL
static gboolean dump_model_entry(GtkTreeModel *model, GtkTreePath *path, static gboolean dump_model_entry(GtkTreeModel *model, GtkTreePath *path,
@ -240,23 +238,13 @@ static void date_data_func(GtkTreeViewColumn *col,
tm = gmtime(&when); tm = gmtime(&when);
switch(idx) { switch(idx) {
case -NEW_DAY: case -NEW_TRIP:
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"%s, %s %d, %d", "Trip %s, %s %d, %d",
weekday(tm->tm_wday), weekday(tm->tm_wday),
monthname(tm->tm_mon), monthname(tm->tm_mon),
tm->tm_mday, tm->tm_year + 1900); tm->tm_mday, tm->tm_year + 1900);
break; break;
case -NEW_MON:
snprintf(buffer, sizeof(buffer),
"%s %d",
monthname(tm->tm_mon),
tm->tm_year + 1900);
break;
case -NEW_YR:
snprintf(buffer, sizeof(buffer),
"%d", tm->tm_year + 1900);
break;
default: default:
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"%s, %s %d, %d %02d:%02d", "%s, %s %d, %d %02d:%02d",
@ -748,22 +736,20 @@ void update_dive_list_col_visibility(void)
return; return;
} }
static int new_date(struct dive *dive, struct dive **last_dive, const int flag, time_t *tm_date) /* random heuristic - not diving in three days implies new dive trip */
#define TRIP_THRESHOLD 3600*24*3
static int new_group(struct dive *dive, struct dive **last_dive, time_t *tm_date)
{ {
if (!last_dive) if (!last_dive)
return TRUE; return TRUE;
if (*last_dive) { if (*last_dive) {
struct dive *ldive = *last_dive; struct dive *ldive = *last_dive;
struct tm tm1, tm2; if (abs(dive->when - ldive->when) < TRIP_THRESHOLD) {
(void) gmtime_r(&dive->when, &tm1); *last_dive = dive;
(void) gmtime_r(&ldive->when, &tm2);
if (tm1.tm_year == tm2.tm_year &&
(tm1.tm_mon == tm2.tm_mon || flag > NEW_MON) &&
(tm1.tm_mday == tm2.tm_mday || flag > NEW_DAY))
return FALSE; return FALSE;
}
} }
if (flag == NEW_DAY) *last_dive = dive;
*last_dive = dive;
if (tm_date) { if (tm_date) {
struct tm *tm1 = gmtime(&dive->when); struct tm *tm1 = gmtime(&dive->when);
tm1->tm_sec = 0; tm1->tm_sec = 0;
@ -776,10 +762,12 @@ static int new_date(struct dive *dive, struct dive **last_dive, const int flag,
static void fill_dive_list(void) static void fill_dive_list(void)
{ {
int i, j; int i;
GtkTreeIter iter, parent_iter[NEW_YR + 2], *parents[NEW_YR + 2] = {NULL, }; GtkTreeIter iter, parent_iter;
GtkTreeStore *liststore, *treestore; GtkTreeStore *liststore, *treestore;
struct dive *last_dive = NULL; struct dive *last_dive = NULL;
struct dive *first_trip_dive = NULL;
struct dive *last_trip_dive = NULL;
time_t dive_date; time_t dive_date;
treestore = GTK_TREE_STORE(dive_list.treemodel); treestore = GTK_TREE_STORE(dive_list.treemodel);
@ -789,23 +777,29 @@ static void fill_dive_list(void)
while (--i >= 0) { while (--i >= 0) {
struct dive *dive = dive_table.dives[i]; struct dive *dive = dive_table.dives[i];
for (j = NEW_YR; j >= NEW_DAY; j--) { if (new_group(dive, &last_dive, &dive_date))
if (new_date(dive, &last_dive, j, &dive_date)) {
{ /* make sure we display the first date of the trip in previous summary */
gtk_tree_store_append(treestore, &parent_iter[j], parents[j+1]); if (first_trip_dive && last_trip_dive && last_trip_dive->when < first_trip_dive->when)
parents[j] = &parent_iter[j]; gtk_tree_store_set(treestore, &parent_iter,
gtk_tree_store_set(treestore, parents[j], DIVE_DATE, last_trip_dive->when,
DIVE_INDEX, -j, DIVE_LOCATION, last_trip_dive->location,
DIVE_NR, -j,
DIVE_DATE, dive_date,
DIVE_LOCATION, "",
DIVE_TEMPERATURE, 0,
DIVE_SAC, 0,
-1); -1);
} first_trip_dive = dive;
gtk_tree_store_append(treestore, &parent_iter, NULL);
gtk_tree_store_set(treestore, &parent_iter,
DIVE_INDEX, -NEW_TRIP,
DIVE_NR, -NEW_TRIP,
DIVE_DATE, dive_date,
DIVE_LOCATION, dive->location,
DIVE_TEMPERATURE, 0,
DIVE_SAC, 0,
-1);
} }
last_trip_dive = dive;
update_cylinder_related_info(dive); update_cylinder_related_info(dive);
gtk_tree_store_append(treestore, &iter, parents[NEW_DAY]); gtk_tree_store_append(treestore, &iter, &parent_iter);
gtk_tree_store_set(treestore, &iter, gtk_tree_store_set(treestore, &iter,
DIVE_INDEX, i, DIVE_INDEX, i,
DIVE_NR, dive->number, DIVE_NR, dive->number,