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

Display divetime according to dive mode and translation

Browse source 
Many time stats in maintab display also seconds in short freediving

Signed-off-by: Giorgio Marzano <marzano.giorgio@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Giorgio Marzano 2015-10-11 15:37:28 +02:00 • committed by Dirk Hohndel
parent 166d587197
commit 44bdcffcd4
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
statistics.c
View file

@ -207,7 +207,7 @@ void process_selected_dives(void)
stats_selection.selection_size = nr;
}
char *get_time_string(int seconds, int maxdays)
char *get_time_string_s(int seconds, int maxdays, bool freediving)
{
static char buf[80];
if (maxdays && seconds > 3600 * 24 * maxdays) {
@ -216,10 +216,14 @@ char *get_time_string(int seconds, int maxdays)
int days = seconds / 3600 / 24;
int hours = (seconds - days * 3600 * 24) / 3600;
int minutes = (seconds - days * 3600 * 24 - hours * 3600) / 60;
int secs = (seconds - days * 3600 * 24 - hours * 3600 - minutes*60);
if (days > 0)
snprintf(buf, sizeof(buf), translate("gettextFromC", "%dd %dh %dmin"), days, hours, minutes);
else
snprintf(buf, sizeof(buf), translate("gettextFromC", "%dh %dmin"), hours, minutes);
if (freediving && seconds < 3600)
snprintf(buf, sizeof(buf), translate("gettextFromC", "%dmin %dsecs"), minutes, secs);
else
snprintf(buf, sizeof(buf), translate("gettextFromC", "%dh %dmin"), hours, minutes);
}
return buf;
}