2011-09-20 19:40:34 +00:00
|
|
|
/* divelist.c */
|
2011-09-22 15:21:32 +00:00
|
|
|
/* this creates the UI for the dive list -
|
2011-09-20 19:40:34 +00:00
|
|
|
* controlled through the following interfaces:
|
2011-09-22 15:21:32 +00:00
|
|
|
*
|
2011-09-20 19:40:34 +00:00
|
|
|
* void flush_divelist(struct dive *dive)
|
|
|
|
* GtkWidget dive_list_create(void)
|
|
|
|
* void dive_list_update_dives(void)
|
|
|
|
* void update_dive_list_units(void)
|
|
|
|
* void set_divelist_font(const char *font)
|
2011-09-21 04:29:09 +00:00
|
|
|
* void mark_divelist_changed(int changed)
|
|
|
|
* int unsaved_changes()
|
2011-09-20 19:40:34 +00:00
|
|
|
*/
|
2011-08-31 17:27:58 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2011-09-04 18:14:33 +00:00
|
|
|
#include <string.h>
|
2011-08-31 17:27:58 +00:00
|
|
|
#include <time.h>
|
2011-09-22 20:45:53 +00:00
|
|
|
#include <math.h>
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-09-05 19:12:58 +00:00
|
|
|
#include "divelist.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
#include "dive.h"
|
|
|
|
#include "display.h"
|
2011-09-20 19:40:34 +00:00
|
|
|
#include "display-gtk.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
struct DiveList {
|
|
|
|
GtkWidget *tree_view;
|
|
|
|
GtkWidget *container_widget;
|
2012-08-13 21:42:55 +00:00
|
|
|
GtkTreeStore *model, *listmodel, *treemodel;
|
2011-12-07 19:58:16 +00:00
|
|
|
GtkTreeViewColumn *nr, *date, *stars, *depth, *duration, *location;
|
2012-08-14 23:07:25 +00:00
|
|
|
GtkTreeViewColumn *temperature, *cylinder, *totalweight, *suit, *nitrox, *sac, *otu;
|
2011-09-21 04:29:09 +00:00
|
|
|
int changed;
|
2011-09-20 17:06:24 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct DiveList dive_list;
|
|
|
|
|
2011-09-19 19:25:16 +00:00
|
|
|
/*
|
|
|
|
* The dive list has the dive data in both string format (for showing)
|
|
|
|
* and in "raw" format (for sorting purposes)
|
|
|
|
*/
|
|
|
|
enum {
|
|
|
|
DIVE_INDEX = 0,
|
2011-10-23 15:50:14 +00:00
|
|
|
DIVE_NR, /* int: dive->nr */
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_DATE, /* time_t: dive->when */
|
2011-12-07 19:58:16 +00:00
|
|
|
DIVE_RATING, /* int: 0-5 stars */
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_DEPTH, /* int: dive->maxdepth in mm */
|
|
|
|
DIVE_DURATION, /* int: in seconds */
|
2011-09-20 02:13:36 +00:00
|
|
|
DIVE_TEMPERATURE, /* int: in mkelvin */
|
2012-08-07 18:24:40 +00:00
|
|
|
DIVE_TOTALWEIGHT, /* int: in grams */
|
2012-08-14 23:07:25 +00:00
|
|
|
DIVE_SUIT, /* "wet, 3mm" */
|
2011-09-20 03:06:54 +00:00
|
|
|
DIVE_CYLINDER,
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
DIVE_NITROX, /* int: dummy */
|
2011-09-20 02:13:36 +00:00
|
|
|
DIVE_SAC, /* int: in ml/min */
|
2011-09-22 21:02:26 +00:00
|
|
|
DIVE_OTU, /* int: in OTUs */
|
2011-09-22 18:02:28 +00:00
|
|
|
DIVE_LOCATION, /* "2nd Cathedral, Lanai" */
|
2011-09-19 19:56:37 +00:00
|
|
|
DIVELIST_COLUMNS
|
2011-09-19 19:25:16 +00:00
|
|
|
};
|
|
|
|
|
2012-08-13 20:09:40 +00:00
|
|
|
/* magic numbers that indicate (as negative values) model entries that
|
2012-08-16 11:27:03 +00:00
|
|
|
* are summary entries for a divetrip */
|
|
|
|
#define NEW_TRIP 1
|
2012-08-13 20:09:40 +00:00
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
#ifdef DEBUG_MODEL
|
|
|
|
static gboolean dump_model_entry(GtkTreeModel *model, GtkTreePath *path,
|
|
|
|
GtkTreeIter *iter, gpointer data)
|
|
|
|
{
|
|
|
|
char *location;
|
|
|
|
int idx, nr, rating, depth;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_NR, &nr, DIVE_RATING, &rating, DIVE_DEPTH, &depth, DIVE_LOCATION, &location, -1);
|
|
|
|
printf("entry #%d : nr %d rating %d depth %d location %s \n", idx, nr, rating, depth, location);
|
|
|
|
free(location);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dump_model(GtkListStore *store)
|
|
|
|
{
|
|
|
|
gtk_tree_model_foreach(GTK_TREE_MODEL(store), dump_model_entry, NULL);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-08-16 23:31:53 +00:00
|
|
|
#if DEBUG_SELECTION_TRACKING
|
|
|
|
void dump_selection(void)
|
|
|
|
{
|
|
|
|
int i;
|
2012-08-20 12:48:07 +00:00
|
|
|
struct dive *dive;
|
2012-08-16 23:31:53 +00:00
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
printf("currently selected are %d dives:", amount_selected);
|
|
|
|
for (i = 0; (dive = get_dive(i)) != NULL; i++) {
|
|
|
|
if (dive->selected)
|
|
|
|
printf(" %d", i);
|
|
|
|
}
|
2012-08-16 23:31:53 +00:00
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-08-14 04:11:09 +00:00
|
|
|
/* when subsurface starts we want to have the last dive selected. So we simply
|
|
|
|
walk to the first leaf (and skip the summary entries - which have negative
|
|
|
|
DIVE_INDEX) */
|
2012-08-13 22:07:38 +00:00
|
|
|
static void first_leaf(GtkTreeModel *model, GtkTreeIter *iter, int *diveidx)
|
|
|
|
{
|
|
|
|
GtkTreeIter parent;
|
|
|
|
GtkTreePath *tpath;
|
|
|
|
|
|
|
|
while (*diveidx < 0) {
|
|
|
|
memcpy(&parent, iter, sizeof(parent));
|
|
|
|
tpath = gtk_tree_model_get_path(model, &parent);
|
|
|
|
if (!gtk_tree_model_iter_children(model, iter, &parent))
|
|
|
|
/* we should never have a parent without child */
|
|
|
|
return;
|
2012-08-14 04:11:09 +00:00
|
|
|
if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), tpath))
|
2012-08-13 22:07:38 +00:00
|
|
|
gtk_tree_view_expand_row(GTK_TREE_VIEW(dive_list.tree_view), tpath, FALSE);
|
|
|
|
gtk_tree_model_get(GTK_TREE_MODEL(model), iter, DIVE_INDEX, diveidx, -1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-16 23:31:53 +00:00
|
|
|
/* make sure that if we expand a summary row that is selected, the children show
|
|
|
|
up as selected, too */
|
|
|
|
void row_expanded_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
|
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
GtkTreeIter child;
|
|
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
|
2012-08-16 23:31:53 +00:00
|
|
|
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
|
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
if (!gtk_tree_model_iter_children(model, &child, iter))
|
|
|
|
return;
|
|
|
|
|
|
|
|
do {
|
|
|
|
int idx;
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, &child, DIVE_INDEX, &idx, -1);
|
|
|
|
dive = get_dive(idx);
|
|
|
|
|
|
|
|
if (dive->selected)
|
|
|
|
gtk_tree_selection_select_iter(selection, &child);
|
|
|
|
else
|
|
|
|
gtk_tree_selection_unselect_iter(selection, &child);
|
|
|
|
} while (gtk_tree_model_iter_next(model, &child));
|
2012-08-14 04:11:09 +00:00
|
|
|
}
|
|
|
|
|
2012-08-20 13:27:04 +00:00
|
|
|
static int selected_children(GtkTreeModel *model, GtkTreeIter *iter)
|
|
|
|
{
|
|
|
|
GtkTreeIter child;
|
|
|
|
|
|
|
|
if (!gtk_tree_model_iter_children(model, &child, iter))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
do {
|
|
|
|
int idx;
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, &child, DIVE_INDEX, &idx, -1);
|
|
|
|
dive = get_dive(idx);
|
|
|
|
|
|
|
|
if (dive->selected)
|
|
|
|
return TRUE;
|
|
|
|
} while (gtk_tree_model_iter_next(model, &child));
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure that if we collapse a summary row with any selected children, the row
|
|
|
|
shows up as selected too */
|
|
|
|
void row_collapsed_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
|
|
|
|
{
|
|
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
|
|
|
|
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
|
|
|
|
|
|
|
|
if (selected_children(model, iter))
|
|
|
|
gtk_tree_selection_select_iter(selection, iter);
|
|
|
|
}
|
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
static GList *selection_changed = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is called _before_ the selection is changed, for every single entry;
|
|
|
|
*
|
|
|
|
* We simply create a list of all changed entries, and make sure that the
|
|
|
|
* group entries go at the end of the list.
|
|
|
|
*/
|
2012-08-14 04:11:09 +00:00
|
|
|
gboolean modify_selection_cb(GtkTreeSelection *selection, GtkTreeModel *model,
|
|
|
|
GtkTreePath *path, gboolean was_selected, gpointer userdata)
|
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
GtkTreeIter iter, *p;
|
2012-08-14 04:11:09 +00:00
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
if (!gtk_tree_model_get_iter(model, &iter, path))
|
|
|
|
return TRUE;
|
2012-08-17 22:03:57 +00:00
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
/* Add the group entries to the end */
|
|
|
|
p = gtk_tree_iter_copy(&iter);
|
|
|
|
if (gtk_tree_model_iter_has_child(model, p))
|
|
|
|
selection_changed = g_list_append(selection_changed, p);
|
|
|
|
else
|
|
|
|
selection_changed = g_list_prepend(selection_changed, p);
|
|
|
|
return TRUE;
|
|
|
|
}
|
2012-08-17 21:23:38 +00:00
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
static void select_dive(struct dive *dive, int selected)
|
|
|
|
{
|
|
|
|
if (dive->selected != selected) {
|
|
|
|
amount_selected += selected ? 1 : -1;
|
|
|
|
dive->selected = selected;
|
2012-08-14 04:11:09 +00:00
|
|
|
}
|
2012-08-20 12:48:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This gets called when a dive group has changed selection.
|
|
|
|
*/
|
|
|
|
static void select_dive_group(GtkTreeModel *model, GtkTreeSelection *selection, GtkTreeIter *iter, int selected)
|
|
|
|
{
|
|
|
|
int first = 1;
|
|
|
|
GtkTreeIter child;
|
|
|
|
|
2012-08-20 13:27:04 +00:00
|
|
|
if (selected == selected_children(model, iter))
|
|
|
|
return;
|
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
if (!gtk_tree_model_iter_children(model, &child, iter))
|
|
|
|
return;
|
|
|
|
|
|
|
|
do {
|
|
|
|
int idx;
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, &child, DIVE_INDEX, &idx, -1);
|
|
|
|
if (first && selected)
|
|
|
|
selected_dive = idx;
|
|
|
|
first = 0;
|
|
|
|
dive = get_dive(idx);
|
|
|
|
if (dive->selected == selected)
|
|
|
|
break;
|
|
|
|
|
|
|
|
select_dive(dive, selected);
|
|
|
|
if (selected)
|
|
|
|
gtk_tree_selection_select_iter(selection, &child);
|
|
|
|
else
|
|
|
|
gtk_tree_selection_unselect_iter(selection, &child);
|
|
|
|
} while (gtk_tree_model_iter_next(model, &child));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This gets called _after_ the selections have changed, for each entry that
|
|
|
|
* may have changed. Check if the gtk selection state matches our internal
|
|
|
|
* selection state to verify.
|
|
|
|
*
|
|
|
|
* The group entries are at the end, this guarantees that we have handled
|
|
|
|
* all the dives before we handle groups.
|
|
|
|
*/
|
|
|
|
static void check_selection_cb(GtkTreeIter *iter, GtkTreeSelection *selection)
|
|
|
|
{
|
|
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
|
|
|
|
struct dive *dive;
|
|
|
|
int idx, gtk_selected;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter,
|
|
|
|
DIVE_INDEX, &idx,
|
|
|
|
-1);
|
|
|
|
dive = get_dive(idx);
|
|
|
|
gtk_selected = gtk_tree_selection_iter_is_selected(selection, iter);
|
|
|
|
if (idx < 0)
|
|
|
|
select_dive_group(model, selection, iter, gtk_selected);
|
|
|
|
else {
|
|
|
|
select_dive(dive, gtk_selected);
|
|
|
|
if (gtk_selected)
|
|
|
|
selected_dive = idx;
|
|
|
|
}
|
|
|
|
gtk_tree_iter_free(iter);
|
2012-08-14 04:11:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this is called when gtk thinks that the selection has changed */
|
2012-08-20 12:48:07 +00:00
|
|
|
static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
|
2011-08-31 17:27:58 +00:00
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
GList *changed = selection_changed;
|
|
|
|
|
|
|
|
selection_changed = NULL;
|
|
|
|
g_list_foreach(changed, (GFunc) check_selection_cb, selection);
|
|
|
|
g_list_free(changed);
|
|
|
|
#if DEBUG_SELECTION_TRACKING
|
|
|
|
dump_selection();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
process_selected_dives();
|
2012-08-16 23:31:53 +00:00
|
|
|
repaint_dive();
|
2011-08-31 17:46:28 +00:00
|
|
|
}
|
|
|
|
|
2011-12-07 19:58:16 +00:00
|
|
|
const char *star_strings[] = {
|
|
|
|
ZERO_STARS,
|
|
|
|
ONE_STARS,
|
|
|
|
TWO_STARS,
|
|
|
|
THREE_STARS,
|
|
|
|
FOUR_STARS,
|
|
|
|
FIVE_STARS
|
|
|
|
};
|
|
|
|
|
|
|
|
static void star_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int nr_stars, idx;
|
2011-12-07 19:58:16 +00:00
|
|
|
char buffer[40];
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_RATING, &nr_stars, -1);
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0) {
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
} else {
|
|
|
|
if (nr_stars < 0 || nr_stars > 5)
|
|
|
|
nr_stars = 0;
|
|
|
|
snprintf(buffer, sizeof(buffer), "%s", star_strings[nr_stars]);
|
|
|
|
}
|
2011-12-07 19:58:16 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
|
|
|
}
|
|
|
|
|
2011-09-20 01:44:47 +00:00
|
|
|
static void date_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
2011-09-19 22:39:29 +00:00
|
|
|
{
|
2012-08-18 18:41:11 +00:00
|
|
|
int val, idx, nr;
|
2011-09-19 22:39:29 +00:00
|
|
|
struct tm *tm;
|
2011-09-20 01:44:47 +00:00
|
|
|
time_t when;
|
2011-09-19 22:39:29 +00:00
|
|
|
char buffer[40];
|
|
|
|
|
2012-08-18 18:41:11 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &val, DIVE_NR, &nr, -1);
|
2011-09-20 01:44:47 +00:00
|
|
|
|
2011-09-19 22:39:29 +00:00
|
|
|
/* 2038 problem */
|
2011-09-20 01:44:47 +00:00
|
|
|
when = val;
|
2011-09-19 22:39:29 +00:00
|
|
|
|
2011-09-20 01:44:47 +00:00
|
|
|
tm = gmtime(&when);
|
2012-08-13 20:09:40 +00:00
|
|
|
switch(idx) {
|
2012-08-16 11:27:03 +00:00
|
|
|
case -NEW_TRIP:
|
2012-08-08 16:35:38 +00:00
|
|
|
snprintf(buffer, sizeof(buffer),
|
2012-08-18 18:41:11 +00:00
|
|
|
"Trip %s, %s %d, %d (%d dive%s)",
|
2012-08-08 16:35:38 +00:00
|
|
|
weekday(tm->tm_wday),
|
|
|
|
monthname(tm->tm_mon),
|
2012-08-18 18:41:11 +00:00
|
|
|
tm->tm_mday, tm->tm_year + 1900,
|
|
|
|
nr, nr > 1 ? "s" : "");
|
2012-08-13 20:09:40 +00:00
|
|
|
break;
|
|
|
|
default:
|
2012-08-08 16:35:38 +00:00
|
|
|
snprintf(buffer, sizeof(buffer),
|
|
|
|
"%s, %s %d, %d %02d:%02d",
|
|
|
|
weekday(tm->tm_wday),
|
|
|
|
monthname(tm->tm_mon),
|
|
|
|
tm->tm_mday, tm->tm_year + 1900,
|
|
|
|
tm->tm_hour, tm->tm_min);
|
2012-08-13 20:09:40 +00:00
|
|
|
}
|
2011-09-20 01:44:47 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
2011-09-19 22:39:29 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 01:52:23 +00:00
|
|
|
static void depth_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
2011-09-19 22:39:29 +00:00
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int depth, integer, frac, len, idx;
|
2011-09-20 01:52:23 +00:00
|
|
|
char buffer[40];
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DEPTH, &depth, -1);
|
2011-09-19 22:39:29 +00:00
|
|
|
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0) {
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
} else {
|
|
|
|
switch (output_units.length) {
|
|
|
|
case METERS:
|
|
|
|
/* To tenths of meters */
|
|
|
|
depth = (depth + 49) / 100;
|
|
|
|
integer = depth / 10;
|
|
|
|
frac = depth % 10;
|
|
|
|
if (integer < 20)
|
|
|
|
break;
|
|
|
|
if (frac >= 5)
|
|
|
|
integer++;
|
|
|
|
frac = -1;
|
2011-09-19 22:39:29 +00:00
|
|
|
break;
|
2012-08-08 16:35:38 +00:00
|
|
|
case FEET:
|
|
|
|
integer = mm_to_feet(depth) + 0.5;
|
|
|
|
frac = -1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
len = snprintf(buffer, sizeof(buffer), "%d", integer);
|
|
|
|
if (frac >= 0)
|
|
|
|
len += snprintf(buffer+len, sizeof(buffer)-len, ".%d", frac);
|
2011-09-19 22:39:29 +00:00
|
|
|
}
|
2011-09-20 01:52:23 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
2011-09-19 22:39:29 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 02:13:36 +00:00
|
|
|
static void duration_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
2011-09-19 22:39:29 +00:00
|
|
|
{
|
2011-09-20 02:13:36 +00:00
|
|
|
unsigned int sec;
|
2012-08-13 20:09:40 +00:00
|
|
|
int idx;
|
2011-09-19 22:39:29 +00:00
|
|
|
char buffer[16];
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DURATION, &sec, -1);
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0)
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
else
|
|
|
|
snprintf(buffer, sizeof(buffer), "%d:%02d", sec / 60, sec % 60);
|
2011-09-19 22:39:29 +00:00
|
|
|
|
2011-09-20 02:13:36 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
2011-09-19 22:52:42 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 02:13:36 +00:00
|
|
|
static void temperature_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
2011-09-19 20:32:10 +00:00
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int value, idx;
|
2011-09-19 20:32:10 +00:00
|
|
|
char buffer[80];
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_TEMPERATURE, &value, -1);
|
2011-09-20 02:13:36 +00:00
|
|
|
|
|
|
|
*buffer = 0;
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx >= 0 && value) {
|
2011-09-19 20:32:10 +00:00
|
|
|
double deg;
|
|
|
|
switch (output_units.temperature) {
|
|
|
|
case CELSIUS:
|
|
|
|
deg = mkelvin_to_C(value);
|
|
|
|
break;
|
|
|
|
case FAHRENHEIT:
|
|
|
|
deg = mkelvin_to_F(value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
snprintf(buffer, sizeof(buffer), "%.1f", deg);
|
|
|
|
}
|
2011-09-20 02:13:36 +00:00
|
|
|
|
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
2011-09-19 20:32:10 +00:00
|
|
|
}
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
static void nr_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
int idx, nr;
|
|
|
|
char buffer[40];
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_NR, &nr, -1);
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0)
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
else
|
|
|
|
snprintf(buffer, sizeof(buffer), "%d", nr);
|
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
|
|
|
}
|
|
|
|
|
2011-12-12 05:28:18 +00:00
|
|
|
/*
|
|
|
|
* Get "maximal" dive gas for a dive.
|
|
|
|
* Rules:
|
|
|
|
* - Trimix trumps nitrox (highest He wins, O2 breaks ties)
|
|
|
|
* - Nitrox trumps air (even if hypoxic)
|
|
|
|
* These are the same rules as the inter-dive sorting rules.
|
|
|
|
*/
|
2012-01-05 16:16:08 +00:00
|
|
|
static void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p)
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
{
|
|
|
|
int i;
|
2011-12-12 17:20:22 +00:00
|
|
|
int maxo2 = -1, maxhe = -1, mino2 = 1000;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-12-12 17:20:22 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
|
|
|
struct gasmix *mix = &cyl->gasmix;
|
2011-12-12 05:28:18 +00:00
|
|
|
int o2 = mix->o2.permille;
|
|
|
|
int he = mix->he.permille;
|
|
|
|
|
2011-12-12 17:20:22 +00:00
|
|
|
if (cylinder_none(cyl))
|
|
|
|
continue;
|
|
|
|
if (!o2)
|
2011-12-31 16:15:59 +00:00
|
|
|
o2 = AIR_PERMILLE;
|
2011-12-12 17:20:22 +00:00
|
|
|
if (o2 < mino2)
|
|
|
|
mino2 = o2;
|
2011-12-12 05:28:18 +00:00
|
|
|
if (he > maxhe)
|
|
|
|
goto newmax;
|
|
|
|
if (he < maxhe)
|
|
|
|
continue;
|
|
|
|
if (o2 <= maxo2)
|
|
|
|
continue;
|
|
|
|
newmax:
|
|
|
|
maxhe = he;
|
|
|
|
maxo2 = o2;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
}
|
2011-12-12 17:20:22 +00:00
|
|
|
/* All air? Show/sort as "air"/zero */
|
2011-12-31 16:15:59 +00:00
|
|
|
if (!maxhe && maxo2 == AIR_PERMILLE && mino2 == maxo2)
|
2011-12-12 17:20:22 +00:00
|
|
|
maxo2 = mino2 = 0;
|
2012-01-05 16:16:08 +00:00
|
|
|
*o2_p = maxo2;
|
|
|
|
*he_p = maxhe;
|
|
|
|
*o2low_p = mino2;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
2012-08-07 18:24:40 +00:00
|
|
|
static int total_weight(struct dive *dive)
|
|
|
|
{
|
|
|
|
int i, total_grams = 0;
|
|
|
|
|
|
|
|
if (dive)
|
|
|
|
for (i=0; i< MAX_WEIGHTSYSTEMS; i++)
|
|
|
|
total_grams += dive->weightsystem[i].weight.grams;
|
|
|
|
return total_grams;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void weight_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
int indx, decimals;
|
|
|
|
double value;
|
|
|
|
char buffer[80];
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &indx, -1);
|
|
|
|
dive = get_dive(indx);
|
|
|
|
value = get_weight_units(total_weight(dive), &decimals, NULL);
|
2012-08-10 20:43:16 +00:00
|
|
|
if (value == 0.0)
|
|
|
|
*buffer = '\0';
|
|
|
|
else
|
|
|
|
snprintf(buffer, sizeof(buffer), "%.*f", decimals, value);
|
2012-08-07 18:24:40 +00:00
|
|
|
|
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
|
|
|
}
|
|
|
|
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
static gint nitrox_sort_func(GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter_a,
|
|
|
|
GtkTreeIter *iter_b,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
int index_a, index_b;
|
|
|
|
struct dive *a, *b;
|
|
|
|
int a_o2, b_o2;
|
|
|
|
int a_he, b_he;
|
2011-12-12 17:20:22 +00:00
|
|
|
int a_o2low, b_o2low;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter_a, DIVE_INDEX, &index_a, -1);
|
|
|
|
gtk_tree_model_get(model, iter_b, DIVE_INDEX, &index_b, -1);
|
|
|
|
a = get_dive(index_a);
|
|
|
|
b = get_dive(index_b);
|
2011-12-12 17:20:22 +00:00
|
|
|
get_dive_gas(a, &a_o2, &a_he, &a_o2low);
|
|
|
|
get_dive_gas(b, &b_o2, &b_he, &b_o2low);
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
|
|
|
|
/* Sort by Helium first, O2 second */
|
2011-12-12 17:20:22 +00:00
|
|
|
if (a_he == b_he) {
|
|
|
|
if (a_o2 == b_o2)
|
|
|
|
return a_o2low - b_o2low;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
return a_o2 - b_o2;
|
2011-12-12 17:20:22 +00:00
|
|
|
}
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
return a_he - b_he;
|
|
|
|
}
|
|
|
|
|
2011-12-19 02:29:32 +00:00
|
|
|
#define UTF8_ELLIPSIS "\xE2\x80\xA6"
|
|
|
|
|
2011-09-20 02:13:36 +00:00
|
|
|
static void nitrox_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
2011-09-19 20:32:10 +00:00
|
|
|
{
|
2012-08-13 20:09:40 +00:00
|
|
|
int idx, o2, he, o2low;
|
2011-09-19 20:32:10 +00:00
|
|
|
char buffer[80];
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
struct dive *dive;
|
2011-09-19 20:32:10 +00:00
|
|
|
|
2012-08-13 20:09:40 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, -1);
|
|
|
|
if (idx < 0) {
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
goto exit;
|
|
|
|
}
|
2012-08-13 20:09:40 +00:00
|
|
|
dive = get_dive(idx);
|
2011-12-12 17:20:22 +00:00
|
|
|
get_dive_gas(dive, &o2, &he, &o2low);
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
o2 = (o2 + 5) / 10;
|
|
|
|
he = (he + 5) / 10;
|
2011-12-12 17:20:22 +00:00
|
|
|
o2low = (o2low + 5) / 10;
|
2011-09-20 02:13:36 +00:00
|
|
|
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
if (he)
|
|
|
|
snprintf(buffer, sizeof(buffer), "%d/%d", o2, he);
|
|
|
|
else if (o2)
|
2011-12-12 17:20:22 +00:00
|
|
|
if (o2 == o2low)
|
|
|
|
snprintf(buffer, sizeof(buffer), "%d", o2);
|
|
|
|
else
|
2011-12-19 02:29:32 +00:00
|
|
|
snprintf(buffer, sizeof(buffer), "%d" UTF8_ELLIPSIS "%d", o2low, o2);
|
2011-09-20 02:13:36 +00:00
|
|
|
else
|
|
|
|
strcpy(buffer, "air");
|
2012-08-08 16:35:38 +00:00
|
|
|
exit:
|
2011-09-20 02:13:36 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Render the SAC data (integer value of "ml / min") */
|
|
|
|
static void sac_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int value, idx;
|
2011-09-20 02:13:36 +00:00
|
|
|
const char *fmt;
|
|
|
|
char buffer[16];
|
|
|
|
double sac;
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_SAC, &value, -1);
|
2011-09-20 02:13:36 +00:00
|
|
|
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0 || !value) {
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
goto exit;
|
2011-09-19 20:32:10 +00:00
|
|
|
}
|
2011-09-20 02:13:36 +00:00
|
|
|
|
|
|
|
sac = value / 1000.0;
|
|
|
|
switch (output_units.volume) {
|
|
|
|
case LITER:
|
2011-09-20 16:56:46 +00:00
|
|
|
fmt = "%4.1f";
|
2011-09-20 02:13:36 +00:00
|
|
|
break;
|
|
|
|
case CUFT:
|
|
|
|
fmt = "%4.2f";
|
2011-11-02 04:12:21 +00:00
|
|
|
sac = ml_to_cuft(sac * 1000);
|
2011-09-20 02:13:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
snprintf(buffer, sizeof(buffer), fmt, sac);
|
2012-08-08 16:35:38 +00:00
|
|
|
exit:
|
2011-09-20 02:13:36 +00:00
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
2011-09-19 20:32:10 +00:00
|
|
|
}
|
|
|
|
|
2011-09-22 21:02:26 +00:00
|
|
|
/* Render the OTU data (integer value of "OTU") */
|
|
|
|
static void otu_data_func(GtkTreeViewColumn *col,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int value, idx;
|
2011-09-22 21:02:26 +00:00
|
|
|
char buffer[16];
|
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_OTU, &value, -1);
|
2011-09-22 21:02:26 +00:00
|
|
|
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0 || !value)
|
2012-08-08 16:35:38 +00:00
|
|
|
*buffer = '\0';
|
|
|
|
else
|
|
|
|
snprintf(buffer, sizeof(buffer), "%d", value);
|
2011-09-22 21:02:26 +00:00
|
|
|
|
|
|
|
g_object_set(renderer, "text", buffer, NULL);
|
|
|
|
}
|
|
|
|
|
2011-09-22 20:45:53 +00:00
|
|
|
/* calculate OTU for a dive */
|
2011-09-22 21:02:26 +00:00
|
|
|
static int calculate_otu(struct dive *dive)
|
2011-09-22 20:45:53 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
double otu = 0.0;
|
|
|
|
|
|
|
|
for (i = 1; i < dive->samples; i++) {
|
|
|
|
int t;
|
|
|
|
double po2;
|
|
|
|
struct sample *sample = dive->sample + i;
|
|
|
|
struct sample *psample = sample - 1;
|
|
|
|
t = sample->time.seconds - psample->time.seconds;
|
2011-12-31 16:00:36 +00:00
|
|
|
int o2 = dive->cylinder[sample->cylinderindex].gasmix.o2.permille;
|
|
|
|
if (!o2)
|
2011-12-31 16:15:59 +00:00
|
|
|
o2 = AIR_PERMILLE;
|
2011-12-31 16:00:36 +00:00
|
|
|
po2 = o2 / 1000.0 * (sample->depth.mm + 10000) / 10000.0;
|
2011-09-22 20:45:53 +00:00
|
|
|
if (po2 >= 0.5)
|
|
|
|
otu += pow(po2 - 0.5, 0.83) * t / 30.0;
|
|
|
|
}
|
2011-09-22 21:02:26 +00:00
|
|
|
return otu + 0.5;
|
2011-09-22 20:45:53 +00:00
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
/*
|
|
|
|
* Return air usage (in liters).
|
|
|
|
*/
|
|
|
|
static double calculate_airuse(struct dive *dive)
|
|
|
|
{
|
|
|
|
double airuse = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-11-09 15:51:00 +00:00
|
|
|
pressure_t start, end;
|
2011-09-19 23:11:38 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
|
|
|
int size = cyl->type.size.mliter;
|
|
|
|
double kilo_atm;
|
|
|
|
|
|
|
|
if (!size)
|
|
|
|
continue;
|
|
|
|
|
2011-11-09 15:51:00 +00:00
|
|
|
start = cyl->start.mbar ? cyl->start : cyl->sample_start;
|
|
|
|
end = cyl->end.mbar ? cyl->end : cyl->sample_end;
|
|
|
|
kilo_atm = (to_ATM(start) - to_ATM(end)) / 1000.0;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
|
|
|
/* Liters of air at 1 atm == milliliters at 1k atm*/
|
|
|
|
airuse += kilo_atm * size;
|
|
|
|
}
|
|
|
|
return airuse;
|
|
|
|
}
|
|
|
|
|
2011-11-02 02:56:14 +00:00
|
|
|
static int calculate_sac(struct dive *dive)
|
2011-09-19 20:32:10 +00:00
|
|
|
{
|
2011-09-19 23:11:38 +00:00
|
|
|
double airuse, pressure, sac;
|
2011-11-21 21:23:13 +00:00
|
|
|
int duration, i;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
|
|
|
airuse = calculate_airuse(dive);
|
|
|
|
if (!airuse)
|
2011-11-02 02:56:14 +00:00
|
|
|
return 0;
|
2011-09-19 23:11:38 +00:00
|
|
|
if (!dive->duration.seconds)
|
2011-11-02 02:56:14 +00:00
|
|
|
return 0;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2011-11-21 21:23:13 +00:00
|
|
|
/* find and eliminate long surface intervals */
|
|
|
|
duration = dive->duration.seconds;
|
|
|
|
for (i = 0; i < dive->samples; i++) {
|
|
|
|
if (dive->sample[i].depth.mm < 100) { /* less than 10cm */
|
|
|
|
int end = i + 1;
|
|
|
|
while (end < dive->samples && dive->sample[end].depth.mm < 100)
|
|
|
|
end++;
|
|
|
|
/* we only want the actual surface time during a dive */
|
|
|
|
if (end < dive->samples) {
|
|
|
|
end--;
|
|
|
|
duration -= dive->sample[end].time.seconds -
|
|
|
|
dive->sample[i].time.seconds;
|
|
|
|
i = end + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
/* Mean pressure in atm: 1 atm per 10m */
|
|
|
|
pressure = 1 + (dive->meandepth.mm / 10000.0);
|
2011-11-21 21:23:13 +00:00
|
|
|
sac = airuse / pressure * 60 / duration;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
|
|
|
/* milliliters per minute.. */
|
2011-11-02 02:56:14 +00:00
|
|
|
return sac * 1000;
|
2011-09-20 02:13:36 +00:00
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2011-11-13 17:29:07 +00:00
|
|
|
void update_cylinder_related_info(struct dive *dive)
|
|
|
|
{
|
2011-11-13 17:51:34 +00:00
|
|
|
if (dive != NULL) {
|
2011-11-13 17:29:07 +00:00
|
|
|
dive->sac = calculate_sac(dive);
|
|
|
|
dive->otu = calculate_otu(dive);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-20 03:06:54 +00:00
|
|
|
static void get_string(char **str, const char *s)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
char *n;
|
|
|
|
|
|
|
|
if (!s)
|
|
|
|
s = "";
|
|
|
|
len = strlen(s);
|
2011-11-16 18:29:38 +00:00
|
|
|
if (len > 60)
|
|
|
|
len = 60;
|
2011-09-20 03:06:54 +00:00
|
|
|
n = malloc(len+1);
|
|
|
|
memcpy(n, s, len);
|
|
|
|
n[len] = 0;
|
|
|
|
*str = n;
|
|
|
|
}
|
|
|
|
|
2011-09-20 02:13:36 +00:00
|
|
|
static void get_location(struct dive *dive, char **str)
|
|
|
|
{
|
2011-09-20 03:06:54 +00:00
|
|
|
get_string(str, dive->location);
|
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2011-09-20 03:06:54 +00:00
|
|
|
static void get_cylinder(struct dive *dive, char **str)
|
|
|
|
{
|
|
|
|
get_string(str, dive->cylinder[0].type.description);
|
2011-09-19 20:32:10 +00:00
|
|
|
}
|
|
|
|
|
2012-08-14 23:07:25 +00:00
|
|
|
static void get_suit(struct dive *dive, char **str)
|
|
|
|
{
|
|
|
|
get_string(str, dive->suit);
|
|
|
|
}
|
|
|
|
|
2011-12-11 20:18:10 +00:00
|
|
|
/*
|
|
|
|
* Set up anything that could have changed due to editing
|
2012-08-13 21:42:55 +00:00
|
|
|
* of dive information; we need to do this for both models,
|
|
|
|
* so we simply call set_one_dive again with the non-current model
|
2011-12-11 20:18:10 +00:00
|
|
|
*/
|
2012-08-13 21:42:55 +00:00
|
|
|
/* forward declaration for recursion */
|
|
|
|
static gboolean set_one_dive(GtkTreeModel *model,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data);
|
|
|
|
|
2011-09-19 23:41:56 +00:00
|
|
|
static void fill_one_dive(struct dive *dive,
|
|
|
|
GtkTreeModel *model,
|
|
|
|
GtkTreeIter *iter)
|
2011-09-07 19:01:37 +00:00
|
|
|
{
|
2012-08-14 23:07:25 +00:00
|
|
|
char *location, *cylinder, *suit;
|
2012-08-13 21:42:55 +00:00
|
|
|
GtkTreeStore *othermodel;
|
2011-09-07 19:01:37 +00:00
|
|
|
|
2011-09-20 03:06:54 +00:00
|
|
|
get_cylinder(dive, &cylinder);
|
2011-09-19 22:52:42 +00:00
|
|
|
get_location(dive, &location);
|
2012-08-14 23:07:25 +00:00
|
|
|
get_suit(dive, &suit);
|
2011-09-19 20:32:10 +00:00
|
|
|
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_store_set(GTK_TREE_STORE(model), iter,
|
2011-10-23 15:50:14 +00:00
|
|
|
DIVE_NR, dive->number,
|
2011-09-19 22:52:42 +00:00
|
|
|
DIVE_LOCATION, location,
|
2011-09-20 03:06:54 +00:00
|
|
|
DIVE_CYLINDER, cylinder,
|
2011-12-07 19:58:16 +00:00
|
|
|
DIVE_RATING, dive->rating,
|
2011-11-02 02:56:14 +00:00
|
|
|
DIVE_SAC, dive->sac,
|
2011-09-22 21:02:26 +00:00
|
|
|
DIVE_OTU, dive->otu,
|
2012-08-07 18:24:40 +00:00
|
|
|
DIVE_TOTALWEIGHT, total_weight(dive),
|
2012-08-14 23:07:25 +00:00
|
|
|
DIVE_SUIT, suit,
|
2011-09-07 19:01:37 +00:00
|
|
|
-1);
|
2012-08-01 19:19:44 +00:00
|
|
|
|
|
|
|
free(location);
|
|
|
|
free(cylinder);
|
2012-08-14 23:07:25 +00:00
|
|
|
free(suit);
|
2012-08-16 17:46:30 +00:00
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
if (model == GTK_TREE_MODEL(dive_list.treemodel))
|
|
|
|
othermodel = dive_list.listmodel;
|
|
|
|
else
|
|
|
|
othermodel = dive_list.treemodel;
|
|
|
|
if (othermodel != dive_list.model)
|
|
|
|
/* recursive call */
|
|
|
|
gtk_tree_model_foreach(GTK_TREE_MODEL(othermodel), set_one_dive, dive);
|
2011-09-19 23:41:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean set_one_dive(GtkTreeModel *model,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2012-08-08 16:35:38 +00:00
|
|
|
int idx;
|
2011-09-19 23:41:56 +00:00
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
/* Get the dive number */
|
2012-08-08 16:35:38 +00:00
|
|
|
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, -1);
|
2012-08-13 20:09:40 +00:00
|
|
|
if (idx < 0)
|
|
|
|
return FALSE;
|
2012-08-08 16:35:38 +00:00
|
|
|
dive = get_dive(idx);
|
2011-09-19 23:41:56 +00:00
|
|
|
if (!dive)
|
|
|
|
return TRUE;
|
|
|
|
if (data && dive != data)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
fill_one_dive(dive, model, iter);
|
|
|
|
return dive == data;
|
|
|
|
}
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
void flush_divelist(struct dive *dive)
|
2011-09-19 23:41:56 +00:00
|
|
|
{
|
2011-09-20 17:06:24 +00:00
|
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
|
2011-09-07 19:01:37 +00:00
|
|
|
|
2011-09-19 23:41:56 +00:00
|
|
|
gtk_tree_model_foreach(model, set_one_dive, dive);
|
2011-09-07 19:01:37 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 18:24:15 +00:00
|
|
|
void set_divelist_font(const char *font)
|
|
|
|
{
|
|
|
|
PangoFontDescription *font_desc = pango_font_description_from_string(font);
|
|
|
|
gtk_widget_modify_font(dive_list.tree_view, font_desc);
|
|
|
|
pango_font_description_free(font_desc);
|
|
|
|
}
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
void update_dive_list_units(void)
|
2011-08-31 17:46:28 +00:00
|
|
|
{
|
2011-09-07 15:56:47 +00:00
|
|
|
const char *unit;
|
2011-09-20 17:06:24 +00:00
|
|
|
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
|
2011-09-07 15:56:47 +00:00
|
|
|
|
2011-11-02 03:13:14 +00:00
|
|
|
(void) get_depth_units(0, NULL, &unit);
|
2011-09-20 17:06:24 +00:00
|
|
|
gtk_tree_view_column_set_title(dive_list.depth, unit);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-11-02 03:13:14 +00:00
|
|
|
(void) get_temp_units(0, &unit);
|
2011-09-20 17:08:27 +00:00
|
|
|
gtk_tree_view_column_set_title(dive_list.temperature, unit);
|
2011-09-20 16:56:46 +00:00
|
|
|
|
2012-08-07 18:24:40 +00:00
|
|
|
(void) get_weight_units(0, NULL, &unit);
|
|
|
|
gtk_tree_view_column_set_title(dive_list.totalweight, unit);
|
|
|
|
|
2011-09-07 19:01:37 +00:00
|
|
|
gtk_tree_model_foreach(model, set_one_dive, NULL);
|
|
|
|
}
|
|
|
|
|
2011-09-27 17:16:40 +00:00
|
|
|
void update_dive_list_col_visibility(void)
|
|
|
|
{
|
2011-10-23 20:36:37 +00:00
|
|
|
gtk_tree_view_column_set_visible(dive_list.cylinder, visible_cols.cylinder);
|
|
|
|
gtk_tree_view_column_set_visible(dive_list.temperature, visible_cols.temperature);
|
2012-08-07 18:24:40 +00:00
|
|
|
gtk_tree_view_column_set_visible(dive_list.totalweight, visible_cols.totalweight);
|
2012-08-14 23:07:25 +00:00
|
|
|
gtk_tree_view_column_set_visible(dive_list.suit, visible_cols.suit);
|
2011-10-23 20:36:37 +00:00
|
|
|
gtk_tree_view_column_set_visible(dive_list.nitrox, visible_cols.nitrox);
|
2011-10-02 20:05:12 +00:00
|
|
|
gtk_tree_view_column_set_visible(dive_list.sac, visible_cols.sac);
|
|
|
|
gtk_tree_view_column_set_visible(dive_list.otu, visible_cols.otu);
|
|
|
|
return;
|
2011-09-27 17:16:40 +00:00
|
|
|
}
|
|
|
|
|
2012-08-16 11:27:03 +00:00
|
|
|
/* 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)
|
2012-08-08 16:35:38 +00:00
|
|
|
{
|
|
|
|
if (!last_dive)
|
|
|
|
return TRUE;
|
2012-08-13 20:09:40 +00:00
|
|
|
if (*last_dive) {
|
2012-08-08 16:35:38 +00:00
|
|
|
struct dive *ldive = *last_dive;
|
2012-08-16 11:27:03 +00:00
|
|
|
if (abs(dive->when - ldive->when) < TRIP_THRESHOLD) {
|
|
|
|
*last_dive = dive;
|
2012-08-13 20:09:40 +00:00
|
|
|
return FALSE;
|
2012-08-16 11:27:03 +00:00
|
|
|
}
|
2012-08-08 16:35:38 +00:00
|
|
|
}
|
2012-08-16 11:27:03 +00:00
|
|
|
*last_dive = dive;
|
2012-08-13 20:09:40 +00:00
|
|
|
if (tm_date) {
|
|
|
|
struct tm *tm1 = gmtime(&dive->when);
|
|
|
|
tm1->tm_sec = 0;
|
|
|
|
tm1->tm_min = 0;
|
|
|
|
tm1->tm_hour = 0;
|
|
|
|
*tm_date = mktime(tm1);
|
|
|
|
}
|
|
|
|
return TRUE;
|
2012-08-08 16:35:38 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
static void fill_dive_list(void)
|
2011-09-07 19:01:37 +00:00
|
|
|
{
|
2012-08-18 18:41:11 +00:00
|
|
|
int i, group_size;
|
2012-08-16 11:27:03 +00:00
|
|
|
GtkTreeIter iter, parent_iter;
|
2012-08-13 21:42:55 +00:00
|
|
|
GtkTreeStore *liststore, *treestore;
|
2012-08-08 16:35:38 +00:00
|
|
|
struct dive *last_dive = NULL;
|
2012-08-16 11:27:03 +00:00
|
|
|
struct dive *last_trip_dive = NULL;
|
2012-08-18 18:41:11 +00:00
|
|
|
const char *last_location = NULL;
|
2012-08-08 16:35:38 +00:00
|
|
|
time_t dive_date;
|
2011-09-07 19:01:37 +00:00
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
treestore = GTK_TREE_STORE(dive_list.treemodel);
|
|
|
|
liststore = GTK_TREE_STORE(dive_list.listmodel);
|
2011-09-07 19:01:37 +00:00
|
|
|
|
2011-11-16 18:30:34 +00:00
|
|
|
i = dive_table.nr;
|
|
|
|
while (--i >= 0) {
|
2011-08-31 17:27:58 +00:00
|
|
|
struct dive *dive = dive_table.dives[i];
|
|
|
|
|
2012-08-16 11:27:03 +00:00
|
|
|
if (new_group(dive, &last_dive, &dive_date))
|
|
|
|
{
|
|
|
|
/* make sure we display the first date of the trip in previous summary */
|
2012-08-18 18:41:11 +00:00
|
|
|
if (last_trip_dive)
|
2012-08-16 11:27:03 +00:00
|
|
|
gtk_tree_store_set(treestore, &parent_iter,
|
2012-08-18 18:41:11 +00:00
|
|
|
DIVE_NR, group_size,
|
|
|
|
DIVE_DATE, last_trip_dive->when,
|
|
|
|
DIVE_LOCATION, last_location,
|
|
|
|
-1);
|
2012-08-16 11:27:03 +00:00
|
|
|
|
|
|
|
gtk_tree_store_append(treestore, &parent_iter, NULL);
|
|
|
|
gtk_tree_store_set(treestore, &parent_iter,
|
|
|
|
DIVE_INDEX, -NEW_TRIP,
|
2012-08-18 18:41:11 +00:00
|
|
|
DIVE_NR, 1,
|
2012-08-16 11:27:03 +00:00
|
|
|
DIVE_TEMPERATURE, 0,
|
|
|
|
DIVE_SAC, 0,
|
|
|
|
-1);
|
2012-08-18 18:41:11 +00:00
|
|
|
|
|
|
|
group_size = 0;
|
|
|
|
/* This might be NULL */
|
|
|
|
last_location = dive->location;
|
2012-08-08 16:35:38 +00:00
|
|
|
}
|
2012-08-18 18:41:11 +00:00
|
|
|
group_size++;
|
2012-08-16 11:27:03 +00:00
|
|
|
last_trip_dive = dive;
|
2012-08-18 18:41:11 +00:00
|
|
|
if (dive->location)
|
|
|
|
last_location = dive->location;
|
2011-11-13 17:29:07 +00:00
|
|
|
update_cylinder_related_info(dive);
|
2012-08-16 11:27:03 +00:00
|
|
|
gtk_tree_store_append(treestore, &iter, &parent_iter);
|
2012-08-13 21:42:55 +00:00
|
|
|
gtk_tree_store_set(treestore, &iter,
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_INDEX, i,
|
2011-10-23 15:50:14 +00:00
|
|
|
DIVE_NR, dive->number,
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_DATE, dive->when,
|
|
|
|
DIVE_DEPTH, dive->maxdepth,
|
|
|
|
DIVE_DURATION, dive->duration.seconds,
|
2012-08-13 21:42:55 +00:00
|
|
|
DIVE_LOCATION, dive->location,
|
|
|
|
DIVE_RATING, dive->rating,
|
|
|
|
DIVE_TEMPERATURE, dive->watertemp.mkelvin,
|
|
|
|
DIVE_SAC, 0,
|
|
|
|
-1);
|
|
|
|
gtk_tree_store_append(liststore, &iter, NULL);
|
|
|
|
gtk_tree_store_set(liststore, &iter,
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_INDEX, i,
|
2011-10-23 15:50:14 +00:00
|
|
|
DIVE_NR, dive->number,
|
2011-09-19 19:25:16 +00:00
|
|
|
DIVE_DATE, dive->when,
|
|
|
|
DIVE_DEPTH, dive->maxdepth,
|
|
|
|
DIVE_DURATION, dive->duration.seconds,
|
2012-08-08 16:35:38 +00:00
|
|
|
DIVE_LOCATION, dive->location,
|
|
|
|
DIVE_RATING, dive->rating,
|
2011-09-20 02:13:36 +00:00
|
|
|
DIVE_TEMPERATURE, dive->watertemp.mkelvin,
|
2012-08-07 18:24:40 +00:00
|
|
|
DIVE_TOTALWEIGHT, 0,
|
2012-08-14 23:07:25 +00:00
|
|
|
DIVE_SUIT, dive->suit,
|
2011-09-19 20:32:10 +00:00
|
|
|
DIVE_SAC, 0,
|
2011-08-31 17:27:58 +00:00
|
|
|
-1);
|
|
|
|
}
|
2011-09-07 19:01:37 +00:00
|
|
|
|
2012-08-18 18:41:11 +00:00
|
|
|
/* make sure we display the first date of the trip in previous summary */
|
|
|
|
if (last_trip_dive)
|
|
|
|
gtk_tree_store_set(treestore, &parent_iter,
|
|
|
|
DIVE_NR, group_size,
|
|
|
|
DIVE_DATE, last_trip_dive->when,
|
|
|
|
DIVE_LOCATION, last_location,
|
|
|
|
-1);
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
update_dive_list_units();
|
2011-09-22 15:19:34 +00:00
|
|
|
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dive_list.model), &iter)) {
|
|
|
|
GtkTreeSelection *selection;
|
2012-08-13 22:07:38 +00:00
|
|
|
|
2012-08-14 04:11:09 +00:00
|
|
|
/* select the last dive (and make sure it's an actual dive that is selected) */
|
2012-08-13 22:07:38 +00:00
|
|
|
gtk_tree_model_get(GTK_TREE_MODEL(dive_list.model), &iter, DIVE_INDEX, &selected_dive, -1);
|
|
|
|
first_leaf(GTK_TREE_MODEL(dive_list.model), &iter, &selected_dive);
|
2011-09-22 15:19:34 +00:00
|
|
|
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
|
|
|
|
gtk_tree_selection_select_iter(selection, &iter);
|
|
|
|
}
|
2011-08-31 17:27:58 +00:00
|
|
|
}
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
void dive_list_update_dives(void)
|
2011-08-31 17:27:58 +00:00
|
|
|
{
|
2012-08-13 21:42:55 +00:00
|
|
|
gtk_tree_store_clear(GTK_TREE_STORE(dive_list.treemodel));
|
|
|
|
gtk_tree_store_clear(GTK_TREE_STORE(dive_list.listmodel));
|
2011-09-20 17:06:24 +00:00
|
|
|
fill_dive_list();
|
2011-09-06 03:50:52 +00:00
|
|
|
repaint_dive();
|
2011-09-05 19:12:58 +00:00
|
|
|
}
|
|
|
|
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
static struct divelist_column {
|
|
|
|
const char *header;
|
|
|
|
data_func_t data;
|
|
|
|
sort_func_t sort;
|
|
|
|
unsigned int flags;
|
|
|
|
int *visible;
|
2012-01-05 16:16:08 +00:00
|
|
|
} dl_column[] = {
|
2012-08-08 16:35:38 +00:00
|
|
|
[DIVE_NR] = { "#", nr_data_func, NULL, ALIGN_RIGHT | UNSORTABLE },
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
[DIVE_DATE] = { "Date", date_data_func, NULL, ALIGN_LEFT },
|
|
|
|
[DIVE_RATING] = { UTF8_BLACKSTAR, star_data_func, NULL, ALIGN_LEFT },
|
|
|
|
[DIVE_DEPTH] = { "ft", depth_data_func, NULL, ALIGN_RIGHT },
|
|
|
|
[DIVE_DURATION] = { "min", duration_data_func, NULL, ALIGN_RIGHT },
|
|
|
|
[DIVE_TEMPERATURE] = { UTF8_DEGREE "F", temperature_data_func, NULL, ALIGN_RIGHT, &visible_cols.temperature },
|
2012-08-07 18:24:40 +00:00
|
|
|
[DIVE_TOTALWEIGHT] = { "lbs", weight_data_func, NULL, ALIGN_RIGHT, &visible_cols.totalweight },
|
2012-08-14 23:07:25 +00:00
|
|
|
[DIVE_SUIT] = { "Suit", NULL, NULL, ALIGN_LEFT, &visible_cols.suit },
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
[DIVE_CYLINDER] = { "Cyl", NULL, NULL, 0, &visible_cols.cylinder },
|
|
|
|
[DIVE_NITROX] = { "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, nitrox_sort_func, 0, &visible_cols.nitrox },
|
|
|
|
[DIVE_SAC] = { "SAC", sac_data_func, NULL, 0, &visible_cols.sac },
|
|
|
|
[DIVE_OTU] = { "OTU", otu_data_func, NULL, 0, &visible_cols.otu },
|
|
|
|
[DIVE_LOCATION] = { "Location", NULL, NULL, ALIGN_LEFT },
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static GtkTreeViewColumn *divelist_column(struct DiveList *dl, struct divelist_column *col)
|
2011-09-20 04:39:15 +00:00
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
int index = col - &dl_column[0];
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
const char *title = col->header;
|
|
|
|
data_func_t data_func = col->data;
|
|
|
|
sort_func_t sort_func = col->sort;
|
|
|
|
unsigned int flags = col->flags;
|
|
|
|
int *visible = col->visible;
|
|
|
|
GtkWidget *tree_view = dl->tree_view;
|
2012-08-13 22:07:38 +00:00
|
|
|
GtkTreeStore *treemodel = dl->treemodel;
|
|
|
|
GtkTreeStore *listmodel = dl->listmodel;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
GtkTreeViewColumn *ret;
|
|
|
|
|
|
|
|
if (visible && !*visible)
|
2011-12-11 19:40:17 +00:00
|
|
|
flags |= INVISIBLE;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
ret = tree_view_column(tree_view, index, title, data_func, flags);
|
2012-08-13 22:07:38 +00:00
|
|
|
if (sort_func) {
|
|
|
|
/* the sort functions are needed in the corresponding models */
|
|
|
|
if (index == DIVE_DATE)
|
|
|
|
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(treemodel), index, sort_func, NULL, NULL);
|
|
|
|
else
|
|
|
|
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(listmodel), index, sort_func, NULL, NULL);
|
|
|
|
}
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
return ret;
|
2011-09-20 04:39:15 +00:00
|
|
|
}
|
|
|
|
|
2011-09-22 17:28:57 +00:00
|
|
|
/*
|
|
|
|
* This is some crazy crap. The only way to get default focus seems
|
|
|
|
* to be to grab focus as the widget is being shown the first time.
|
|
|
|
*/
|
|
|
|
static void realize_cb(GtkWidget *tree_view, gpointer userdata)
|
|
|
|
{
|
|
|
|
gtk_widget_grab_focus(tree_view);
|
|
|
|
}
|
|
|
|
|
2012-08-18 18:41:11 +00:00
|
|
|
/*
|
|
|
|
* Double-clicking on a group entry will expand a collapsed group
|
|
|
|
* and vice versa.
|
|
|
|
*/
|
|
|
|
static void collapse_expand(GtkTreeView *tree_view, GtkTreePath *path)
|
|
|
|
{
|
|
|
|
if (!gtk_tree_view_row_expanded(tree_view, path))
|
|
|
|
gtk_tree_view_expand_row(tree_view, path, FALSE);
|
|
|
|
else
|
|
|
|
gtk_tree_view_collapse_row(tree_view, path);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Double-click on a dive list */
|
2011-11-19 15:11:56 +00:00
|
|
|
static void row_activated_cb(GtkTreeView *tree_view,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkTreeViewColumn *column,
|
2012-08-13 21:42:55 +00:00
|
|
|
gpointer userdata)
|
2011-11-19 15:11:56 +00:00
|
|
|
{
|
|
|
|
int index;
|
|
|
|
GtkTreeIter iter;
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(dive_list.model), &iter, path))
|
2011-11-19 15:11:56 +00:00
|
|
|
return;
|
2012-08-18 18:41:11 +00:00
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
gtk_tree_model_get(GTK_TREE_MODEL(dive_list.model), &iter, DIVE_INDEX, &index, -1);
|
2012-08-13 20:09:40 +00:00
|
|
|
/* a negative index is special for the "group by date" entries */
|
2012-08-18 18:41:11 +00:00
|
|
|
if (index < 0) {
|
|
|
|
collapse_expand(tree_view, path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
edit_dive_info(get_dive(index));
|
2011-11-19 15:11:56 +00:00
|
|
|
}
|
|
|
|
|
2012-06-28 01:09:26 +00:00
|
|
|
void add_dive_cb(GtkWidget *menuitem, gpointer data)
|
2012-06-27 20:11:54 +00:00
|
|
|
{
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
dive = alloc_dive();
|
|
|
|
if (add_new_dive(dive)) {
|
|
|
|
record_dive(dive);
|
|
|
|
report_dives(TRUE);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
free(dive);
|
|
|
|
}
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
void edit_dive_cb(GtkWidget *menuitem, gpointer data)
|
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
edit_multi_dive_info(-1);
|
2012-08-15 22:21:34 +00:00
|
|
|
}
|
|
|
|
|
2012-08-19 03:06:04 +00:00
|
|
|
static void expand_all_cb(GtkWidget *menuitem, GtkTreeView *tree_view)
|
|
|
|
{
|
|
|
|
gtk_tree_view_expand_all(tree_view);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void collapse_all_cb(GtkWidget *menuitem, GtkTreeView *tree_view)
|
|
|
|
{
|
|
|
|
gtk_tree_view_collapse_all(tree_view);
|
|
|
|
}
|
|
|
|
|
2012-06-27 20:11:54 +00:00
|
|
|
static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int button)
|
|
|
|
{
|
2012-07-29 10:15:04 +00:00
|
|
|
GtkWidget *menu, *menuitem, *image;
|
2012-08-15 22:21:34 +00:00
|
|
|
char editlabel[] = "Edit dives";
|
2012-06-27 20:11:54 +00:00
|
|
|
|
|
|
|
menu = gtk_menu_new();
|
2012-07-29 10:15:04 +00:00
|
|
|
menuitem = gtk_image_menu_item_new_with_label("Add dive");
|
|
|
|
image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
|
|
|
|
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
|
2012-08-13 21:42:55 +00:00
|
|
|
g_signal_connect(menuitem, "activate", G_CALLBACK(add_dive_cb), NULL);
|
2012-06-27 20:11:54 +00:00
|
|
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
2012-08-15 22:21:34 +00:00
|
|
|
if (amount_selected) {
|
|
|
|
if (amount_selected == 1)
|
|
|
|
editlabel[strlen(editlabel) - 1] = '\0';
|
|
|
|
menuitem = gtk_menu_item_new_with_label(editlabel);
|
|
|
|
g_signal_connect(menuitem, "activate", G_CALLBACK(edit_dive_cb), model);
|
|
|
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
|
|
|
}
|
2012-08-19 03:06:04 +00:00
|
|
|
menuitem = gtk_menu_item_new_with_label("Expand all");
|
|
|
|
g_signal_connect(menuitem, "activate", G_CALLBACK(expand_all_cb), tree_view);
|
|
|
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
|
|
|
menuitem = gtk_menu_item_new_with_label("Collapse all");
|
|
|
|
g_signal_connect(menuitem, "activate", G_CALLBACK(collapse_all_cb), tree_view);
|
|
|
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
|
2012-06-27 20:11:54 +00:00
|
|
|
gtk_widget_show_all(menu);
|
|
|
|
|
|
|
|
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
|
|
|
|
button, gtk_get_current_event_time());
|
|
|
|
}
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
static void popup_menu_cb(GtkTreeView *tree_view, gpointer userdata)
|
2012-06-27 20:11:54 +00:00
|
|
|
{
|
2012-08-13 21:42:55 +00:00
|
|
|
popup_divelist_menu(tree_view, GTK_TREE_MODEL(dive_list.model), 0);
|
2012-06-27 20:11:54 +00:00
|
|
|
}
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
static gboolean button_press_cb(GtkWidget *treeview, GdkEventButton *event, gpointer userdata)
|
2012-06-27 20:11:54 +00:00
|
|
|
{
|
|
|
|
/* Right-click? Bring up the menu */
|
|
|
|
if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
|
2012-08-13 21:42:55 +00:00
|
|
|
popup_divelist_menu(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(dive_list.model), 3);
|
2012-06-27 20:11:54 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2012-08-13 21:53:07 +00:00
|
|
|
/* we need to have a temporary copy of the selected dives while
|
|
|
|
switching model as the selection_cb function keeps getting called
|
2012-08-13 22:07:38 +00:00
|
|
|
when gtk_tree_selection_select_path is called. We also need to
|
|
|
|
keep copies of the sort order so we can restore that as well after
|
|
|
|
switching models. */
|
|
|
|
static gboolean second_call = FALSE;
|
|
|
|
static GtkSortType sortorder[] = { [0 ... DIVELIST_COLUMNS - 1] = GTK_SORT_DESCENDING, };
|
|
|
|
static int lastcol = DIVE_DATE;
|
2012-08-13 21:53:07 +00:00
|
|
|
|
|
|
|
/* Check if this dive was selected previously and select it again in the new model;
|
|
|
|
* This is used after we switch models to maintain consistent selections.
|
|
|
|
* We always return FALSE to iterate through all dives */
|
2012-08-20 12:48:07 +00:00
|
|
|
static gboolean set_selected(GtkTreeModel *model, GtkTreePath *path,
|
2012-08-13 21:53:07 +00:00
|
|
|
GtkTreeIter *iter, gpointer data)
|
|
|
|
{
|
|
|
|
GtkTreeSelection *selection = GTK_TREE_SELECTION(data);
|
2012-08-20 12:48:07 +00:00
|
|
|
int idx, selected;
|
|
|
|
struct dive *dive;
|
2012-08-13 21:53:07 +00:00
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
gtk_tree_model_get(model, iter,
|
|
|
|
DIVE_INDEX, &idx,
|
|
|
|
-1);
|
|
|
|
if (idx < 0) {
|
|
|
|
GtkTreeIter child;
|
|
|
|
if (gtk_tree_model_iter_children(model, &child, iter))
|
|
|
|
gtk_tree_model_get(model, &child, DIVE_INDEX, &idx, -1);
|
|
|
|
}
|
|
|
|
dive = get_dive(idx);
|
|
|
|
selected = dive && dive->selected;
|
|
|
|
if (selected) {
|
|
|
|
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), path);
|
|
|
|
gtk_tree_selection_select_path(selection, path);
|
|
|
|
}
|
2012-08-13 21:53:07 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2012-08-13 22:07:38 +00:00
|
|
|
static void update_column_and_order(int colid)
|
|
|
|
{
|
|
|
|
/* Careful: the index into treecolumns is off by one as we don't have a
|
|
|
|
tree_view column for DIVE_INDEX */
|
|
|
|
GtkTreeViewColumn **treecolumns = &dive_list.nr;
|
|
|
|
|
|
|
|
/* this will trigger a second call into sort_column_change_cb,
|
|
|
|
so make sure we don't start an infinite recursion... */
|
|
|
|
second_call = TRUE;
|
|
|
|
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(dive_list.model), colid, sortorder[colid]);
|
|
|
|
gtk_tree_view_column_set_sort_order(treecolumns[colid - 1], sortorder[colid]);
|
|
|
|
second_call = FALSE;
|
|
|
|
}
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
/* If the sort column is date (default), show the tree model.
|
|
|
|
For every other sort column only show the list model.
|
2012-08-13 21:53:07 +00:00
|
|
|
If the model changed, inform the new model of the chosen sort column and make
|
2012-08-13 22:07:38 +00:00
|
|
|
sure the same dives are still selected.
|
|
|
|
|
|
|
|
The challenge with this function is that once we change the model
|
|
|
|
we also need to change the sort column again (as it was changed in
|
|
|
|
the other model) and that causes this function to be called
|
|
|
|
recursively - so we need to catch that.
|
|
|
|
*/
|
2012-08-13 21:42:55 +00:00
|
|
|
static void sort_column_change_cb(GtkTreeSortable *treeview, gpointer data)
|
|
|
|
{
|
|
|
|
int colid;
|
|
|
|
GtkSortType order;
|
|
|
|
GtkTreeStore *currentmodel = dive_list.model;
|
|
|
|
|
2012-08-13 22:07:38 +00:00
|
|
|
if (second_call)
|
|
|
|
return;
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
gtk_tree_sortable_get_sort_column_id(treeview, &colid, &order);
|
2012-08-13 22:07:38 +00:00
|
|
|
if(colid == lastcol) {
|
|
|
|
/* we just changed sort order */
|
|
|
|
sortorder[colid] = order;
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
lastcol = colid;
|
|
|
|
}
|
2012-08-13 21:42:55 +00:00
|
|
|
if(colid == DIVE_DATE)
|
|
|
|
dive_list.model = dive_list.treemodel;
|
|
|
|
else
|
|
|
|
dive_list.model = dive_list.listmodel;
|
|
|
|
if (dive_list.model != currentmodel) {
|
2012-08-13 21:53:07 +00:00
|
|
|
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
gtk_tree_view_set_model(GTK_TREE_VIEW(dive_list.tree_view), GTK_TREE_MODEL(dive_list.model));
|
2012-08-13 22:07:38 +00:00
|
|
|
update_column_and_order(colid);
|
2012-08-20 12:48:07 +00:00
|
|
|
gtk_tree_model_foreach(GTK_TREE_MODEL(dive_list.model), set_selected, selection);
|
2012-08-13 22:07:38 +00:00
|
|
|
} else {
|
|
|
|
if (order != sortorder[colid]) {
|
|
|
|
update_column_and_order(colid);
|
|
|
|
}
|
2012-08-13 21:42:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
GtkWidget *dive_list_create(void)
|
2011-09-05 19:12:58 +00:00
|
|
|
{
|
2011-08-31 17:46:28 +00:00
|
|
|
GtkTreeSelection *selection;
|
|
|
|
|
2012-08-13 21:42:55 +00:00
|
|
|
dive_list.listmodel = gtk_tree_store_new(DIVELIST_COLUMNS,
|
|
|
|
G_TYPE_INT, /* index */
|
|
|
|
G_TYPE_INT, /* nr */
|
|
|
|
G_TYPE_INT, /* Date */
|
|
|
|
G_TYPE_INT, /* Star rating */
|
|
|
|
G_TYPE_INT, /* Depth */
|
|
|
|
G_TYPE_INT, /* Duration */
|
|
|
|
G_TYPE_INT, /* Temperature */
|
2012-08-16 17:46:30 +00:00
|
|
|
G_TYPE_INT, /* Total weight */
|
|
|
|
G_TYPE_STRING, /* Suit */
|
2012-08-13 21:42:55 +00:00
|
|
|
G_TYPE_STRING, /* Cylinder */
|
|
|
|
G_TYPE_INT, /* Nitrox */
|
|
|
|
G_TYPE_INT, /* SAC */
|
|
|
|
G_TYPE_INT, /* OTU */
|
|
|
|
G_TYPE_STRING /* Location */
|
|
|
|
);
|
|
|
|
dive_list.treemodel = gtk_tree_store_new(DIVELIST_COLUMNS,
|
2011-09-19 19:25:16 +00:00
|
|
|
G_TYPE_INT, /* index */
|
2011-10-23 15:50:14 +00:00
|
|
|
G_TYPE_INT, /* nr */
|
2011-09-20 01:44:47 +00:00
|
|
|
G_TYPE_INT, /* Date */
|
2011-12-07 19:58:16 +00:00
|
|
|
G_TYPE_INT, /* Star rating */
|
2011-09-20 01:52:23 +00:00
|
|
|
G_TYPE_INT, /* Depth */
|
2011-09-20 02:13:36 +00:00
|
|
|
G_TYPE_INT, /* Duration */
|
|
|
|
G_TYPE_INT, /* Temperature */
|
2012-08-07 18:24:40 +00:00
|
|
|
G_TYPE_INT, /* Total weight */
|
2012-08-14 23:07:25 +00:00
|
|
|
G_TYPE_STRING, /* Suit */
|
2011-09-20 03:06:54 +00:00
|
|
|
G_TYPE_STRING, /* Cylinder */
|
2011-09-20 02:13:36 +00:00
|
|
|
G_TYPE_INT, /* Nitrox */
|
2011-09-22 18:02:28 +00:00
|
|
|
G_TYPE_INT, /* SAC */
|
2011-09-22 21:02:26 +00:00
|
|
|
G_TYPE_INT, /* OTU */
|
2011-09-22 18:02:28 +00:00
|
|
|
G_TYPE_STRING /* Location */
|
2011-09-19 19:25:16 +00:00
|
|
|
);
|
2012-08-13 21:42:55 +00:00
|
|
|
dive_list.model = dive_list.treemodel;
|
2011-09-05 19:12:58 +00:00
|
|
|
dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
|
2011-09-20 18:24:15 +00:00
|
|
|
set_divelist_font(divelist_font);
|
2011-09-20 05:01:55 +00:00
|
|
|
|
2011-09-05 19:12:58 +00:00
|
|
|
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
|
2011-08-31 17:46:28 +00:00
|
|
|
|
2011-10-21 03:59:13 +00:00
|
|
|
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
|
2011-09-20 03:06:54 +00:00
|
|
|
gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2012-01-05 16:16:08 +00:00
|
|
|
dive_list.nr = divelist_column(&dive_list, dl_column + DIVE_NR);
|
|
|
|
dive_list.date = divelist_column(&dive_list, dl_column + DIVE_DATE);
|
|
|
|
dive_list.stars = divelist_column(&dive_list, dl_column + DIVE_RATING);
|
|
|
|
dive_list.depth = divelist_column(&dive_list, dl_column + DIVE_DEPTH);
|
|
|
|
dive_list.duration = divelist_column(&dive_list, dl_column + DIVE_DURATION);
|
|
|
|
dive_list.temperature = divelist_column(&dive_list, dl_column + DIVE_TEMPERATURE);
|
2012-08-07 18:24:40 +00:00
|
|
|
dive_list.totalweight = divelist_column(&dive_list, dl_column + DIVE_TOTALWEIGHT);
|
2012-08-14 23:07:25 +00:00
|
|
|
dive_list.suit = divelist_column(&dive_list, dl_column + DIVE_SUIT);
|
2012-01-05 16:16:08 +00:00
|
|
|
dive_list.cylinder = divelist_column(&dive_list, dl_column + DIVE_CYLINDER);
|
|
|
|
dive_list.nitrox = divelist_column(&dive_list, dl_column + DIVE_NITROX);
|
|
|
|
dive_list.sac = divelist_column(&dive_list, dl_column + DIVE_SAC);
|
|
|
|
dive_list.otu = divelist_column(&dive_list, dl_column + DIVE_OTU);
|
|
|
|
dive_list.location = divelist_column(&dive_list, dl_column + DIVE_LOCATION);
|
2011-09-19 19:56:37 +00:00
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
fill_dive_list();
|
2011-09-07 15:56:47 +00:00
|
|
|
|
2011-09-05 19:12:58 +00:00
|
|
|
g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
|
2011-09-22 15:17:23 +00:00
|
|
|
"search-column", DIVE_LOCATION,
|
2011-09-04 22:18:58 +00:00
|
|
|
"rules-hint", TRUE,
|
2011-08-31 17:46:28 +00:00
|
|
|
NULL);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-09-22 17:28:57 +00:00
|
|
|
g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL);
|
2012-08-13 21:42:55 +00:00
|
|
|
g_signal_connect(dive_list.tree_view, "row-activated", G_CALLBACK(row_activated_cb), NULL);
|
2012-08-16 23:31:53 +00:00
|
|
|
g_signal_connect(dive_list.tree_view, "row-expanded", G_CALLBACK(row_expanded_cb), NULL);
|
2012-08-20 13:27:04 +00:00
|
|
|
g_signal_connect(dive_list.tree_view, "row-collapsed", G_CALLBACK(row_collapsed_cb), NULL);
|
2012-08-13 21:42:55 +00:00
|
|
|
g_signal_connect(dive_list.tree_view, "button-press-event", G_CALLBACK(button_press_cb), NULL);
|
|
|
|
g_signal_connect(dive_list.tree_view, "popup-menu", G_CALLBACK(popup_menu_cb), NULL);
|
2012-08-20 12:48:07 +00:00
|
|
|
g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model);
|
2012-08-13 21:42:55 +00:00
|
|
|
g_signal_connect(dive_list.listmodel, "sort-column-changed", G_CALLBACK(sort_column_change_cb), NULL);
|
|
|
|
g_signal_connect(dive_list.treemodel, "sort-column-changed", G_CALLBACK(sort_column_change_cb), NULL);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2012-08-14 04:11:09 +00:00
|
|
|
gtk_tree_selection_set_select_function(selection, modify_selection_cb, NULL, NULL);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-09-05 19:12:58 +00:00
|
|
|
dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
|
|
|
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dive_list.container_widget),
|
2011-09-20 05:09:47 +00:00
|
|
|
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
2011-09-05 19:12:58 +00:00
|
|
|
gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-09-21 04:29:09 +00:00
|
|
|
dive_list.changed = 0;
|
|
|
|
|
2011-09-20 17:06:24 +00:00
|
|
|
return dive_list.container_widget;
|
2011-08-31 17:27:58 +00:00
|
|
|
}
|
2011-09-21 04:29:09 +00:00
|
|
|
|
|
|
|
void mark_divelist_changed(int changed)
|
|
|
|
{
|
|
|
|
dive_list.changed = changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unsaved_changes()
|
|
|
|
{
|
|
|
|
return dive_list.changed;
|
|
|
|
}
|