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

Round up times instead of down

Browse source 
When seeing that you have 0 min left, it looks kinda wierd, so rather
round up instead of down.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2013-06-19 19:04:28 +02:00 • committed by Dirk Hohndel
parent 03657ce6a9
commit 81858167ac
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
profile.c
View file

@ -68,6 +68,7 @@ static void dump_pi (struct plot_info *pi)
} }
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y)) #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
#define DIV_UP(x,y) (((x)+(y)-1)/(y))
/* /*
* When showing dive profiles, we scale things to the * When showing dive profiles, we scale things to the
@ -1167,7 +1168,7 @@ static void plot_string(struct plot_data *entry, char *buf, int bufsize,
if (entry->ndl) { if (entry->ndl) {
/* this is a safety stop as we still have ndl */ /* this is a safety stop as we still have ndl */
if (entry->stoptime) if (entry->stoptime)
snprintf(buf, bufsize, _("%s\nSafetystop:%umin @ %.0f %s"), buf2, entry->stoptime / 60, snprintf(buf, bufsize, _("%s\nSafetystop:%umin @ %.0f %s"), buf2, DIV_UP(entry->stoptime, 60),
depthvalue, depth_unit); depthvalue, depth_unit);
else else
snprintf(buf, bufsize, _("%s\nSafetystop:unkn time @ %.0f %s"), buf2, snprintf(buf, bufsize, _("%s\nSafetystop:unkn time @ %.0f %s"), buf2,
@ -1175,7 +1176,7 @@ static void plot_string(struct plot_data *entry, char *buf, int bufsize,
} else { } else {
/* actual deco stop */ /* actual deco stop */
if (entry->stoptime) if (entry->stoptime)
snprintf(buf, bufsize, _("%s\nDeco:%umin @ %.0f %s"), buf2, entry->stoptime / 60, snprintf(buf, bufsize, _("%s\nDeco:%umin @ %.0f %s"), buf2, DIV_UP(entry->stoptime, 60),
depthvalue, depth_unit); depthvalue, depth_unit);
else else
snprintf(buf, bufsize, _("%s\nDeco:unkn time @ %.0f %s"), buf2, snprintf(buf, bufsize, _("%s\nDeco:unkn time @ %.0f %s"), buf2,
@ -1187,7 +1188,7 @@ static void plot_string(struct plot_data *entry, char *buf, int bufsize,
snprintf(buf, bufsize, _("%s\nIn deco"), buf2); snprintf(buf, bufsize, _("%s\nIn deco"), buf2);
} else if (has_ndl) { } else if (has_ndl) {
memcpy(buf2, buf, bufsize); memcpy(buf2, buf, bufsize);
snprintf(buf, bufsize, _("%s\nNDL:%umin"), buf2, entry->ndl / 60); snprintf(buf, bufsize, _("%s\nNDL:%umin"), buf2, DIV_UP(entry->ndl, 60));
} }
if (entry->cns) { if (entry->cns) {
memcpy(buf2, buf, bufsize); memcpy(buf2, buf, bufsize);