X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=3ddfb6582dea8aedb2a44ef6e257f7452e42f0e7;hb=84e6f200f64721771be18564830e277f0885e117;hp=0a601c511f27e2fab3243e83f6770dfc00ce1093;hpb=03b2e565503d383acc5f2867404cc39c0a2add80;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index 0a601c5..3ddfb65 100644 --- a/divelist.c +++ b/divelist.c @@ -1,18 +1,33 @@ +/* divelist.c */ +/* this creates the UI for the dive list - + * controlled through the following interfaces: + * + * 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) + * void mark_divelist_changed(int changed) + * int unsaved_changes() + */ #include #include #include #include +#include #include "divelist.h" #include "dive.h" #include "display.h" +#include "display-gtk.h" struct DiveList { GtkWidget *tree_view; GtkWidget *container_widget; GtkListStore *model; - GtkTreeViewColumn *date, *depth, *duration, *location; - GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac; + GtkTreeViewColumn *nr, *date, *depth, *duration, *location; + GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac, *otu; + int changed; }; static struct DiveList dive_list; @@ -23,46 +38,55 @@ static struct DiveList dive_list; */ enum { DIVE_INDEX = 0, + DIVE_NR, /* int: dive->nr */ 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(); -} - -const char *weekday(int wday) -{ - static const char wday_array[7][4] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" - }; - return wday_array[wday]; -} + 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); -const char *monthname(int mon) -{ - static const char month_array[12][4] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Oct", "Sep", "Nov", "Dec", - }; - return month_array[mon]; + 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, @@ -226,6 +250,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). */ @@ -311,9 +376,11 @@ static void fill_one_dive(struct dive *dive, * The core data itself is unaffected by units */ gtk_list_store_set(GTK_LIST_STORE(model), iter, + DIVE_NR, dive->number, DIVE_LOCATION, location, DIVE_CYLINDER, cylinder, DIVE_SAC, sac, + DIVE_OTU, dive->otu, -1); } @@ -344,6 +411,13 @@ void flush_divelist(struct dive *dive) gtk_tree_model_foreach(model, set_one_dive, dive); } +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); +} + void update_dive_list_units(void) { const char *unit; @@ -351,20 +425,20 @@ void update_dive_list_units(void) switch (output_units.length) { case METERS: - unit = "max/m"; + unit = "m"; break; case FEET: - unit = "max/ft"; + unit = "ft"; break; } gtk_tree_view_column_set_title(dive_list.depth, unit); switch (output_units.temperature) { case CELSIUS: - unit = "degC"; + unit = UTF8_DEGREE "C"; break; case FAHRENHEIT: - unit = "degF"; + unit = UTF8_DEGREE "F"; break; case KELVIN: unit = "Kelvin"; @@ -375,6 +449,16 @@ 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.cylinder, visible_cols.cylinder); + gtk_tree_view_column_set_visible(dive_list.temperature, visible_cols.temperature); + gtk_tree_view_column_set_visible(dive_list.nitrox, visible_cols.nitrox); + 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; @@ -386,9 +470,11 @@ 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, + DIVE_NR, dive->number, DIVE_DATE, dive->when, DIVE_DEPTH, dive->maxdepth, DIVE_DURATION, dive->duration.seconds, @@ -400,6 +486,11 @@ static void fill_dive_list(void) } update_dive_list_units(); + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dive_list.model), &iter)) { + GtkTreeSelection *selection; + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); + gtk_tree_selection_select_iter(selection, &iter); + } } void dive_list_update_dives(void) @@ -409,81 +500,66 @@ 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, DIVE_DATE); - 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); +} + +/* + * 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); } GtkWidget *dive_list_create(void) { GtkTreeSelection *selection; - PangoFontDescription *font_desc = pango_font_description_from_string("sans 8"); dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS, G_TYPE_INT, /* index */ + G_TYPE_INT, /* nr */ 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)); - gtk_widget_modify_font(dive_list.tree_view, font_desc); - pango_font_description_free(font_desc); + 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, "max/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, "degF", 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, "O2%", nitrox_data_func, 1, 0); - dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0); + dive_list.nr = divelist_column(&dive_list, DIVE_NR, "#", NULL, PANGO_ALIGN_RIGHT, TRUE); + gtk_tree_view_column_set_sort_column_id(dive_list.nr, -1); + 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, visible_cols.temperature); + dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, PANGO_ALIGN_CENTER, visible_cols.cylinder); + dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, PANGO_ALIGN_CENTER, visible_cols.nitrox); + 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(); g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE, - "search-column", 0, + "search-column", DIVE_LOCATION, "rules-hint", TRUE, NULL); + g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL); g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model); dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL); @@ -491,5 +567,17 @@ GtkWidget *dive_list_create(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view); + dive_list.changed = 0; + return dive_list.container_widget; } + +void mark_divelist_changed(int changed) +{ + dive_list.changed = changed; +} + +int unsaved_changes() +{ + return dive_list.changed; +}