X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=5f2063e9f8192fa6f10fb4a744f046dd5b448904;hb=e55b95b415e28e053ad3941f9bd3c41ea461ca58;hp=97a5674bf56311447d7485da9d40c26cec7f2435;hpb=4c113ee01622e515492ac3c3197df0cd281d58d4;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index 97a5674..5f2063e 100644 --- a/divelist.c +++ b/divelist.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "divelist.h" #include "dive.h" @@ -25,7 +26,7 @@ struct DiveList { GtkWidget *container_widget; GtkListStore *model; GtkTreeViewColumn *date, *depth, *duration, *location; - GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac; + GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac, *otu; int changed; }; @@ -40,25 +41,51 @@ enum { DIVE_DATE, /* time_t: dive->when */ DIVE_DEPTH, /* int: dive->maxdepth in mm */ DIVE_DURATION, /* int: in seconds */ - DIVE_LOCATION, /* "2nd Cathedral, Lanai" */ DIVE_TEMPERATURE, /* int: in mkelvin */ DIVE_CYLINDER, DIVE_NITROX, /* int: in permille */ DIVE_SAC, /* int: in ml/min */ + DIVE_OTU, /* int: in OTUs */ + DIVE_LOCATION, /* "2nd Cathedral, Lanai" */ DIVELIST_COLUMNS }; +static GList *selected_dives; + static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) { GtkTreeIter iter; GValue value = {0, }; + GtkTreePath *path; - if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) - return; + int nr_selected = gtk_tree_selection_count_selected_rows(selection); - gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value); - selected_dive = g_value_get_int(&value); - repaint_dive(); + if (selected_dives) { + g_list_foreach (selected_dives, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected_dives); + } + selected_dives = gtk_tree_selection_get_selected_rows(selection, NULL); + + switch (nr_selected) { + case 0: /* keep showing the last selected dive */ + return; + case 1: + /* just pick that dive as selected */ + path = g_list_nth_data(selected_dives, 0); + if (gtk_tree_model_get_iter(model, &iter, path)) { + gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value); + selected_dive = g_value_get_int(&value); + repaint_dive(); + } + return; + default: /* multiple selections - what now? At this point I + * don't want to change the selected dive unless + * there is exactly one dive selected; not sure this + * is the most intuitive solution. + * I do however want to keep around which dives have + * been selected */ + return; + } } static void date_data_func(GtkTreeViewColumn *col, @@ -222,6 +249,47 @@ static void sac_data_func(GtkTreeViewColumn *col, g_object_set(renderer, "text", buffer, NULL); } +/* Render the OTU data (integer value of "OTU") */ +static void otu_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int value; + char buffer[16]; + + gtk_tree_model_get(model, iter, DIVE_OTU, &value, -1); + + if (!value) { + g_object_set(renderer, "text", "", NULL); + return; + } + + snprintf(buffer, sizeof(buffer), "%d", value); + + g_object_set(renderer, "text", buffer, NULL); +} + +/* calculate OTU for a dive */ +static int calculate_otu(struct dive *dive) +{ + 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; + po2 = dive->cylinder[sample->cylinderindex].gasmix.o2.permille / 1000.0 * + (sample->depth.mm + 10000) / 10000.0; + if (po2 >= 0.5) + otu += pow(po2 - 0.5, 0.83) * t / 30.0; + } + return otu + 0.5; +} /* * Return air usage (in liters). */ @@ -310,6 +378,7 @@ static void fill_one_dive(struct dive *dive, DIVE_LOCATION, location, DIVE_CYLINDER, cylinder, DIVE_SAC, sac, + DIVE_OTU, dive->otu, -1); } @@ -378,6 +447,13 @@ void update_dive_list_units(void) gtk_tree_model_foreach(model, set_one_dive, NULL); } +void update_dive_list_col_visibility(void) +{ + 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; +} + static void fill_dive_list(void) { int i; @@ -389,6 +465,7 @@ static void fill_dive_list(void) for (i = 0; i < dive_table.nr; i++) { struct dive *dive = dive_table.dives[i]; + dive->otu = calculate_otu(dive); gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, DIVE_INDEX, i, @@ -417,38 +494,10 @@ void dive_list_update_dives(void) repaint_dive(); } -typedef void (*data_func_t)(GtkTreeViewColumn *col, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data); - static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title, - data_func_t data_func, int align_right, int expand) + data_func_t data_func, PangoAlignment align, gboolean visible) { - GtkCellRenderer *renderer; - GtkTreeViewColumn *col; - - renderer = gtk_cell_renderer_text_new(); - col = gtk_tree_view_column_new(); - - gtk_tree_view_column_set_title(col, title); - gtk_tree_view_column_set_sort_column_id(col, index); - gtk_tree_view_column_set_resizable(col, TRUE); - gtk_tree_view_column_pack_start(col, renderer, TRUE); - if (data_func) - gtk_tree_view_column_set_cell_data_func(col, renderer, data_func, NULL, NULL); - else - gtk_tree_view_column_add_attribute(col, renderer, "text", index); - if (align_right) { - gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - } - gtk_tree_view_column_set_expand(col,expand); - if (expand) - gtk_tree_view_column_set_min_width(col,50); - gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col); - return col; + return tree_view_column(dl->tree_view, index, title, data_func, align, visible); } /* @@ -469,28 +518,30 @@ GtkWidget *dive_list_create(void) G_TYPE_INT, /* Date */ G_TYPE_INT, /* Depth */ G_TYPE_INT, /* Duration */ - G_TYPE_STRING, /* Location */ G_TYPE_INT, /* Temperature */ G_TYPE_STRING, /* Cylinder */ G_TYPE_INT, /* Nitrox */ - G_TYPE_INT /* SAC */ + G_TYPE_INT, /* SAC */ + G_TYPE_INT, /* OTU */ + G_TYPE_STRING /* Location */ ); dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model)); set_divelist_font(divelist_font); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); - gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE); + gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE); gtk_widget_set_size_request(dive_list.tree_view, 200, 200); - dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0); - dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1, 0); - dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0); - dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1); - dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, UTF8_DEGREE "F", temperature_data_func, 1, 0); - dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0); - dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, 1, 0); - dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, 1, 0); + dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, PANGO_ALIGN_LEFT, TRUE); + dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, PANGO_ALIGN_RIGHT, TRUE); + dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, PANGO_ALIGN_RIGHT, TRUE); + dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, UTF8_DEGREE "F", temperature_data_func, PANGO_ALIGN_RIGHT, TRUE); + dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, PANGO_ALIGN_CENTER, TRUE); + dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, PANGO_ALIGN_CENTER, TRUE); + dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, PANGO_ALIGN_CENTER, visible_cols.sac); + dive_list.otu = divelist_column(&dive_list, DIVE_OTU, "OTU", otu_data_func, PANGO_ALIGN_CENTER, visible_cols.otu); + dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, PANGO_ALIGN_LEFT, TRUE); fill_dive_list();