From 9933ccd7cf3a84ca60330a810e7763668ad882fb Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Wed, 14 Mar 2012 19:01:34 +0200 Subject: [PATCH] Show statistics of selected dives If at least 2 dives are selected, show statistics of these dives on Overall Stats. Otherwise, show the statistics of all dives. Temperature is also added to the shown statistics. Signed-off-by: Miika Turkia Minor change to avoid adding statistics.h (moved the global variable and external function declaration to display-gtk.h). Another minor change to the text displayed for the "Stats" notebook page. Signed-off-by: Dirk Hohndel --- display-gtk.h | 4 ++ divelist.c | 4 ++ gtk-gui.c | 2 +- statistics.c | 143 ++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 117 insertions(+), 36 deletions(-) diff --git a/display-gtk.h b/display-gtk.h index f43e374..f12e429 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -67,6 +67,10 @@ extern GtkWidget *cylinder_list_widget(void); extern GtkWidget *dive_list_create(void); +unsigned int amount_selected; + +extern void process_selected_dives(GList *, GtkTreeModel *); + typedef void (*data_func_t)(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, diff --git a/divelist.c b/divelist.c index b9388f8..2054ca0 100644 --- a/divelist.c +++ b/divelist.c @@ -73,6 +73,7 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) return; case 1: /* just pick that dive as selected */ + amount_selected = 1; 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); @@ -86,6 +87,9 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) * is the most intuitive solution. * I do however want to keep around which dives have * been selected */ + amount_selected = g_list_length(selected_dives); + process_selected_dives(selected_dives, model); + repaint_dive(); return; } } diff --git a/gtk-gui.c b/gtk-gui.c index 5b89265..402e91a 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -746,7 +746,7 @@ void init_ui(int *argcp, char ***argvp) /* Frame for total dive statistics */ nb_page = total_stats_widget(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Overall Stats")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Stats")); gtk_widget_set_app_paintable(win, TRUE); gtk_widget_show_all(win); diff --git a/statistics.c b/statistics.c index 2669d53..65efdf1 100644 --- a/statistics.c +++ b/statistics.c @@ -44,7 +44,11 @@ typedef struct { *avg_overall_depth, *min_sac, *avg_sac, - *max_sac; + *max_sac, + *selection_size, + *max_temp, + *avg_temp, + *min_temp; } total_stats_widget_t; static total_stats_widget_t stats_w; @@ -60,21 +64,65 @@ typedef struct { volume_t max_sac; volume_t min_sac; volume_t avg_sac; + int max_temp; + int min_temp; + unsigned int combined_temp; + unsigned int combined_count; + unsigned int selection_size; } stats_t; static stats_t stats; +static stats_t stats_selection; + + +static void process_dive(struct dive *dp, stats_t *stats) +{ + int old_tt, sac_time = 0; + const char *unit; + + old_tt = stats->total_time.seconds; + stats->total_time.seconds += dp->duration.seconds; + if (dp->duration.seconds > stats->longest_time.seconds) + stats->longest_time.seconds = dp->duration.seconds; + if (stats->shortest_time.seconds == 0 || dp->duration.seconds < stats->shortest_time.seconds) + stats->shortest_time.seconds = dp->duration.seconds; + if (dp->maxdepth.mm > stats->max_depth.mm) + stats->max_depth.mm = dp->maxdepth.mm; + if (stats->min_depth.mm == 0 || dp->maxdepth.mm < stats->min_depth.mm) + stats->min_depth.mm = dp->maxdepth.mm; + stats->avg_depth.mm = (1.0 * old_tt * stats->avg_depth.mm + + dp->duration.seconds * dp->meandepth.mm) / stats->total_time.seconds; + if (dp->sac > 2800) { /* less than .1 cuft/min (2800ml/min) is bogus */ + int old_sac_time = sac_time; + sac_time += dp->duration.seconds; + stats->avg_sac.mliter = (1.0 * old_sac_time * stats->avg_sac.mliter + + dp->duration.seconds * dp->sac) / sac_time ; + if (dp->sac > stats->max_sac.mliter) + stats->max_sac.mliter = dp->sac; + if (stats->min_sac.mliter == 0 || dp->sac < stats->min_sac.mliter) + stats->min_sac.mliter = dp->sac; + } + if (dp->watertemp.mkelvin) { + if (stats->min_temp == 0 || dp->watertemp.mkelvin < stats->min_temp) + stats->min_temp = dp->watertemp.mkelvin; + if (dp->watertemp.mkelvin > stats->max_temp) + stats->max_temp = dp->watertemp.mkelvin; + stats->combined_temp += get_temp_units(dp->watertemp.mkelvin, &unit); + stats->combined_count++; + } +} static void process_all_dives(struct dive *dive, struct dive **prev_dive) { int idx; struct dive *dp; - int old_tt, sac_time = 0; *prev_dive = NULL; memset(&stats, 0, sizeof(stats)); if (dive_table.nr > 0) { stats.shortest_time.seconds = dive_table.dives[0]->duration.seconds; stats.min_depth.mm = dive_table.dives[0]->maxdepth.mm; + stats.selection_size = dive_table.nr; } /* this relies on the fact that the dives in the dive_table * are in chronological order */ @@ -85,28 +133,28 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive) if (idx > 0) *prev_dive = dive_table.dives[idx-1]; } - old_tt = stats.total_time.seconds; - stats.total_time.seconds += dp->duration.seconds; - if (dp->duration.seconds > stats.longest_time.seconds) - stats.longest_time.seconds = dp->duration.seconds; - if (dp->duration.seconds < stats.shortest_time.seconds) - stats.shortest_time.seconds = dp->duration.seconds; - if (dp->maxdepth.mm > stats.max_depth.mm) - stats.max_depth.mm = dp->maxdepth.mm; - if (dp->maxdepth.mm < stats.min_depth.mm) - stats.min_depth.mm = dp->maxdepth.mm; - stats.avg_depth.mm = (1.0 * old_tt * stats.avg_depth.mm + - dp->duration.seconds * dp->meandepth.mm) / stats.total_time.seconds; - if (dp->sac > 2800) { /* less than .1 cuft/min (2800ml/min) is bogus */ - int old_sac_time = sac_time; - sac_time += dp->duration.seconds; - stats.avg_sac.mliter = (1.0 * old_sac_time * stats.avg_sac.mliter + - dp->duration.seconds * dp->sac) / sac_time ; - if (dp->sac > stats.max_sac.mliter) - stats.max_sac.mliter = dp->sac; - if (stats.min_sac.mliter == 0 || dp->sac < stats.min_sac.mliter) - stats.min_sac.mliter = dp->sac; + process_dive(dp, &stats); + } +} + +void process_selected_dives(GList *selected_dives, GtkTreeModel *model) +{ + struct dive *dp; + unsigned int i; + GtkTreeIter iter; + GtkTreePath *path; + + memset(&stats_selection, 0, sizeof(stats_selection)); + stats_selection.selection_size = amount_selected; + + for (i = 0; i < amount_selected; ++i) { + GValue value = {0, }; + path = g_list_nth_data(selected_dives, i); + if (gtk_tree_model_get_iter(model, &iter, path)) { + gtk_tree_model_get_value(model, &iter, 0, &value); + dp = get_dive(g_value_get_int(&value)); } + process_dive(dp, &stats_selection); } } @@ -219,22 +267,39 @@ static void show_total_dive_stats(struct dive *dive) double value; int decimals; const char *unit; + stats_t *stats_ptr; + + if (amount_selected < 2) + stats_ptr = &stats; + else + stats_ptr = &stats_selection; - set_label(stats_w.total_time, get_time_string(stats.total_time.seconds, 0)); - set_label(stats_w.avg_time, get_time_string(stats.total_time.seconds / dive_table.nr, 0)); - set_label(stats_w.longest_time, get_time_string(stats.longest_time.seconds, 0)); - set_label(stats_w.shortest_time, get_time_string(stats.shortest_time.seconds, 0)); - value = get_depth_units(stats.max_depth.mm, &decimals, &unit); + set_label(stats_w.selection_size, "%d", stats_ptr->selection_size); + if (stats_ptr->min_temp) { + value = get_temp_units(stats_ptr->min_temp, &unit); + set_label(stats_w.min_temp, "%.1f %s", value, unit); + } + if (stats_ptr->combined_temp && stats_ptr->combined_count) + set_label(stats_w.avg_temp, "%.1f %s", stats_ptr->combined_temp / (stats_ptr->combined_count * 1.0), unit); + if (stats_ptr->max_temp) { + value = get_temp_units(stats_ptr->max_temp, &unit); + set_label(stats_w.max_temp, "%.1f %s", value, unit); + } + set_label(stats_w.total_time, get_time_string(stats_ptr->total_time.seconds, 0)); + set_label(stats_w.avg_time, get_time_string(stats_ptr->total_time.seconds / stats_ptr->selection_size, 0)); + set_label(stats_w.longest_time, get_time_string(stats_ptr->longest_time.seconds, 0)); + set_label(stats_w.shortest_time, get_time_string(stats_ptr->shortest_time.seconds, 0)); + value = get_depth_units(stats_ptr->max_depth.mm, &decimals, &unit); set_label(stats_w.max_overall_depth, "%.*f %s", decimals, value, unit); - value = get_depth_units(stats.min_depth.mm, &decimals, &unit); + value = get_depth_units(stats_ptr->min_depth.mm, &decimals, &unit); set_label(stats_w.min_overall_depth, "%.*f %s", decimals, value, unit); - value = get_depth_units(stats.avg_depth.mm, &decimals, &unit); + value = get_depth_units(stats_ptr->avg_depth.mm, &decimals, &unit); set_label(stats_w.avg_overall_depth, "%.*f %s", decimals, value, unit); - value = get_volume_units(stats.max_sac.mliter, &decimals, &unit); + value = get_volume_units(stats_ptr->max_sac.mliter, &decimals, &unit); set_label(stats_w.max_sac, "%.*f %s/min", decimals, value, unit); - value = get_volume_units(stats.min_sac.mliter, &decimals, &unit); + value = get_volume_units(stats_ptr->min_sac.mliter, &decimals, &unit); set_label(stats_w.min_sac, "%.*f %s/min", decimals, value, unit); - value = get_volume_units(stats.avg_sac.mliter, &decimals, &unit); + value = get_volume_units(stats_ptr->avg_sac.mliter, &decimals, &unit); set_label(stats_w.avg_sac, "%.*f %s/min", decimals, value, unit); } @@ -278,13 +343,21 @@ GtkWidget *total_stats_widget(void) /* first row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + stats_w.selection_size = new_info_label_in_frame(hbox, "Dives"); + stats_w.max_temp = new_info_label_in_frame(hbox, "Max Temp"); + stats_w.min_temp = new_info_label_in_frame(hbox, "Min Temp"); + stats_w.avg_temp = new_info_label_in_frame(hbox, "Avg Temp"); + + /* second row */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); stats_w.total_time = new_info_label_in_frame(hbox, "Total Time"); stats_w.avg_time = new_info_label_in_frame(hbox, "Avg Time"); stats_w.longest_time = new_info_label_in_frame(hbox, "Longest Dive"); stats_w.shortest_time = new_info_label_in_frame(hbox, "Shortest Dive"); - /* second row */ + /* third row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); @@ -292,7 +365,7 @@ GtkWidget *total_stats_widget(void) stats_w.min_overall_depth = new_info_label_in_frame(hbox, "Min Depth"); stats_w.avg_overall_depth = new_info_label_in_frame(hbox, "Avg Depth"); - /* third row */ + /* fourth row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); -- 2.43.0