X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=c537e81862d3cd571c2a36f73fdcece77576b877;hb=2a45f6dbc3aa9bef7832e63e30076eff704153c9;hp=b2ad39d0ee67e85b2ea2a418e8022755a4e5cb19;hpb=13a6d0c4c2bc6984a5320e88c754832ae62be26e;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index b2ad39d..c537e81 100644 --- a/divelist.c +++ b/divelist.c @@ -3,9 +3,31 @@ #include #include +#include "divelist.h" #include "dive.h" #include "display.h" +/* + * The dive list has the dive data in both string format (for showing) + * and in "raw" format (for sorting purposes) + */ +enum { + DIVE_INDEX = 0, + DIVE_DATE, /* time_t: dive->when */ + DIVE_DEPTH, /* int: dive->maxdepth in mm */ + DIVE_DURATIONSTR, /* "47" in minutes */ + DIVE_DURATION, /* int: in seconds */ + DIVE_LOCATION, /* "47" in minutes */ + DIVE_TEMPSTR, /* "78" in fahrenheit or whatever */ + DIVE_TEMP, /* int: in mkelvin */ + DIVE_NITROXSTR, /* "32.5" in percent */ + DIVE_NITROX, /* int: in permille */ + DIVE_SACSTR, /* "0.49" in cuft/min */ + DIVE_SAC, /* int: in ml/min or something */ + DIVELIST_COLUMNS +}; + + static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) { GtkTreeIter iter; @@ -14,116 +36,424 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) return; - gtk_tree_model_get_value(model, &iter, 6, &value); + gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value); selected_dive = g_value_get_int(&value); repaint_dive(); } -static void fill_dive_list(GtkListStore *store) +static const char *weekday(int wday) +{ + static const char wday_array[7][4] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; + return wday_array[wday]; +} + +static 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]; +} + +static void date_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int val; + struct tm *tm; + time_t when; + char buffer[40]; + + gtk_tree_model_get(model, iter, DIVE_DATE, &val, -1); + + /* 2038 problem */ + when = val; + + tm = gmtime(&when); + 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); + g_object_set(renderer, "text", buffer, NULL); +} + +static void depth_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int depth, integer, frac, len; + char buffer[40]; + + gtk_tree_model_get(model, iter, DIVE_DEPTH, &depth, -1); + + switch (output_units.length) { + case METERS: + /* To tenths of meters */ + depth = (depth + 49) / 100; + integer = depth / 10; + frac = depth % 10; + if (integer < 20) + break; + frac = -1; + /* Rounding? */ + break; + 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); + + g_object_set(renderer, "text", buffer, NULL); +} + +static void get_duration(struct dive *dive, int *val, char **str) +{ + unsigned int sec = dive->duration.seconds; + char buffer[16]; + + *val = sec; + snprintf(buffer, sizeof(buffer), "%d:%02d", sec / 60, sec % 60); + *str = strdup(buffer); +} + +static void get_location(struct dive *dive, char **str) +{ + char buffer[16]; + + snprintf(buffer, sizeof(buffer), "%s", dive->location); + *str = strdup(buffer); +} + +static void get_temp(struct dive *dive, int *val, char **str) +{ + int value = dive->watertemp.mkelvin; + char buffer[80]; + + *val = value; + *str = ""; + if (value) { + 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); + *str = strdup(buffer); + } +} + +static void get_nitrox(struct dive *dive, int *val, char **str) +{ + int value = dive->cylinder[0].gasmix.o2.permille; + char buffer[80]; + + *val = value; + *str = ""; + if (value) { + snprintf(buffer, sizeof(buffer), "%.1f", value/10.0); + *str = strdup(buffer); + } +} + +/* + * Return air usage (in liters). + */ +static double calculate_airuse(struct dive *dive) +{ + double airuse = 0; + int i; + + for (i = 0; i < MAX_CYLINDERS; i++) { + cylinder_t *cyl = dive->cylinder + i; + int size = cyl->type.size.mliter; + double kilo_atm; + + if (!size) + continue; + + kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0; + + /* Liters of air at 1 atm == milliliters at 1k atm*/ + airuse += kilo_atm * size; + } + return airuse; +} + +static void get_sac(struct dive *dive, int *val, char **str) +{ + const double liters_per_cuft = 28.317; + double airuse, pressure, sac; + const char *fmt, *unit; + char buffer[20]; + + *val = 0; + *str = ""; + airuse = calculate_airuse(dive); + if (!airuse) + return; + if (!dive->duration.seconds) + return; + + /* Mean pressure in atm: 1 atm per 10m */ + pressure = 1 + (dive->meandepth.mm / 10000.0); + sac = airuse / pressure * 60 / dive->duration.seconds; + + /* milliliters per minute.. */ + *val = sac * 1000; + + switch (output_units.volume) { + case LITER: + unit = "l"; + fmt = "%4.0f %s"; + break; + case CUFT: + unit = "cuft"; + fmt = "%4.2f %s"; + airuse /= liters_per_cuft; + sac /= liters_per_cuft; + break; + } + + snprintf(buffer, sizeof(buffer), fmt, sac, unit); + *str = strdup(buffer); +} + +static void fill_one_dive(struct dive *dive, + GtkTreeModel *model, + GtkTreeIter *iter) +{ + int duration, temp, nitrox, sac; + char *durationstr, *tempstr, *nitroxstr, *sacstr; + char *location; + + get_duration(dive, &duration, &durationstr); + get_location(dive, &location); + get_temp(dive, &temp, &tempstr); + get_nitrox(dive, &nitrox, &nitroxstr); + get_sac(dive, &sac, &sacstr); + + /* + * We only set the fields that changed: the strings. + * The core data itself is unaffected by units + */ + gtk_list_store_set(GTK_LIST_STORE(model), iter, + DIVE_DURATIONSTR, durationstr, + DIVE_LOCATION, location, + DIVE_TEMPSTR, tempstr, + DIVE_TEMP, temp, + DIVE_NITROXSTR, nitroxstr, + DIVE_NITROX, nitrox, + DIVE_SACSTR, sacstr, + DIVE_SAC, sac, + -1); +} + +static gboolean set_one_dive(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + GValue value = {0, }; + struct dive *dive; + + /* Get the dive number */ + gtk_tree_model_get_value(model, iter, DIVE_INDEX, &value); + dive = get_dive(g_value_get_int(&value)); + if (!dive) + return TRUE; + if (data && dive != data) + return FALSE; + + fill_one_dive(dive, model, iter); + return dive == data; +} + +void flush_divelist(struct DiveList *dive_list, struct dive *dive) +{ + GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + + gtk_tree_model_foreach(model, set_one_dive, dive); +} + +void update_dive_list_units(struct DiveList *dive_list) +{ + const char *unit; + GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + + switch (output_units.length) { + case METERS: + unit = "m"; + break; + case FEET: + unit = "ft"; + break; + } + gtk_tree_view_column_set_title(dive_list->depth, unit); + + gtk_tree_model_foreach(model, set_one_dive, NULL); +} + +static void fill_dive_list(struct DiveList *dive_list) { int i; GtkTreeIter iter; + GtkListStore *store; + + store = GTK_LIST_STORE(dive_list->model); for (i = 0; i < dive_table.nr; i++) { struct dive *dive = dive_table.dives[i]; - int len; - char buffer[256], *datestr, *depth, *duration; - struct tm *tm; - - tm = gmtime(&dive->when); - len = snprintf(buffer, sizeof(buffer), - "%02d.%02d.%02d %02d:%02d", - tm->tm_mday, tm->tm_mon+1, tm->tm_year % 100, - tm->tm_hour, tm->tm_min); - datestr = malloc(len+1); - memcpy(datestr, buffer, len+1); - - len = snprintf(buffer, sizeof(buffer), - "%d", to_feet(dive->maxdepth)); - depth = malloc(len + 1); - memcpy(depth, buffer, len+1); - - len = snprintf(buffer, sizeof(buffer), - "%d", dive->duration.seconds / 60); - duration = malloc(len + 1); - memcpy(duration, buffer, len+1); - gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, datestr, - 1, dive->when, - 2, depth, - 3, dive->maxdepth, - 4, duration, - 5, dive->duration.seconds, - 6, i, + DIVE_INDEX, i, + DIVE_DATE, dive->when, + DIVE_DEPTH, dive->maxdepth, + DIVE_DURATIONSTR, "duration", + DIVE_DURATION, dive->duration.seconds, + DIVE_LOCATION, "location", + DIVE_TEMPSTR, "temp", + DIVE_TEMP, dive->watertemp.mkelvin, + DIVE_NITROXSTR, "21.0", + DIVE_NITROX, dive->cylinder[0].gasmix.o2, + DIVE_SACSTR, "sac", + DIVE_SAC, 0, -1); } + + update_dive_list_units(dive_list); } -GtkWidget *create_dive_list(void) +void dive_list_update_dives(struct DiveList dive_list) { - GtkListStore *model; - GtkWidget *tree_view; + gtk_list_store_clear(GTK_LIST_STORE(dive_list.model)); + fill_dive_list(&dive_list); + repaint_dive(); +} + +struct DiveList dive_list_create(void) +{ + struct DiveList dive_list; GtkTreeSelection *selection; GtkCellRenderer *renderer; GtkTreeViewColumn *col; - GtkWidget *scroll_window; - model = gtk_list_store_new(7, - G_TYPE_STRING, G_TYPE_INT, - G_TYPE_STRING, G_TYPE_INT, - G_TYPE_STRING, G_TYPE_INT, - G_TYPE_INT); - tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); + dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS, + G_TYPE_INT, /* index */ + G_TYPE_INT, /* Date */ + G_TYPE_INT, /* Depth */ + G_TYPE_STRING, G_TYPE_INT, /* Duration */ + G_TYPE_STRING, /* Location */ + G_TYPE_STRING, G_TYPE_INT, /* Temperature */ + G_TYPE_STRING, G_TYPE_INT, /* Nitrox */ + G_TYPE_STRING, G_TYPE_INT /* SAC */ + ); + dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model)); + 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_widget_set_size_request(tree_view, 200, 100); - - fill_dive_list(model); + gtk_widget_set_size_request(dive_list.tree_view, 200, 100); renderer = gtk_cell_renderer_text_new(); - col = gtk_tree_view_column_new(); + dive_list.date = col = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(col, "Date"); - gtk_tree_view_column_set_sort_column_id(col, 1); + 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); - gtk_tree_view_column_add_attribute(col, renderer, "text", 0); - gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col); - + gtk_tree_view_column_set_cell_data_func(col, renderer, date_data_func, NULL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + renderer = gtk_cell_renderer_text_new(); - col = gtk_tree_view_column_new(); + dive_list.depth = col = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(col, "ft"); - gtk_tree_view_column_set_sort_column_id(col, 3); + gtk_tree_view_column_set_sort_column_id(col, DIVE_DEPTH); gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_add_attribute(col, renderer, "text", 2); - gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col); + gtk_tree_view_column_set_cell_data_func(col, renderer, depth_data_func, NULL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - + renderer = gtk_cell_renderer_text_new(); - col = gtk_tree_view_column_new(); + dive_list.duration = col = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(col, "min"); - gtk_tree_view_column_set_sort_column_id(col, 5); + gtk_tree_view_column_set_sort_column_id(col, DIVE_DURATION); gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_add_attribute(col, renderer, "text", 4); - gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col); + gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DURATIONSTR); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); - g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE, + renderer = gtk_cell_renderer_text_new(); + dive_list.location = col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, "Location"); + gtk_tree_view_column_set_sort_column_id(col, DIVE_LOCATION); + gtk_tree_view_column_pack_start(col, renderer, FALSE); + gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_LOCATION); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + + renderer = gtk_cell_renderer_text_new(); + dive_list.temperature = col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, "deg"); + gtk_tree_view_column_set_sort_column_id(col, DIVE_TEMP); + gtk_tree_view_column_pack_start(col, renderer, FALSE); + gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_TEMPSTR); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); + gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); + + renderer = gtk_cell_renderer_text_new(); + dive_list.nitrox = col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, "O2%"); + gtk_tree_view_column_set_sort_column_id(col, DIVE_NITROX); + gtk_tree_view_column_pack_start(col, renderer, FALSE); + gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_NITROXSTR); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); + gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); + + renderer = gtk_cell_renderer_text_new(); + dive_list.sac = col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(col, "SAC"); + gtk_tree_view_column_set_sort_column_id(col, DIVE_SAC); + gtk_tree_view_column_pack_start(col, renderer, FALSE); + gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_SACSTR); + gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); + gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL); + gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5); + + fill_dive_list(&dive_list); + + g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE, "search-column", 0, "rules-hint", TRUE, NULL); - g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), model); + g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model); - scroll_window = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(scroll_window), tree_view); + dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dive_list.container_widget), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view); - return scroll_window; + return dive_list; }