diff options
author | Rick Walsh <rickmwalsh@gmail.com> | 2016-10-26 16:21:47 +1100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-10-27 20:36:14 -0700 |
commit | ebddf95252f4dcb52518220a684246746820a1be (patch) | |
tree | 72352fbbf83c41dd60c260ac973530b91710ca68 /core/profile.c | |
parent | a2d6bcf23fadceae28081ba055e631c886ca6603 (diff) | |
download | subsurface-ebddf95252f4dcb52518220a684246746820a1be.tar.gz |
ToolTipItem: show gf line based on correct gradient factor preferences
Calculate gfline using the gradient factor that is set by the planner
preferences when in the planner, and by the general prefs when not in the
planner. This is achieved by doing the gradient factor calculation in dive.c,
where buehlmann_config is defined.
Previously, the gfline was calculated using the general preferences gfhigh and
gflow, even when in the planner.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/profile.c')
-rw-r--r-- | core/profile.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/profile.c b/core/profile.c index 935f95ede..abe1757c4 100644 --- a/core/profile.c +++ b/core/profile.c @@ -962,10 +962,7 @@ void calculate_deco_information(struct dive *dive, struct divecomputer *dc, stru int time_stepsize = 20; entry->ambpressure = depth_to_bar(entry->depth, dive); - entry->gfline = MAX((double)prefs.gflow, (entry->ambpressure - surface_pressure) / (gf_low_pressure_this_dive - surface_pressure) * - (prefs.gflow - prefs.gfhigh) + - prefs.gfhigh) * - (100.0 - AMB_PERCENTAGE) / 100.0 + AMB_PERCENTAGE; + entry->gfline = get_gf(entry->ambpressure, dive) * (100.0 - AMB_PERCENTAGE) + AMB_PERCENTAGE; if (t0 > t1) { fprintf(stderr, "non-monotonous dive stamps %d %d\n", t0, t1); int xchg = t1; |