mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support for imperial depth on worldmap export

Browse source 
This will use the depth units from user preferences when exporting the
worldmap.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2016-01-10 12:12:39 +02:00 • committed by Dirk Hohndel
parent 82c87204e4
commit 7701975d98
3 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
subsurface-core/save-html.c
View file

@ -259,6 +259,29 @@ void put_HTML_time(struct membuffer *b, struct dive *dive, const char *pre, cons
put_format(b, "%s%02u:%02u:%02u%s", pre, tm.tm_hour, tm.tm_min, tm.tm_sec, post); put_format(b, "%s%02u:%02u:%02u%s", pre, tm.tm_hour, tm.tm_min, tm.tm_sec, post);
} }
void put_HTML_depth(struct membuffer *b, struct dive *dive, const char *pre, const char *post)
{
const char *unit;
double value;
struct units *units_p = get_units();
if (!dive->maxdepth.mm) {
put_format(b, "%s--%s", pre, post);
return;
}
value = get_depth_units(dive->maxdepth.mm, NULL, &unit);
switch (units_p->length) {
case METERS:
default:
put_format(b, "%s%.1f %s%s", pre, value, unit, post);
break;
case FEET:
put_format(b, "%s%.0f %s%s", pre, value, unit, post);
break;
}
}
void put_HTML_airtemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post) void put_HTML_airtemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post)
{ {
const char *unit; const char *unit;

1
subsurface-core/save-html.h
View file

@ -9,6 +9,7 @@ extern "C" {
#include "membuffer.h" #include "membuffer.h"
void put_HTML_date(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_date(struct membuffer *b, struct dive *dive, const char *pre, const char *post);
void put_HTML_depth(struct membuffer *b, struct dive *dive, const char *pre, const char *post);
void put_HTML_airtemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_airtemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post);
void put_HTML_watertemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_watertemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post);
void put_HTML_time(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_time(struct membuffer *b, struct dive *dive, const char *pre, const char *post);

6
subsurface-core/worldmap-save.c
View file

@ -40,9 +40,9 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
snprintf(pre, sizeof(pre), "<p>%s ", translate("gettextFromC", "Duration:")); snprintf(pre, sizeof(pre), "<p>%s ", translate("gettextFromC", "Duration:"));
snprintf(post, sizeof(post), " %s</p>", translate("gettextFromC", "min")); snprintf(post, sizeof(post), " %s</p>", translate("gettextFromC", "min"));
put_duration(b, dive->duration, pre, post); put_duration(b, dive->duration, pre, post);
snprintf(pre, sizeof(pre), "<p>%s ", translate("gettextFromC", "Max. depth:")); put_string(b, "<p> ");
snprintf(post, sizeof(post), " %s</p>", translate("gettextFromC", "m")); put_HTML_quoted(b, translate("gettextFromC", "Max. depth:"));
put_depth(b, dive->maxdepth, pre, post); put_HTML_depth(b, dive, " ", "</p>");
put_string(b, "<p> "); put_string(b, "<p> ");
put_HTML_quoted(b, translate("gettextFromC", "Air temp.:")); put_HTML_quoted(b, translate("gettextFromC", "Air temp.:"));
put_HTML_airtemp(b, dive, " ", "</p>"); put_HTML_airtemp(b, dive, " ", "</p>");