From 41224d5421f7fddd68fe4483db42250a1515e8a9 2012-06-05 12:12:24
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-06-05 12:12:24
Subject: [PATCH] Fixed coordinate bug with QScatterSeries::onClicked

---

diff --git a/examples/scatterinteractions/chartview.cpp b/examples/scatterinteractions/chartview.cpp
index 1867c99..85d7c35 100644
--- a/examples/scatterinteractions/chartview.cpp
+++ b/examples/scatterinteractions/chartview.cpp
@@ -19,6 +19,8 @@
 ****************************************************************************/
 
 #include "chartview.h"
+#include <math.h>
+#include <QDebug>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
@@ -55,6 +57,20 @@ ChartView::~ChartView()
 
 void ChartView::handleClickedPoint(const QPointF& point)
 {
-    m_scatter->remove(point);
-    m_scatter2->append(point);
+    QPointF clickedPoint = point;
+    // Find the closest point from series 1
+    QPointF closest(INT64_MAX, INT64_MAX);
+    qreal distance(INT64_MAX);
+    foreach(QPointF currentPoint, m_scatter->points()) {
+        qreal currentDistance = sqrt((currentPoint.x() - clickedPoint.x()) * (currentPoint.x() - clickedPoint.x())
+                                      + (currentPoint.y() - clickedPoint.y()) * (currentPoint.y() - clickedPoint.y()));
+        if (currentDistance < distance) {
+            distance = currentDistance;
+            closest = currentPoint;
+        }
+    }
+
+    // Remove the closes point from series 1 and append it to series 2
+    m_scatter->remove(closest);
+    m_scatter2->append(closest);
 }
diff --git a/src/scatterchart/scatterchartitem.cpp b/src/scatterchart/scatterchartitem.cpp
index e23ea7d..e721781 100644
--- a/src/scatterchart/scatterchartitem.cpp
+++ b/src/scatterchart/scatterchartitem.cpp
@@ -102,7 +102,7 @@ void ScatterChartItem::deletePoints(int count)
 
 void ScatterChartItem::markerSelected(Marker *marker)
 {
-    emit XYChart::clicked(marker->point());
+    emit XYChart::clicked(calculateDomainPoint(marker->point()));
 }
 
 void ScatterChartItem::updateGeometry()