X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=statistics.c;h=ee3a5b22031e9221de9b346b89f187558931f00b;hb=0089dd8819b7b28ad5c48dbfc881f4011f18014e;hp=8000309c3d0d53da48811ed33056e1dacf79af12;hpb=a416847d3b19693c592e77c980f91943e1388a82;p=ext%2Fsubsurface.git

diff --git a/statistics.c b/statistics.c
index 8000309..ee3a5b2 100644
--- a/statistics.c
+++ b/statistics.c
@@ -125,10 +125,18 @@ void show_dive_stats(struct dive *dive)
 	const char *unit;
 	int idx, offset, gas_used;
 	struct dive *prev_dive;
+	struct tm *tm;
 
 	process_all_dives(dive, &prev_dive);
 
-	strftime(buf, 80, "%a, %b %d, %Y, %k:%M", gmtime(&dive->when));
+	tm = gmtime(&dive->when);
+	snprintf(buf, sizeof(buf),
+		"%s, %s %d, %d %2d:%02d",
+		weekday(tm->tm_wday),
+		monthname(tm->tm_mon),
+		tm->tm_mday, tm->tm_year + 1900,
+		tm->tm_hour, tm->tm_min);
+
 	set_label(info_stat_w.date, buf);
 	set_label(info_stat_w.dive_time, "%d min", (dive->duration.seconds + 30) / 60);
 	if (prev_dive)
@@ -140,8 +148,11 @@ void show_dive_stats(struct dive *dive)
 	set_label(info_stat_w.max_depth, "%.*f %s", decimals, value, unit);
 	value = get_depth_units(dive->meandepth.mm, &decimals, &unit);
 	set_label(info_stat_w.avg_depth, "%.*f %s", decimals, value, unit);
-	value = get_temp_units(dive->watertemp.mkelvin, &unit);
-	set_label(info_stat_w.water_temp, "%.1f %s", value, unit);
+	if (dive->watertemp.mkelvin) {
+		value = get_temp_units(dive->watertemp.mkelvin, &unit);
+		set_label(info_stat_w.water_temp, "%.1f %s", value, unit);
+	} else
+		set_label(info_stat_w.water_temp, "");
 	value = get_volume_units(dive->sac, &decimals, &unit);
 	if (value > 0) {
 		set_label(info_stat_w.sac, "%.*f %s/min", decimals, value, unit);
@@ -175,8 +186,7 @@ void show_dive_stats(struct dive *dive)
 			gas_used += cyl->type.size.mliter / 1000.0 *
 				(cyl->start.mbar - cyl->end.mbar);
 	}
-	if (offset)
-		set_label(info_stat_w.o2he, buf);
+	set_label(info_stat_w.o2he, buf);
 	if (gas_used) {
 		value = get_volume_units(gas_used, &decimals, &unit);
 		set_label(info_stat_w.gas_used, "%.*f %s", decimals, value, unit);