profile: remove ProfileScene::dataModel

All data access is now directly via the plot_info structure
owned by the ProfileScene itself.

Also removes DivePercentageItem::hColumn, which was an
artifact from the DivePlotDataModel.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

commands/command_edit.cpp

@@ -854,7 +854,7 @@ void ReplanDive::undo()
 
 	QVector<dive *> divesToNotify = { d };
 	// Note that we have to emit cylindersReset before divesChanged, because the divesChanged
-	// updates the DivePlotDataModel, which is out-of-sync and gets confused.
+	// updates the profile, which is out-of-sync and gets confused.
 	emit diveListNotifier.cylindersReset(divesToNotify);
 	emit diveListNotifier.divesChanged(divesToNotify, DiveField::DATETIME | DiveField::DURATION | DiveField::DEPTH | DiveField::MODE |
 							  DiveField::NOTES | DiveField::SALINITY | DiveField::ATM_PRESS);

profile-widget/divecartesianaxis.cpp

@@ -3,7 +3,6 @@
 #include "profile-widget/divetextitem.h"
 #include "core/qthelper.h"
 #include "core/subsurface-string.h"
-#include "qt-models/diveplotdatamodel.h"
 #include "profile-widget/animationfunctions.h"
 #include "profile-widget/divelineitem.h"
 #include "profile-widget/profilescene.h"

profile-widget/divepercentageitem.h

@@ -6,7 +6,6 @@
 struct dive;
 struct divecomputer;
 struct plot_info;
-class DivePlotDataModel;
 class DiveCartesianAxis;
 
 class DivePercentageItem : public QGraphicsPixmapItem {
@@ -16,7 +15,6 @@ public:
 private:
 	const DiveCartesianAxis &hAxis;
 	const DiveCartesianAxis &vAxis;
-	int hDataColumn;
 	double dpr;
 };
 

profile-widget/profilescene.cpp

@@ -14,7 +14,6 @@
 #include "core/qthelper.h"	// for decoMode()
 #include "core/subsurface-string.h"
 #include "core/settings/qPrefDisplay.h"
-#include "qt-models/diveplotdatamodel.h"
 #include "qt-models/diveplannermodel.h"
 #include <QAbstractAnimation>
 
@@ -92,7 +91,6 @@ ProfileScene::ProfileScene(double dpr, bool printMode, bool isGrayscale) :
 	isGrayscale(isGrayscale),
 	maxtime(-1),
 	maxdepth(-1),
-	dataModel(new DivePlotDataModel(this)),
 	profileYAxis(new DiveCartesianAxis(DiveCartesianAxis::Position::Left, true, 3, 0, TIME_GRID, Qt::red, true, true,
 				   dpr, 1.0, printMode, isGrayscale, *this)),
 	gasYAxis(new DiveCartesianAxis(DiveCartesianAxis::Position::Right, false, 1, 2, TIME_GRID, Qt::black, true, true,
@@ -191,8 +189,6 @@ ProfileScene::~ProfileScene()
 
 void ProfileScene::clear()
 {
-	dataModel->clear();
-
 	for (AbstractProfilePolygonItem *item: profileItems)
 		item->clear();
 
@@ -467,8 +463,6 @@ void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsM
 		maxdepth = newMaxDepth;
 	}
 
-	dataModel->setDive(plotInfo);
-
 	// It seems that I'll have a lot of boilerplate setting the model / axis for
 	// each item, I'll mostly like to fix this in the future, but I'll keep at this for now.
 	profileYAxis->setBounds(0.0, maxdepth);

profile-widget/profilescene.h

@@ -11,9 +11,6 @@
 #include <QPainter>
 #include <memory>
 
-class DivePlannerPointsModel;
-class DivePlotDataModel;
-
 class AbstractProfilePolygonItem;
 class DiveCalculatedCeiling;
 class DiveCalculatedTissue;
@@ -24,6 +21,7 @@ class DiveHeartrateItem;
 class DiveMeanDepthItem;
 class DivePercentageItem;
 class DivePixmaps;
+class DivePlannerPointsModel;
 class DiveProfileItem;
 class DiveReportedCeiling;
 class DiveTemperatureItem;
@@ -69,7 +67,6 @@ private:
 	int maxtime;
 	int maxdepth;
 
-	DivePlotDataModel *dataModel;
 	struct plot_info plotInfo;
 	DiveCartesianAxis *profileYAxis;
 	DiveCartesianAxis *gasYAxis;

profile-widget/profilewidget2.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "profile-widget/profilewidget2.h"
 #include "profile-widget/profilescene.h"
-#include "qt-models/diveplotdatamodel.h"
 #include "core/device.h"
 #include "core/event.h"
 #include "core/subsurface-string.h"