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

Indicate a repetitive dive in the diveplan

Browse source 
Fixes #1095

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-12-15 23:22:54 +01:00 • committed by Dirk Hohndel
parent fb2ba72e42
commit c1ef59c540
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/planner.c
View file

@ -128,7 +128,7 @@ void interpolate_transition(struct dive *dive, duration_t t0, duration_t t1, dep
}
/* returns the tissue tolerance at the end of this (partial) dive */
void tissue_at_end(struct dive *dive, char **cached_datap)
bool tissue_at_end(struct dive *dive, char **cached_datap)
{
struct divecomputer *dc;
struct sample *sample, *psample;
@ -136,18 +136,19 @@ void tissue_at_end(struct dive *dive, char **cached_datap)
depth_t lastdepth = {};
duration_t t0 = {}, t1 = {};
struct gasmix gas;
bool repetitive = false;
if (!dive)
return;
return false;
if (*cached_datap) {
restore_deco_state(*cached_datap);
} else {
init_decompression(dive);
repetitive = init_decompression(dive);
cache_deco_state(cached_datap);
}
dc = &dive->dc;
if (!dc->samples)
return;
return false;
psample = sample = dc->sample;
for (i = 0; i < dc->samples; i++, sample++) {
@ -190,6 +191,7 @@ void tissue_at_end(struct dive *dive, char **cached_datap)
psample = sample;
t0 = t1;
}
return repetitive;
}
@ -594,8 +596,10 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
snprintf(temp, sz_temp, translate("gettextFromC", "recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
diveplan->gflow, diveplan->gfhigh);
}
len += snprintf(buffer + len, sz_buffer - len, "<div><b>%s</b><br>%s</div>",
translate("gettextFromC", "Subsurface dive plan"), temp);
len += snprintf(buffer + len, sz_buffer - len, "<div><b>%s%s</b><br>%s</div>",
translate("gettextFromC", "Subsurface dive plan"),
diveplan->repetitive ? translate("gettextFromC", " (repetitive)") : "",
temp);
len += snprintf(buffer + len, sz_buffer - len, translate("gettextFromC", "<div>Runtime: %dmin</div><br>"),
diveplan_duration(diveplan));
@ -1082,7 +1086,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
gi = gaschangenr - 1;
/* Set tissue tolerance and initial vpmb gradient at start of ascent phase */
tissue_at_end(&displayed_dive, cached_datap);
diveplan->repetitive = tissue_at_end(&displayed_dive, cached_datap);
nuclear_regeneration(clock);
vpmb_start_gradient();