HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2256:fb69d3a3a2fe

Added hover support to splinechart and updated callout example

Marek Rosa -

r2256:fb69d3a3a2fe

parent child

Context file:

r2256:fb69d3a3a2fe

Collapse all files

examples/callout/widget.cpp +13 0

             #include <QVBoxLayout>
             #include <QChart>
             #include <QLineSeries>
+            #include <QSplineSeries>
             #include <QGraphicsTextItem>
             #include <QGraphicsLineItem>
             #include "callout.h"
                 series->append(7, 1);
                 series->append(11, 2);
                 m_chart->addSeries(series);
+                QSplineSeries *series2 = new QSplineSeries;
+                series2->append(1.6, 1.4);
+                series2->append(2.4, 3.5);
+                series2->append(3.7, 2.5);
+                series2->append(7, 4);
+                series2->append(10, 2);
+                m_chart->addSeries(series2);
                 m_chart->createDefaultAxes();
                 m_scene = new QGraphicsScene;
                 connect(series, SIGNAL(clicked(QPointF)), this, SLOT(keepCallout()));
                 connect(series, SIGNAL(hovered(QPointF, bool)), this, SLOT(tooltip(QPointF,bool)));
+                connect(series2, SIGNAL(clicked(QPointF)), this, SLOT(keepCallout()));
+                connect(series2, SIGNAL(hovered(QPointF, bool)), this, SLOT(tooltip(QPointF,bool)));
             }
             Widget::~Widget()

src/linechart/linechartitem.cpp +4 -2

             void LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
             {
                 emit XYChart::hovered(calculateDomainPoint(event->pos()), true);
-                QGraphicsItem::hoverEnterEvent(event);
+                event->accept();
+            //    QGraphicsItem::hoverEnterEvent(event);
             }
             void LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
             {
                 emit XYChart::hovered(calculateDomainPoint(event->pos()), false);
-                QGraphicsItem::hoverEnterEvent(event);
+                event->accept();
+            //    QGraphicsItem::hoverEnterEvent(event);
             }
             #include "moc_linechartitem_p.cpp"

src/splinechart/splinechartitem.cpp +21 -2

                   m_pointsVisible(false),
                   m_animation(0)
             {
+                setAcceptHoverEvents(true);
                 setZValue(ChartPresenter::SplineChartZValue);
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
             QPainterPath SplineChartItem::shape() const
             {
-                return m_path;
+                QPainterPathStroker stroker;
+                return stroker.createStroke(m_path);
             }
             void SplineChartItem::setAnimation(SplineAnimation *animation)
                 }
                 prepareGeometryChange();
+                //    QPainterPathStroker stroker;
+                //    stroker.setWidth(m_linePen.width() / 2.0);
+                //    m_path = stroker.createStroke(splinePath);
                 m_path = splinePath;
                 m_rect = splinePath.boundingRect();
                 setPos(origin());
                 Q_UNUSED(option)
                 painter->save();
-                painter->setClipRect(clipRect());
                 painter->setPen(m_linePen);
+                //    painter->setBrush(m_linePen.color());
+                painter->setClipRect(clipRect());
                 painter->drawPath(m_path);
                 if (m_pointsVisible) {
                     painter->setPen(m_pointPen);
                 QGraphicsItem::mousePressEvent(event);
             }
+            void SplineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+            {
+                emit XYChart::hovered(calculateDomainPoint(event->pos()), true);
+                event->accept();
+            }
+            void SplineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+            {
+                emit XYChart::hovered(calculateDomainPoint(event->pos()), false);
+                event->accept();
+            }
             #include "moc_splinechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/splinechartitem_p.h +2 0

                 void updateGeometry();
                 void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index);
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
+                void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+                void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
             private:
                 QPointF calculateGeometryControlPoint(int index) const;

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