From 3661f291a4d88448c3339bdd3c2d3ad8c6090256 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Wed, 21 May 2014 15:52:24 -0300
Subject: Enable editing the 'Add dive' from the new profile.

This is highly broken in many ways - but it's the right first step.
I ported two of the most important methods from the old profile and now if
you are in add dive mode, double clicking on the new profile will
correctly add a handler on the planned dive. To see and move the handler
around, however, you need to activate the old planner.

Next step: add the handlers on the new profile.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/mainwindow.cpp             |  2 +-
 qt-ui/profile/profilewidget2.cpp | 44 ++++++++++++++++++++++++++++++++++++++++
 qt-ui/profile/profilewidget2.h   |  4 ++++
 3 files changed, 49 insertions(+), 1 deletion(-)

(limited to 'qt-ui')

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index b00d5e814..c56d02e71 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -408,11 +408,11 @@ void MainWindow::on_actionAddDive_triggered()
 	ui.InfoWidget->setCurrentIndex(0);
 	ui.InfoWidget->updateDiveInfo(selected_dive);
 	ui.InfoWidget->addDiveStarted();
-	ui.stackedWidget->setCurrentIndex(PLANNERPROFILE); // Planner.
 	ui.infoPane->setCurrentIndex(MAINTAB);
 	DivePlannerPointsModel::instance()->clear();
 	DivePlannerPointsModel::instance()->createSimpleDive();
 	ui.ListWidget->reload(DiveTripModel::CURRENT);
+	ui.newProfile->setAddState();
 }
 
 void MainWindow::on_actionRenumber_triggered()
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 6b44dff18..f0b7bc380 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -540,6 +540,30 @@ void ProfileWidget2::wheelEvent(QWheelEvent *event)
 	toolTipItem->setPos(mapToScene(toolTipPos));
 }
 
+void ProfileWidget2::mouseDoubleClickEvent(QMouseEvent *event)
+{
+	if (currentState == PLAN || currentState == ADD) {
+		DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();
+		QPointF mappedPos = mapToScene(event->pos());
+		if (isPointOutOfBoundaries(mappedPos))
+			return;
+
+		int minutes = rint(timeAxis->valueAt(mappedPos) / 60);
+		int milimeters = rint(profileYAxis->valueAt(mappedPos) / M_OR_FT(1, 1)) * M_OR_FT(1, 1);
+		plannerModel->addStop(milimeters, minutes * 60, -1, 0, 0, true);
+	}
+}
+
+bool ProfileWidget2::isPointOutOfBoundaries(const QPointF &point) const
+{
+	double xpos = timeAxis->valueAt(point);
+	double ypos = profileYAxis->valueAt(point);
+	return (xpos > timeAxis->maximum() ||
+		xpos < timeAxis->minimum() ||
+		ypos > profileYAxis->maximum() ||
+		ypos < profileYAxis->minimum());
+}
+
 void ProfileWidget2::scrollViewTo(const QPoint &pos)
 {
 	/* since we cannot use translate() directly on the scene we hack on
@@ -672,6 +696,26 @@ void ProfileWidget2::setProfileState()
 	rulerItem->setVisible(prefs.rulergraph);
 }
 
+void ProfileWidget2::setAddState()
+{
+	if (currentState == ADD)
+		return;
+
+	/* show the same stuff that the profile shows. */
+	currentState = ADD; /* enable the add state. */
+	setBackgroundBrush(QColor(Qt::blue).light());
+}
+
+void ProfileWidget2::setPlanState()
+{
+	if (currentState == PLAN)
+		return;
+
+	/* show the same stuff that the profile shows. */
+	currentState = PLAN; /* enable the add state. */
+	setBackgroundBrush(QColor(Qt::green).light());
+}
+
 extern struct ev_select *ev_namelist;
 extern int evn_allocated;
 extern int evn_used;
diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h
index a5d9eed27..1ba6e5723 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/qt-ui/profile/profilewidget2.h
@@ -68,6 +68,7 @@ public:
 	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);
+	bool isPointOutOfBoundaries(const QPointF& point) const;
 	State currentState;
 
 public
@@ -75,6 +76,8 @@ slots: // Necessary to call from QAction's signals.
 	void settingsChanged();
 	void setEmptyState();
 	void setProfileState();
+	void setPlanState();
+	void setAddState();
 	void changeGas();
 	void addBookmark();
 	void hideEvents();
@@ -88,6 +91,7 @@ protected:
 	virtual void wheelEvent(QWheelEvent *event);
 	virtual void mouseMoveEvent(QMouseEvent *event);
 	virtual void contextMenuEvent(QContextMenuEvent *event);
+	virtual void mouseDoubleClickEvent(QMouseEvent *event);
 
 private: /*methods*/
 	void fixBackgroundPos();
-- 
cgit v1.2.3-70-g09d2