HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1791:877b494897a0

Fixed paint and mouse event issues with QLineSeries...

Tero Ahola -

r1791:877b494897a0

parent child

Context file:

r1791:877b494897a0

Collapse all files

demos/chartinteractions/chart.cpp +12 -10

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QValuesAxis>
             #include <QAbstractAxis>
+            #include <cmath>
             #include <QDebug>
             #include "chart.h"
             Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
                 : QChart(parent, wFlags), m_series(series)
             {
                 m_clicked = false;
             }
             Chart::~Chart()
             {
             }
             void Chart::clickPoint(const QPointF &point)
             {
-                //Get all points from the series.
+                // Find the closes data point
-                QList<QPointF> points = m_series->points();
+                m_movingPoint = QPoint();
-                //Construct a small rectangle around the clicked point
+                m_clicked = false;
-                //to identify the real point clicked from the series.
+                foreach (QPointF p, m_series->points()) {
-                QRectF clickRect(point.x() - 0.5, point.y() - 0.5, 1.0, 1.0);
+                    if (distance(p, point) < distance(m_movingPoint, point)) {
-                //Find the clicked point to be moved.
-                foreach (QPointF p, points) {
-                    if (clickRect.contains(p)) {
                         m_movingPoint = p;
                         m_clicked = true;
-                        return;
                     }
                 }
             }
+            qreal Chart::distance(const QPointF &p1, const QPointF &p2)
+            {
+                return sqrt((p1.x() - p2.x()) * (p1.x() - p2.x())
+                            + (p1.y() - p2.y()) * (p1.y() - p2.y()));
+            }
             void Chart::setPointClicked(bool clicked)
             {
                m_clicked = clicked;
             }
             void Chart::handlePointMove(const QPoint &point)
             {
                 if (m_clicked) {
                     //Map the point clicked from the ChartView
                     //to the area occupied by the chart.
                     QPoint mappedPoint = point;
                     mappedPoint.setX(point.x()-this->plotArea().x());
                     mappedPoint.setY(point.y()-this->plotArea().y());
                     //Get the x- and y axis to be able to convert the mapped
                     //coordinate point to the charts scale.
                     QAbstractAxis * axisx = this->axisX();
                     QValuesAxis* haxis = 0;
                     if (axisx->type() == QAbstractAxis::AxisTypeValues)
                         haxis = qobject_cast<QValuesAxis*>(axisx);
                     QAbstractAxis * axisy = this->axisY();
                     QValuesAxis* vaxis = 0;
                     if (axisy->type() == QAbstractAxis::AxisTypeValues)
                         vaxis = qobject_cast<QValuesAxis*>(axisy);
                     if (haxis && vaxis) {
                         //Calculate the "unit" between points on the x
                         //y axis.
                         double xUnit = this->plotArea().width()/haxis->max();
                         double yUnit = this->plotArea().height()/vaxis->max();
                         //Convert the mappedPoint to the actual chart scale.
                         double x = mappedPoint.x()/xUnit;
                         double y = vaxis->max() - mappedPoint.y()/yUnit;
                         //Replace the old point with the new one.
                         m_series->replace(m_movingPoint, QPointF(x, y));
                         //Update the m_movingPoint so we are able to
                         //do the replace also during mousemoveEvent.
                         m_movingPoint.setX(x);
                         m_movingPoint.setY(y);
                     }
                 }
             }

demos/chartinteractions/chart.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef CHART_H
             #define CHART_H
             #include <QChart>
             #include <QLineSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Chart : public QChart
             {
                 Q_OBJECT
             public:
                 explicit Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0, QLineSeries *series = 0);
                 ~Chart();
             public slots:
                 void clickPoint(const QPointF &point);
             public:
                 void handlePointMove(const QPoint &point);
                 void setPointClicked(bool clicked);
             private:
+                qreal distance(const QPointF &p1, const QPointF &p2);
                 QLineSeries *m_series;
                 QPointF m_movingPoint;
                 //Boolean value to determine if an actual point in the
                 //series is clicked.
                 bool m_clicked;
             };
             #endif // CHART_H

demos/chartinteractions/main.cpp +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QMainWindow>
             #include <QLineSeries>
             #include <QValuesAxis>
             #include "chart.h"
             #include "chartview.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QLineSeries* series = new QLineSeries();
                 series->append(0, 6);
                 series->append(1, 3);
                 series->append(2, 4);
                 series->append(3, 8);
                 series->append(7, 13);
                 series->append(10, 5);
                 *series << QPointF(11, 1) << QPointF(13, 3) << QPointF(17, 6) << QPointF(18, 3) << QPointF(20, 2);
                 Chart* chart = new Chart(0, 0, series);
                 chart->legend()->hide();
                 chart->addSeries(series);
+                QPen p = series->pen();
+                p.setWidth(5);
+                series->setPen(p);
                 chart->createDefaultAxes();
                 chart->setTitle("Drag'n drop to move data points");
                 QValuesAxis *axisX = new QValuesAxis();
                 chart->setAxisX(axisX, series);
                 axisX->setRange(0, 20);
                 QValuesAxis *axisY = new QValuesAxis();
                 chart->setAxisY(axisY, series);
                 axisY->setRange(0, 13);
                 QObject::connect(series, SIGNAL(clicked(QPointF)), chart, SLOT(clickPoint(QPointF)));
                 ChartView* chartView = new ChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

src/linechart/linechartitem.cpp +19 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "linechartitem_p.h"
             #include "qlineseries.h"
             #include "qlineseries_p.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            //TODO: optimize : remove points which are not visible
+            const qreal mouseEventMinWidth(14);
             LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):
                 XYChart(series, presenter),
                 QGraphicsItem(presenter ? presenter->rootItem() : 0),
                 m_series(series),
                 m_pointsVisible(false)
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
             QRectF LineChartItem::boundingRect() const
             {
             	return m_rect;
             }
             QPainterPath LineChartItem::shape() const
             {
-                return m_path;
+                // Increase the size of the path slightly to make mouse interactions more natural
+                QPainterPathStroker s;
+                s.setCapStyle(Qt::RoundCap);
+                s.setJoinStyle(Qt::RoundJoin);
+                qreal spacing = qMax(mouseEventMinWidth, (qreal) m_linePen.width());
+                s.setWidth(spacing);
+                return s.createStroke(m_path);
             }
             void LineChartItem::updateGeometry()
             {
                 const QVector<QPointF>& points = geometryPoints();
                 if(points.size()==0)
                 {
                     prepareGeometryChange();
                     m_path = QPainterPath();
                     m_rect = QRect();
                     return;
                 }
                 QPainterPath linePath(points.at(0));
                 for(int i=1; i< points.size();i++) {
                     linePath.lineTo(points.at(i));
                 }
                 prepareGeometryChange();
                 m_path = linePath;
-                m_rect = linePath.boundingRect();
+                // When defining bounding rectangle,
+                // 1. take the line width into account (otherwise you will get drawing artifacts) and
+                // 2. take the shape into account (otherwise you will not get mouse events through on border
+                // areas).
+                const qreal sqrtOf2 = 1.414214;
+                const qreal spacing = qMax(mouseEventMinWidth / 2.0,
+                                           sqrtOf2 * (qreal) m_linePen.width() / 2.0);
+                m_rect = m_path.boundingRect().adjusted(-spacing, -spacing, spacing, spacing);
                 setPos(origin());
             }
             void LineChartItem::handleUpdated()
             {
                 setVisible(m_series->isVisible());
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
                 m_pointPen = m_series->pen();
                 m_pointPen.setWidthF(2*m_pointPen.width());
                 update();
             }
