From 7e09a6c7bcb135d65b3e48f2aee44791dd080443 Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Sat, 24 Sep 2016 18:02:08 +1000 Subject: 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 Signed-off-by: Dirk Hohndel --- qt-models/diveplannermodel.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 10713f36f..10f2d5f52 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -185,8 +185,10 @@ void DivePlannerPointsModel::setPlanMode(Mode m) mode = m; // the planner may reset our GF settings that are used to show deco // reset them to what's in the preferences - if (m != PLAN) + if (m != PLAN) { set_gf(prefs.gflow, prefs.gfhigh, prefs.gf_low_at_maxdepth); + set_vpmb_conservatism(prefs.vpmb_conservatism); + } } bool DivePlannerPointsModel::isPlanner() @@ -423,8 +425,10 @@ void DivePlannerPointsModel::triggerGFLow() void DivePlannerPointsModel::setVpmbConservatism(int level) { - prefs.vpmb_conservatism = level; - emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); + if (diveplan.vpmb_conservatism != level) { + diveplan.vpmb_conservatism = level; + emitDataChanged(); + } } void DivePlannerPointsModel::setSurfacePressure(int pressure) -- cgit v1.2.3-70-g09d2