X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=statistics.c;h=a53617337fa712b8864a3fdc4aee20bd8b7f9682;hb=refs%2Fheads%2Fmaster;hp=5017fe0b2f7e8548501611f667d832105b435e36;hpb=788ebc0500b12fb502b82473c1459ccca06345a5;p=ext%2Fsubsurface.git diff --git a/statistics.c b/statistics.c index 5017fe0..a536173 100644 --- a/statistics.c +++ b/statistics.c @@ -37,11 +37,18 @@ static single_stat_widget_t single_w; typedef struct { GtkWidget *total_time, *avg_time, + *shortest_time, + *longest_time, *max_overall_depth, + *min_overall_depth, *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; @@ -49,23 +56,79 @@ static total_stats_widget_t stats_w; typedef struct { duration_t total_time; /* avg_time is simply total_time / nr -- let's not keep this */ + duration_t shortest_time; + duration_t longest_time; depth_t max_depth; + depth_t min_depth; depth_t avg_depth; 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; + unsigned int total_sac_time; } 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; + 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++; + } + + /* Maybe we should drop zero-duration dives */ + if (!dp->duration.seconds) + return; + 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 */ + sac_time = stats->total_sac_time + dp->duration.seconds; + stats->avg_sac.mliter = (1.0 * stats->total_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; + stats->total_sac_time = sac_time; + } +} 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 */ for (idx = 0; idx < dive_table.nr; idx++) { @@ -75,23 +138,26 @@ 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->maxdepth.mm > stats.max_depth.mm) - stats.max_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); + } +} + +/* make sure we skip the selected summary entries */ +void process_selected_dives(void) +{ + struct dive *dive; + unsigned int i, nr; + + memset(&stats_selection, 0, sizeof(stats_selection)); + + nr = 0; + for_each_dive(i, dive) { + if (dive->selected) { + process_dive(dive, &stats_selection); + nr++; } } + stats_selection.selection_size = nr; } static void set_label(GtkWidget *w, const char *fmt, ...) @@ -145,7 +211,7 @@ static void show_single_dive_stats(struct dive *dive) set_label(single_w.date, buf); set_label(single_w.dive_time, "%d min", (dive->duration.seconds + 30) / 60); if (prev_dive) - set_label(single_w.surf_intv, + set_label(single_w.surf_intv, get_time_string(dive->when - (prev_dive->when + prev_dive->duration.seconds), 4)); else set_label(single_w.surf_intv, "unknown"); @@ -201,25 +267,48 @@ static void show_single_dive_stats(struct dive *dive) static void show_total_dive_stats(struct dive *dive) { double value; - int decimals; + int decimals, seconds; const char *unit; + stats_t *stats_ptr; + + 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)); - 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)); + seconds = stats_ptr->total_time.seconds; + if (stats_ptr->selection_size) + seconds /= stats_ptr->selection_size; + set_label(stats_w.avg_time, get_time_string(seconds, 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.avg_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_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); } void show_dive_stats(struct dive *dive) { + /* they have to be called in this order, as 'total' depends on + * calculations done in 'single' */ show_single_dive_stats(dive); show_total_dive_stats(dive); } @@ -256,13 +345,29 @@ 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"); + + /* third row */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + stats_w.max_overall_depth = new_info_label_in_frame(hbox, "Max Depth"); + 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"); - /* second row */ + /* fourth row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3);