From cb80ff746b687a3ad29b53d9f633cbdc6b142c71 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Thu, 27 Feb 2020 19:46:48 +0100
Subject: crash fix: Don't cast to CylindersModel or CylindersModelFiltered

The tank-info-delegate cast its model to CylindersModelFiltered,
since this is what the equipment-tab uses since implementing the
filtering of unused cylinders. However, the planner users the same
delegate and still uses the unfiltered CylindersModel. This means
that the (dynamic) cast returns a null pointer and crashes.

One possibility would be to derive CylindersModelFiltered and
CylindersModel from the same class that defines virtual functions
and cast to that class.

This is a different attempt: don't cast (i.e. stay with a
QAbstractItemModel and play it via Qt's model-view system. Firstly,
replace the passInData function by a role to setData(). Secondly,
read the working-pressure and size via new columns using data().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 qt-models/cylindermodel.cpp | 55 +++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'qt-models/cylindermodel.cpp')

diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 4f5a4ab77..4c56d9914 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -236,6 +236,10 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
 			break;
 		case USE:
 			return gettextFromC::tr(cylinderuse_text[cyl->cylinder_use]);
+		case WORKINGPRESS_INT:
+			return static_cast<int>(cyl->type.workingpressure.mbar);
+		case SIZE_INT:
+			return static_cast<int>(cyl->type.size.mliter);
 		}
 		break;
 	case Qt::DecorationRole:
@@ -283,33 +287,35 @@ cylinder_t *CylindersModel::cylinderAt(const QModelIndex &index)
 	return get_cylinder(&displayed_dive, index.row());
 }
 
-// this is our magic 'pass data in' function that allows the delegate to get
-// the data here without silly unit conversions;
-// so we only implement the two columns we care about
-void CylindersModel::passInData(const QModelIndex &index, const QVariant &value)
-{
-	cylinder_t *cyl = cylinderAt(index);
-	switch (index.column()) {
-	case SIZE:
-		if (cyl->type.size.mliter != value.toInt()) {
-			cyl->type.size.mliter = value.toInt();
-			dataChanged(index, index);
-		}
-		break;
-	case WORKINGPRESS:
-		if (cyl->type.workingpressure.mbar != value.toInt()) {
-			cyl->type.workingpressure.mbar = value.toInt();
-			dataChanged(index, index);
-		}
-		break;
-	}
-}
-
 bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
 	QString vString;
 
 	cylinder_t *cyl = cylinderAt(index);
+	if (!cyl)
+		return false;
+
+	if (role == PASS_IN_ROLE) {
+		// this is our magic 'pass data in' function that allows the delegate to get
+		// the data here without silly unit conversions;
+		// so we only implement the two columns we care about
+		switch (index.column()) {
+		case SIZE:
+			if (cyl->type.size.mliter != value.toInt()) {
+				cyl->type.size.mliter = value.toInt();
+				dataChanged(index, index);
+			}
+			return true;
+		case WORKINGPRESS:
+			if (cyl->type.workingpressure.mbar != value.toInt()) {
+				cyl->type.workingpressure.mbar = value.toInt();
+				dataChanged(index, index);
+			}
+			return true;
+		}
+		return false;
+	}
+
 	switch (index.column()) {
 	case TYPE:
 		if (!value.isNull()) {
@@ -641,11 +647,6 @@ void CylindersModelFiltered::remove(QModelIndex index)
 	source.remove(mapToSource(index));
 }
 
-void CylindersModelFiltered::passInData(const QModelIndex &index, const QVariant &value)
-{
-	source.passInData(mapToSource(index), value);
-}
-
 cylinder_t *CylindersModelFiltered::cylinderAt(const QModelIndex &index)
 {
 	return source.cylinderAt(mapToSource(index));
-- 
cgit v1.2.3-70-g09d2