Adapt the ToolTip to work on the new profile

With this patch the tooltip is ready to work on the new profile, we just
need to actually use it.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

5 files changed, 54 insertions, 2 deletions

diff --git a/profile.c b/profile.c
index 6a20dce24..f947b9d59 100644
--- a/profile.c
+++ b/profile.c
@@ -1538,6 +1538,20 @@ void get_plot_details(struct graphics_context *gc, int time, char *buf, int bufs
 		plot_string(entry, buf, bufsize, pi->has_ndl);
 }
 
+void get_plot_details_new(struct plot_info *pi, int time, char *buf, int bufsize)
+{
+	struct plot_data *entry = NULL;
+	int i;
+
+	for (i = 0; i < pi->nr; i++) {
+		entry = pi->entry + i;
+		if (entry->sec >= time)
+			break;
+	}
+	if (entry)
+		plot_string(entry, buf, bufsize, pi->has_ndl);
+}
+
 /* Compare two plot_data entries and writes the results into a string */
 void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum)
 {
diff --git a/profile.h b/profile.h
index 7270edad9..6a6936dbe 100644
--- a/profile.h
+++ b/profile.h
@@ -54,6 +54,7 @@ struct plot_data *populate_plot_entries(struct dive *dive, struct divecomputer *
 struct plot_info *analyze_plot_info(struct plot_info *pi);
 void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plot_info *pi);
 void calculate_deco_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi, bool print_mode);
+void get_plot_details_new(struct plot_info *pi, int time, char *buf, int bufsize);
 
 struct ev_select {
 	char *ev_name;
diff --git a/qt-ui/profile/divetooltipitem.cpp b/qt-ui/profile/divetooltipitem.cpp
index dbc6f1df0..ffe22a820 100644
--- a/qt-ui/profile/divetooltipitem.cpp
+++ b/qt-ui/profile/divetooltipitem.cpp
@@ -1,4 +1,6 @@
 #include "divetooltipitem.h"
+#include "divecartesianaxis.h"
+#include "profile.h"
 #include <QPropertyAnimation>
 #include <QGraphicsSceneMouseEvent>
 #include <QPen>
@@ -176,7 +178,7 @@ void ToolTipItem::updateTitlePosition()
 	}
 }
 
-bool ToolTipItem::isExpanded() {
+bool ToolTipItem::isExpanded() const {
 	return status == EXPANDED;
 }
 
@@ -207,3 +209,28 @@ void ToolTipItem::readPos()
 	}
 	setPos(value);
 }
+
+void ToolTipItem::setPlotInfo(const plot_info& plot)
+{
+	pInfo = plot;
+}
+
+void ToolTipItem::setTimeAxis(DiveCartesianAxis* axis)
+{
+	timeAxis = axis;
+}
+
+void ToolTipItem::refresh(const QPointF& pos)
+{
+	clear();
+	int time = timeAxis->posAtValue( pos.x() );
+	char buffer[500];
+	get_plot_details_new(&pInfo, time, buffer, 500);
+	addToolTip(QString(buffer));
+
+	QList<QGraphicsItem*> items = scene()->items(pos, Qt::IntersectsItemShape, Qt::DescendingOrder, transform());
+	Q_FOREACH(QGraphicsItem *item, items) {
+		if (!item->toolTip().isEmpty())
+			addToolTip(item->toolTip());
+	}
+}
diff --git a/qt-ui/profile/divetooltipitem.h b/qt-ui/profile/divetooltipitem.h
index 9f7b83656..8e9573e54 100644
--- a/qt-ui/profile/divetooltipitem.h
+++ b/qt-ui/profile/divetooltipitem.h
@@ -6,7 +6,9 @@
 #include <QPair>
 #include <QRectF>
 #include <QIcon>
+#include "display.h"
 
+class DiveCartesianAxis;
 class QGraphicsLineItem;
 class QGraphicsSimpleTextItem;
 class QGraphicsPixmapItem;
@@ -33,10 +35,13 @@ public:
 	void clear();
 	void addToolTip(const QString& toolTip, const QIcon& icon = QIcon());
 	void refresh(struct graphics_context* gc, QPointF pos);
-	bool isExpanded();
+	void refresh(const QPointF& pos);
+	bool isExpanded() const;
 	void persistPos();
 	void readPos();
 	void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
+	void setTimeAxis(DiveCartesianAxis *axis);
+	void setPlotInfo(const plot_info& plot);
 public slots:
 	void setRect(const QRectF& rect);
 
@@ -49,6 +54,8 @@ private:
 	Status status;
 	QRectF rectangle;
 	QRectF nextRectangle;
+	DiveCartesianAxis *timeAxis;
+	plot_info pInfo;
 };
 
 #endif
\ No newline at end of file
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index de44e893b..400fa59aa 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -56,6 +56,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) :
 	setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
 	setMouseTracking(true);
 
+	toolTipItem->setTimeAxis(timeAxis);
 	scene()->addItem(toolTipItem);
 
 	// Creating the needed items.
@@ -387,6 +388,8 @@ void ProfileWidget2::plotDives(QList<dive*> dives)
 	int maxdepth = get_maxdepth(&pInfo);
 
 	dataModel->setDive(current_dive, pInfo);
+	toolTipItem->setPlotInfo(pInfo);
+
 	// 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->setMaximum(maxdepth);