X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=24d4014f01fc4e2a3b617f7e13a6d41800f6c7e8;hb=9cf8d98711dff888f5bfa8efd52ca7b8cf8bfa07;hp=9c1510664d496bb4237188770e6460a027737893;hpb=87e8ff9c3e16e2786a9ba9d551e52cd8b9dd9728;p=ext%2Fsubsurface.git diff --git a/divelist.c b/divelist.c index 9c15106..24d4014 100644 --- a/divelist.c +++ b/divelist.c @@ -7,25 +7,30 @@ #include "dive.h" #include "display.h" +struct DiveList { + GtkWidget *tree_view; + GtkWidget *container_widget; + GtkListStore *model; + GtkTreeViewColumn *date, *depth, *duration, *location; + GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac; +}; + +static struct DiveList dive_list; + /* * 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_DATESTR, /* "Thu Jun 17th, 2011" or whatever */ DIVE_DATE, /* time_t: dive->when */ - DIVE_DEPTHSTR, /* "67" in ft or whatever */ 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_LOCATION, /* "2nd Cathedral, Lanai" */ + DIVE_TEMPERATURE, /* int: in mkelvin */ + DIVE_CYLINDER, DIVE_NITROX, /* int: in permille */ - DIVE_SACSTR, /* "0.49" in cuft/min */ - DIVE_SAC, /* int: in ml/min or something */ + DIVE_SAC, /* int: in ml/min */ DIVELIST_COLUMNS }; @@ -43,7 +48,7 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) repaint_dive(); } -static const char *weekday(int wday) +const char *weekday(int wday) { static const char wday_array[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -51,7 +56,7 @@ static const char *weekday(int wday) return wday_array[wday]; } -static const char *monthname(int mon) +const char *monthname(int mon) { static const char month_array[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", @@ -60,34 +65,43 @@ static const char *monthname(int mon) return month_array[mon]; } -static void get_date(struct dive *dive, int *val, char **str) +static void date_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { + int val; struct tm *tm; - time_t when = dive->when; + time_t when; char buffer[40]; + gtk_tree_model_get(model, iter, DIVE_DATE, &val, -1); + /* 2038 problem */ - *val = when; + when = val; - tm = gmtime(&dive->when); + 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); - *str = strdup(buffer); + g_object_set(renderer, "text", buffer, NULL); } -static void get_depth(struct dive *dive, int *val, char **str) +static void depth_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - int len; - int depth = dive->maxdepth.mm; - int integer, frac = -1; - char buffer[10]; + int depth, integer, frac, len; + char buffer[40]; + + gtk_tree_model_get(model, iter, DIVE_DEPTH, &depth, -1); - *val = depth; - *str = ""; switch (output_units.length) { case METERS: /* To tenths of meters */ @@ -100,45 +114,46 @@ static void get_depth(struct dive *dive, int *val, char **str) /* Rounding? */ break; case FEET: - integer = to_feet(dive->maxdepth); + integer = mm_to_feet(depth) + 0.5; frac = -1; break; default: return; } - len = snprintf(buffer, sizeof(buffer), - "%d", integer); + len = snprintf(buffer, sizeof(buffer), "%d", integer); if (frac >= 0) - len += snprintf(buffer+len, sizeof(buffer)-len, - ".%d", frac); - *str = strdup(buffer); + 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) +static void duration_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - unsigned int sec = dive->duration.seconds; + unsigned int sec; char buffer[16]; - *val = sec; + gtk_tree_model_get(model, iter, DIVE_DURATION, &sec, -1); 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); + g_object_set(renderer, "text", buffer, NULL); } -static void get_temp(struct dive *dive, int *val, char **str) +static void temperature_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - int value = dive->watertemp.mkelvin; + int value; char buffer[80]; - *val = value; - *str = ""; + gtk_tree_model_get(model, iter, DIVE_TEMPERATURE, &value, -1); + + *buffer = 0; if (value) { double deg; switch (output_units.temperature) { @@ -152,21 +167,63 @@ static void get_temp(struct dive *dive, int *val, char **str) return; } snprintf(buffer, sizeof(buffer), "%.1f", deg); - *str = strdup(buffer); } + + g_object_set(renderer, "text", buffer, NULL); } -static void get_nitrox(struct dive *dive, int *val, char **str) +static void nitrox_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - int value = dive->cylinder[0].gasmix.o2.permille; + int value; char buffer[80]; - *val = value; - *str = ""; - if (value) { + gtk_tree_model_get(model, iter, DIVE_NITROX, &value, -1); + + if (value) snprintf(buffer, sizeof(buffer), "%.1f", value/10.0); - *str = strdup(buffer); + else + strcpy(buffer, "air"); + + 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) +{ + int value; + const double liters_per_cuft = 28.317; + const char *fmt; + char buffer[16]; + double sac; + + gtk_tree_model_get(model, iter, DIVE_SAC, &value, -1); + + if (!value) { + g_object_set(renderer, "text", "", NULL); + return; } + + sac = value / 1000.0; + switch (output_units.volume) { + case LITER: + fmt = "%4.0f"; + break; + case CUFT: + fmt = "%4.2f"; + sac /= liters_per_cuft; + break; + } + snprintf(buffer, sizeof(buffer), fmt, sac); + + g_object_set(renderer, "text", buffer, NULL); } /* @@ -193,15 +250,11 @@ static double calculate_airuse(struct dive *dive) return airuse; } -static void get_sac(struct dive *dive, int *val, char **str) +static void get_sac(struct dive *dive, int *val) { - 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; @@ -214,54 +267,52 @@ static void get_sac(struct dive *dive, int *val, char **str) /* 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; - } +static void get_string(char **str, const char *s) +{ + int len; + char *n; + + if (!s) + s = ""; + len = strlen(s); + if (len > 16) + len = 16; + n = malloc(len+1); + memcpy(n, s, len); + n[len] = 0; + *str = n; +} - snprintf(buffer, sizeof(buffer), fmt, sac, unit); - *str = strdup(buffer); +static void get_location(struct dive *dive, char **str) +{ + get_string(str, dive->location); +} + +static void get_cylinder(struct dive *dive, char **str) +{ + get_string(str, dive->cylinder[0].type.description); } static void fill_one_dive(struct dive *dive, GtkTreeModel *model, GtkTreeIter *iter) { - int date, depth, duration, temp, nitrox, sac; - char *datestr, *depthstr, *durationstr, *tempstr, *nitroxstr, *sacstr; - char *location; + int sac; + char *location, *cylinder; - get_date(dive, &date, &datestr); - get_depth(dive, &depth, &depthstr); - get_duration(dive, &duration, &durationstr); + get_cylinder(dive, &cylinder); get_location(dive, &location); - get_temp(dive, &temp, &tempstr); - get_nitrox(dive, &nitrox, &nitroxstr); - get_sac(dive, &sac, &sacstr); + get_sac(dive, &sac); /* * 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_DATESTR, datestr, - DIVE_DEPTHSTR, depthstr, - DIVE_DURATIONSTR, durationstr, DIVE_LOCATION, location, - DIVE_TEMPSTR, tempstr, - DIVE_TEMP, temp, - DIVE_NITROXSTR, nitroxstr, - DIVE_NITROX, nitrox, - DIVE_SACSTR, sacstr, + DIVE_CYLINDER, cylinder, DIVE_SAC, sac, -1); } @@ -286,17 +337,17 @@ static gboolean set_one_dive(GtkTreeModel *model, return dive == data; } -void flush_divelist(struct DiveList *dive_list, struct dive *dive) +void flush_divelist(struct dive *dive) { - GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + 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) +void update_dive_list_units(void) { const char *unit; - GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model); + GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model); switch (output_units.length) { case METERS: @@ -306,18 +357,18 @@ void update_dive_list_units(struct DiveList *dive_list) unit = "ft"; break; } - gtk_tree_view_column_set_title(dive_list->depth, unit); + 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) +static void fill_dive_list(void) { int i; GtkTreeIter iter; GtkListStore *store; - store = GTK_LIST_STORE(dive_list->model); + store = GTK_LIST_STORE(dive_list.model); for (i = 0; i < dive_table.nr; i++) { struct dive *dive = dive_table.dives[i]; @@ -325,123 +376,92 @@ static void fill_dive_list(struct DiveList *dive_list) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, DIVE_INDEX, i, - DIVE_DATESTR, "date", DIVE_DATE, dive->when, - DIVE_DEPTHSTR, "depth", 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_TEMPERATURE, dive->watertemp.mkelvin, DIVE_NITROX, dive->cylinder[0].gasmix.o2, - DIVE_SACSTR, "sac", DIVE_SAC, 0, -1); } - update_dive_list_units(dive_list); + update_dive_list_units(); } -void dive_list_update_dives(struct DiveList dive_list) +void dive_list_update_dives(void) { gtk_list_store_clear(GTK_LIST_STORE(dive_list.model)); - fill_dive_list(&dive_list); + fill_dive_list(); repaint_dive(); } -struct DiveList dive_list_create(void) +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) { - struct DiveList dive_list; - GtkTreeSelection *selection; - GtkCellRenderer *renderer; + 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_append_column(GTK_TREE_VIEW(dl->tree_view), col); + return col; +} + +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_STRING, G_TYPE_INT, /* Date */ - G_TYPE_STRING, G_TYPE_INT, /* Depth */ - G_TYPE_STRING, G_TYPE_INT, /* Duration */ + G_TYPE_INT, /* Date */ + G_TYPE_INT, /* Depth */ + 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 */ + G_TYPE_INT, /* Temperature */ + G_TYPE_STRING, /* Cylinder */ + G_TYPE_INT, /* Nitrox */ + G_TYPE_INT /* SAC */ ); 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); + 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(dive_list.tree_view, 200, 100); - - renderer = gtk_cell_renderer_text_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, 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", DIVE_DATESTR); - gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col); - - renderer = gtk_cell_renderer_text_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, DIVE_DEPTH); - gtk_tree_view_column_pack_start(col, renderer, FALSE); - gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DEPTHSTR); - 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.duration = col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(col, "min"); - 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", 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); - - 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); + gtk_widget_set_size_request(dive_list.tree_view, 200, 200); - 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, "EAD"); - 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); + dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0); + dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1); + dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1); + dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0); + dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "deg", temperature_data_func, 1); + dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0); + dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1); + dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1); - fill_dive_list(&dive_list); + fill_dive_list(); g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE, "search-column", 0, @@ -452,8 +472,8 @@ struct DiveList dive_list_create(void) 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_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view); - return dive_list; + return dive_list.container_widget; }