[PATCH 2/2] Use user preferred units on worldmap export

Miika Turkia miika.turkia at gmail.com
Sat May 24 22:27:48 PDT 2014


We should use the temperature units preferred by the user when exporting
dive info on Worldmap.

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 worldmap-save.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/worldmap-save.c b/worldmap-save.c
index c223ca3..fe98e32 100644
--- a/worldmap-save.c
+++ b/worldmap-save.c
@@ -23,8 +23,14 @@ void put_HTML_date(struct membuffer *b, struct dive *dive)
 
 void put_HTML_temp(struct membuffer *b, struct dive *dive)
 {
-	put_temperature(b, dive->airtemp, "<p>Air Temp: ", "°C</p>");
-	put_temperature(b, dive->watertemp, "<p>Water Temp: ", "°C</p>");
+	const char *unit;
+	double value;
+
+	value = get_temp_units(dive->airtemp.mkelvin, &unit);
+	put_format(b, "<p>Air Temp: %.1f %s</p>", value, unit);
+
+	value = get_temp_units(dive->watertemp.mkelvin, &unit);
+	put_format(b, "<p>Water Temp: %.1f %s</p>", value, unit);
 }
 
 char *replace_char(char *str, char replace, char *replace_by)
-- 
1.9.1



More information about the subsurface mailing list