diff options
Diffstat (limited to 'statistics.c')
| -rw-r--r-- | statistics.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/statistics.c b/statistics.c index 0f58b61bd..08fb73814 100644 --- a/statistics.c +++ b/statistics.c @@ -27,7 +27,9 @@ typedef struct { *surf_intv, *max_depth, *avg_depth, + *viz, *water_temp, + *air_temp, *sac, *otu, *o2he, @@ -543,11 +545,17 @@ static void show_single_dive_stats(struct dive *dive) set_label(single_w.max_depth, "%.*f %s", decimals, value, unit); value = get_depth_units(dive->meandepth.mm, &decimals, &unit); set_label(single_w.avg_depth, "%.*f %s", decimals, value, unit); + set_label(single_w.viz, star_strings[dive->visibility]); if (dive->watertemp.mkelvin) { value = get_temp_units(dive->watertemp.mkelvin, &unit); set_label(single_w.water_temp, "%.1f %s", value, unit); } else set_label(single_w.water_temp, ""); + if (dive->airtemp.mkelvin) { + value = get_temp_units(dive->airtemp.mkelvin, &unit); + set_label(single_w.air_temp, "%.1f %s", value, unit); + } else + set_label(single_w.air_temp, ""); value = get_volume_units(dive->sac, &decimals, &unit); if (value > 0) { set_label(single_w.sac, _("%.*f %s/min"), decimals, value, unit); @@ -727,12 +735,19 @@ GtkWidget *single_stats_widget(void) single_w.max_depth = new_info_label_in_frame(hbox, _("Max Depth")); single_w.avg_depth = new_info_label_in_frame(hbox, _("Avg Depth")); - single_w.water_temp = new_info_label_in_frame(hbox, _("Water Temp")); + single_w.viz = new_info_label_in_frame(hbox, _("Visibility")); /* third row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + single_w.water_temp = new_info_label_in_frame(hbox, _("Water Temp")); + single_w.air_temp = new_info_label_in_frame(hbox, _("Air Temp")); + + /* fourth row */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + single_w.sac = new_info_label_in_frame(hbox, _("SAC")); single_w.otu = new_info_label_in_frame(hbox, _("OTU")); single_w.o2he = new_info_label_in_frame(hbox, "O" UTF8_SUBSCRIPT_2 " / He"); @@ -748,7 +763,9 @@ void clear_stats_widgets(void) set_label(single_w.surf_intv, ""); set_label(single_w.max_depth, ""); set_label(single_w.avg_depth, ""); + set_label(single_w.viz, ""); set_label(single_w.water_temp, ""); + set_label(single_w.air_temp, ""); set_label(single_w.sac, ""); set_label(single_w.sac, ""); set_label(single_w.otu, ""); |