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

Change plot scaling to handle FREEDIVE mode Add FREEDIVING value to plot_info::plot_type

Browse source 
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 12:16:48 +02:00 • committed by Dirk Hohndel
parent 44bdcffcd4
commit ba3b048292
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
display.h
View file

@ -21,7 +21,7 @@ struct plot_info {
int minpressure, maxpressure; int minpressure, maxpressure;
int minhr, maxhr; int minhr, maxhr;
int mintemp, maxtemp; int mintemp, maxtemp;
enum {AIR, NITROX, TRIMIX} dive_type; enum {AIR, NITROX, TRIMIX, FREEDIVING} dive_type;
double endtempcoord; double endtempcoord;
double maxpp; double maxpp;
bool has_ndl; bool has_ndl;

17
profile.c
View file

@ -67,6 +67,10 @@ static void dump_pi(struct plot_info *pi)
int get_maxtime(struct plot_info *pi) int get_maxtime(struct plot_info *pi)
{ {
int seconds = pi->maxtime; int seconds = pi->maxtime;
int DURATION_THR = (pi->dive_type == FREEDIVING ? 60 : 600);
int CEILING = (pi->dive_type == FREEDIVING ? 30 : 60);
if (prefs.zoomed_plot) { if (prefs.zoomed_plot) {
/* Rounded up to one minute, with at least 2.5 minutes to /* Rounded up to one minute, with at least 2.5 minutes to
* spare. * spare.
@ -74,13 +78,13 @@ int get_maxtime(struct plot_info *pi)
* calculate the space dynamically. * calculate the space dynamically.
* This is seamless since 600/4 = 150. * This is seamless since 600/4 = 150.
*/ */
if (seconds < 600) if (seconds < DURATION_THR)
return ROUND_UP(seconds + seconds / 4, 60); return ROUND_UP(seconds + seconds / 4, CEILING);
else else
return ROUND_UP(seconds + 150, 60); return ROUND_UP(seconds + DURATION_THR/4, CEILING);
} else { } else {
/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */ /* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
return MAX(30 * 60, ROUND_UP(seconds + 150, 60 * 5)); return MAX(30 * 60, ROUND_UP(seconds + DURATION_THR/4, CEILING * 5));
} }
} }
@ -1071,7 +1075,9 @@ void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plo
free((void *)last_pi_entry_new); free((void *)last_pi_entry_new);
get_dive_gas(dive, &o2, &he, &o2max); get_dive_gas(dive, &o2, &he, &o2max);
if (he > 0) { if (dc->divemode == FREEDIVE){
pi->dive_type = FREEDIVE;
} else if (he > 0) {
pi->dive_type = TRIMIX; pi->dive_type = TRIMIX;
} else { } else {
if (o2) if (o2)
@ -1079,6 +1085,7 @@ void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plo
else else
pi->dive_type = AIR; pi->dive_type = AIR;
} }
last_pi_entry_new = populate_plot_entries(dive, dc, pi); last_pi_entry_new = populate_plot_entries(dive, dc, pi);
check_gas_change_events(dive, dc, pi); /* Populate the gas index from the gas change events */ check_gas_change_events(dive, dc, pi); /* Populate the gas index from the gas change events */