Updated strategy for removing cylinders

Change the strategy when to allow cylinder removal from a dive:
- Not remove when cylinder has gas switch events, in any other cases
  allow removal
- Remove this whole "cylinder with same gas" thing being a criteria
  for cylinder removal

When removing a cylinder which has corresponding pressure info in
samples, also remove this pressure info from the samples.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>

1 files changed, 4 insertions, 2 deletions

diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 614f194aa..9af6833f0 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -346,8 +346,10 @@ void DivePlannerPointsModel::gasChange(const QModelIndex &index, int newcylinder
 
 void DivePlannerPointsModel::cylinderRenumber(int mapping[])
 {
-	for (int i = 0; i < rowCount(); i++)
-		divepoints[i].cylinderid = mapping[divepoints[i].cylinderid];
+	for (int i = 0; i < rowCount(); i++) {
+		if (mapping[divepoints[i].cylinderid] >= 0)
+			divepoints[i].cylinderid = mapping[divepoints[i].cylinderid];
+	}
 	emitDataChanged();
 }