diff options
| author |  Rick Walsh <rickmwalsh@gmail.com> | 2016-09-24 18:02:08 +1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-09-24 08:30:11 -0700 |
| commit | 7e09a6c7bcb135d65b3e48f2aee44791dd080443 (patch) | |
| tree | d1a3620e9084cf335f711fdf0b4ca397914117a3 /core/planner.c | |
| parent | 7b891904e77364719471098a7bdf4eacc589807c (diff) | |
| download | subsurface-7e09a6c7bcb135d65b3e48f2aee44791dd080443.tar.gz | |
Separate VPM-B conservatism preference for planner and profile
Separate the VPM-B conservatism preference into diveplan.vpmb_conservatism for
planning dives and prefs.vpmb_conservatism for profile ceiling display of
saved dives.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/planner.c')
| -rw-r--r-- | core/planner.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/planner.c b/core/planner.c index e127cf11e..93aa94dbd 100644 --- a/core/planner.c +++ b/core/planner.c @@ -565,10 +565,10 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool snprintf(temp, sz_temp, translate("gettextFromC", "based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d"), diveplan->gflow, diveplan->gfhigh); } else if (prefs.deco_mode == VPMB){ - if (prefs.vpmb_conservatism == 0) + if (diveplan->vpmb_conservatism == 0) snprintf(temp, sz_temp, "%s", translate("gettextFromC", "based on VPM-B at nominal conservatism")); else - snprintf(temp, sz_temp, translate("gettextFromC", "based on VPM-B at +%d conservatism"), prefs.vpmb_conservatism); + snprintf(temp, sz_temp, translate("gettextFromC", "based on VPM-B at +%d conservatism"), diveplan->vpmb_conservatism); } else if (prefs.deco_mode == RECREATIONAL){ snprintf(temp, sz_temp, translate("gettextFromC", "recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"), diveplan->gflow, diveplan->gfhigh); @@ -984,6 +984,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool bool decodive = false; set_gf(diveplan->gflow, diveplan->gfhigh, prefs.gf_low_at_maxdepth); + set_vpmb_conservatism(diveplan->vpmb_conservatism); if (!diveplan->surface_pressure) diveplan->surface_pressure = SURFACE_PRESSURE; displayed_dive.surface_pressure.mbar = diveplan->surface_pressure; |