UI restructure: plotDive should just take one dive

We don't have a concept of what to do when plotting multiple dives, so
let's not pretend and remove all the messing around with lists.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 8 insertions, 15 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index e5bfdd08b..c961ff8e2 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -175,13 +175,7 @@ void MainWindow::current_dive_changed(int divenr)
 		select_dive(divenr);
 		ui.globe->centerOnCurrentDive();
 	}
-
-	/* It looks like it's a bit too cumberstone to send *one* dive using a QList,
-	 * but this is just futureproofness, it's the best way in the future to show more than
-	 * a single profile plot on the canvas. I know that we are using only one right now,
-	 * but let's keep like this so it's easy to change when we need? :)
-	 */
-	ui.newProfile->plotDives(QList<dive *>() << (current_dive));
+	ui.newProfile->plotDive(current_dive);
 	ui.InfoWidget->updateDiveInfo(divenr);
 }
 
@@ -656,16 +650,16 @@ void MainWindow::on_actionPreviousDC_triggered()
 {
 	unsigned nrdc = number_of_computers(current_dive);
 	dc_number = (dc_number + nrdc - 1) % nrdc;
+	ui.newProfile->plotDive(current_dive);
 	ui.InfoWidget->updateDiveInfo(selected_dive);
-	ui.newProfile->plotDives(QList<struct dive *>() << (current_dive));
 }
 
 void MainWindow::on_actionNextDC_triggered()
 {
 	unsigned nrdc = number_of_computers(current_dive);
 	dc_number = (dc_number + 1) % nrdc;
+	ui.newProfile->plotDive(current_dive);
 	ui.InfoWidget->updateDiveInfo(selected_dive);
-	ui.newProfile->plotDives(QList<struct dive *>() << (current_dive));
 }
 
 void MainWindow::on_actionFullScreen_triggered(bool checked)
diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp
index 159b51822..e0bb4995f 100644
--- a/qt-ui/printlayout.cpp
+++ b/qt-ui/printlayout.cpp
@@ -183,7 +183,7 @@ void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn)
 
 		// draw a profile
 		painter.translate((scaledW + padW) * col, (scaledH + padH) * row + yOffsetProfile);
-		profile->plotDives(QList<struct dive *>() << dive);
+		profile->plotDive(dive);
 		profile->render(&painter, QRect(0, 0, scaledW, scaledH - tableH - padPT));
 		painter.setTransform(origTransform);
 
@@ -202,7 +202,7 @@ void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn)
 	profile->setFrameStyle(profileFrameStyle);
 	profile->setPrintMode(false);
 	profile->resize(originalSize);
-	profile->plotDives(QList<struct dive *>() << current_dive);
+	profile->plotDive(current_dive);
 }
 
 /* we create a table that has a fixed height, but can stretch to fit certain width */
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index f9186daf5..b4e9c6997 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -255,7 +255,7 @@ void ProfileWidget2::replot()
 {
 	int diveId = dataModel->id();
 	dataModel->clear();
-	plotDives(QList<dive *>() << get_dive_by_uniq_id(diveId));
+	plotDive(get_dive_by_uniq_id(diveId)); // why are we doing the get diveId here???
 }
 
 void ProfileWidget2::setupItemSizes()
@@ -354,7 +354,7 @@ void ProfileWidget2::setupSceneAndFlags()
 }
 
 // Currently just one dive, but the plan is to enable All of the selected dives.
-void ProfileWidget2::plotDives(QList<dive *> dives)
+void ProfileWidget2::plotDive(struct dive *d)
 {
 	static bool firstCall = true;
 	QTime measureDuration; // let's measure how long this takes us (maybe we'll turn of TTL calculation later
@@ -362,7 +362,6 @@ void ProfileWidget2::plotDives(QList<dive *> dives)
 
 	// I Know that it's a list, but currently we are
 	// using just the first.
-	struct dive *d = dives.first();
 	if (!d)
 		return;
 
diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h
index 42d5abbcb..e2e63cb40 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/qt-ui/profile/profilewidget2.h
@@ -67,7 +67,7 @@ public:
 	};
 
 	ProfileWidget2(QWidget *parent = 0);
-	void plotDives(QList<dive *> dives);
+	void plotDive(struct dive *d);
 	virtual bool eventFilter(QObject *, QEvent *);
 	void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue);
 	void setPrintMode(bool mode, bool grayscale = false);