From 1336ea755b7ad2ef18cb869ca6219a1a6e237ff9 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 3 Feb 2020 18:59:12 +0100 Subject: Planner: don't filter cylinders In the planner we used to filter out "unused" cylinders as in the equipment tab. It is unclear whether that makes sense or can even easily be reproduced, since such cylinders have to come from an imported dive. To be on the save side, let's not do this. Replace the CylindersFilteredModel introduced recently by a plain CylindersModel. Signed-off-by: Berthold Stoeger --- backend-shared/plannershared.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'backend-shared') diff --git a/backend-shared/plannershared.cpp b/backend-shared/plannershared.cpp index bc2fa58be..164c4cf46 100644 --- a/backend-shared/plannershared.cpp +++ b/backend-shared/plannershared.cpp @@ -126,7 +126,7 @@ void PlannerShared::set_o2narcotic(bool value) { qPrefDivePlanner::set_o2narcotic(value); DivePlannerPointsModel::instance()->emitDataChanged(); - DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->updateBestMixes(); } double PlannerShared::bottompo2() @@ -136,7 +136,7 @@ double PlannerShared::bottompo2() void PlannerShared::set_bottompo2(double value) { qPrefDivePlanner::set_bottompo2((int) (value * 1000.0)); - DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->updateBestMixes(); } double PlannerShared::decopo2() @@ -148,8 +148,8 @@ void PlannerShared::set_decopo2(double value) pressure_t olddecopo2; olddecopo2.mbar = prefs.decopo2; qPrefDivePlanner::instance()->set_decopo2((int) (value * 1000.0)); - DivePlannerPointsModel::instance()->cylindersModel()->model()->updateDecoDepths(olddecopo2); - DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->updateDecoDepths(olddecopo2); + DivePlannerPointsModel::instance()->cylindersModel()->updateBestMixes(); } int PlannerShared::bestmixend() @@ -159,5 +159,5 @@ int PlannerShared::bestmixend() void PlannerShared::set_bestmixend(int value) { qPrefDivePlanner::set_bestmixend(units_to_depth(value).mm); - DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->updateBestMixes(); } -- cgit v1.2.3-70-g09d2