-            //painter
             void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
                 painter->save();
                 painter->setPen(m_linePen);
                 painter->setClipRect(clipRect());
                 // Draw lines
                 const QVector<QPointF> &points = geometryPoints();
                 for (int i(1); i < points.size();i++)
                     painter->drawLine(points.at(i-1), points.at(i));
                 // Draw points
                 if (m_pointsVisible){
                     painter->setPen(m_pointPen);
                     painter->drawPoints(geometryPoints());
                 }
                 painter->restore();
             }
             void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit XYChart::clicked(calculateDomainPoint(event->pos()));
                 QGraphicsItem::mousePressEvent(event);
             }
             #include "moc_linechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechartitem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef LINECHARTITEM_H
             #define LINECHARTITEM_H
             #include "qchartglobal.h"
             #include "xychart_p.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLineSeries;
             class ChartPresenter;
             class LineChartItem :  public XYChart , public QGraphicsItem
             {
                  Q_OBJECT
                  Q_INTERFACES(QGraphicsItem)
             public:
                  explicit LineChartItem(QLineSeries *series,ChartPresenter *presenter);
-                ~LineChartItem() {};
+                ~LineChartItem() {}
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
             public Q_SLOTS:
                 void handleUpdated();
             protected:
                 void updateGeometry();
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
             private:
                 QLineSeries* m_series;
                 QPainterPath m_path;
                 QRectF m_rect;
                 QPen m_linePen;
                 QPen m_pointPen;
                 bool m_pointsVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages