mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CylindersModel: don't test for planner-state in remove()

Browse source 
This is only called from the planner. Therefore, the test is
redundant.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-24 11:21:27 +01:00
parent 1f8a45db44
commit 75f37a7d10
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-models/cylindermodel.cpp
View file

@ -486,6 +486,9 @@ Qt::ItemFlags CylindersModel::flags(const QModelIndex &index) const
return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
} }
// This function is only invoked from the planner! Therefore, there is
// no need to check whether we are in the planner. Perhaps move some
// of this functionality to the planner itself.
void CylindersModel::remove(QModelIndex index) void CylindersModel::remove(QModelIndex index)
{ {
if (!d) if (!d)
@ -504,8 +507,7 @@ void CylindersModel::remove(QModelIndex index)
if (index.column() != REMOVE) if (index.column() != REMOVE)
return; return;
if ((in_planner() && DivePlannerPointsModel::instance()->tankInUse(index.row())) || if (DivePlannerPointsModel::instance()->tankInUse(index.row()))
(!in_planner() && is_cylinder_prot(d, index.row())))
return; return;
beginRemoveRows(QModelIndex(), index.row(), index.row()); beginRemoveRows(QModelIndex(), index.row(), index.row());
@ -515,7 +517,6 @@ void CylindersModel::remove(QModelIndex index)
std::vector<int> mapping = get_cylinder_map_for_remove(d->cylinders.nr + 1, index.row()); std::vector<int> mapping = get_cylinder_map_for_remove(d->cylinders.nr + 1, index.row());
cylinder_renumber(d, &mapping[0]); cylinder_renumber(d, &mapping[0]);
if (in_planner())
DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]); DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]);
changed = true; changed = true;
} }