From 8fd1c72f040cd2b3163de31c4f48659366979a39 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Sun, 8 Oct 2017 17:37:15 +0200 Subject: Removing cylinders in planner: Be more restrictive Be even more restrictive regarding which cylinders can be removed from the cylinder table in the planner. Only if a cyliner is not used in the planned part of the dive it can be removed. It doesn't matter if there is another cylinder with same gasmix. Signed-off-by: Stefan Fuchs --- qt-models/cylindermodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-models') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 594df658c..d0675ed8a 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -242,7 +242,7 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i)) same_gas = i; } - if (same_gas == -1 && + if ((in_planner() || same_gas == -1) && ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && DivePlannerPointsModel::instance()->tankInUse(index.row())) || (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && @@ -265,7 +265,7 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i)) same_gas = i; } - if (same_gas == -1 && + if ((in_planner() || same_gas == -1) && ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && DivePlannerPointsModel::instance()->tankInUse(index.row())) || (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && @@ -569,7 +569,7 @@ void CylindersModel::remove(const QModelIndex &index) if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i)) same_gas = i; } - if (same_gas == -1 && + if ((in_planner() || same_gas == -1) && ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && DivePlannerPointsModel::instance()->tankInUse(index.row())) || (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && -- cgit v1.2.3-70-g09d2