FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo: remove only "non-protected" cylinders

Browse Source 
The undo-code must take care not to remove used cylinders.
To do so, extend the constructor of EditCylinderBase,
which collects the cylinders and dives to edit, by the
"nonProtectedOnly" boolean argument. If true, only those
cylinders for wich "is_cylinder_prot" returns false
will be added.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-24 10:57:36 +01:00
parent 5b7a316593
commit c4bf1ce891
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commands/command_edit.cpp
View File

@ -1053,7 +1053,7 @@ static int find_cylinder_index(const struct dive *d, const cylinder_t &cyl)
return -1;
}
EditCylinderBase::EditCylinderBase(int index, bool currentDiveOnly) :
EditCylinderBase::EditCylinderBase(int index, bool currentDiveOnly, bool nonProtectedOnly) :
EditDivesBase(currentDiveOnly),
cyl(empty_cylinder)
{
@ -1070,15 +1070,17 @@ EditCylinderBase::EditCylinderBase(int index, bool currentDiveOnly) :
for (dive *d: dives) {
if (d == current) {
if (nonProtectedOnly && is_cylinder_prot(d, index))
continue;
divesNew.push_back(d);
indexes.push_back(index);
continue;
}
int idx = find_cylinder_index(d, cyl);
if (idx >= 0) {
divesNew.push_back(d);
indexes.push_back(idx);
}
if (idx < 0 || (nonProtectedOnly && is_cylinder_prot(d, idx)))
continue;
divesNew.push_back(d);
indexes.push_back(idx);
}
dives = std::move(divesNew);
}
@ -1095,7 +1097,7 @@ bool EditCylinderBase::workToBeDone()
// ***** Remove Cylinder *****
RemoveCylinder::RemoveCylinder(int index, bool currentDiveOnly) :
EditCylinderBase(index, currentDiveOnly)
EditCylinderBase(index, currentDiveOnly, true)
{
if (dives.size() == 1)
setText(tr("Remove cylinder"));
@ -1124,7 +1126,7 @@ void RemoveCylinder::redo()
// ***** Edit Cylinder *****
EditCylinder::EditCylinder(int index, cylinder_t cylIn, bool currentDiveOnly) :
EditCylinderBase(index, currentDiveOnly),
EditCylinderBase(index, currentDiveOnly, false),
new_cyl(empty_cylinder)
{
if (dives.empty())

2
commands/command_edit.h
View File

@ -390,7 +390,7 @@ private:
class EditCylinderBase : public EditDivesBase {
protected:
EditCylinderBase(int index, bool currentDiveOnly);
EditCylinderBase(int index, bool currentDiveOnly, bool nonProtectedOnly);
~EditCylinderBase();
cylinder_t cyl;