HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1747:19ac79b0cec7

Fixes mouse handling in base class of chartseries

Michal Klocek -

r1747:19ac79b0cec7

parent child

Context file:

r1747:19ac79b0cec7

src/areachart/areachartitem.cpp +1 0

             void AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit clicked(m_upper->calculateDomainPoint(event->pos()));
+                ChartItem::mousePressEvent(event);
             }
             #include "moc_areachartitem_p.cpp"

src/barchart/bar.cpp +2 0

             {
                 Q_UNUSED(event)
                 emit clicked(m_index, m_barset);
+                QGraphicsItem::mousePressEvent(event);
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
                 Q_UNUSED(event)
                 m_hovering = true;
                 emit hovered(true, m_barset);
             }
             void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)

src/chartpresenter_p.h +4 -2

             public:
                 enum ZValues {
                     BackgroundZValue = -1,
-                    ShadesZValue,
+                    ShadesZValue ,
                     GridZValue,
                     SeriesZValue,
                     LineChartZValue = SeriesZValue,
+                    SplineChartZValue = SeriesZValue,
                     BarSeriesZValue = SeriesZValue,
                     ScatterSeriesZValue = SeriesZValue,
                     PieSeriesZValue = SeriesZValue,
                     AxisZValue,
-                    LegendZValue
+                    LegendZValue,
+                    TopMostZValue
                 };
                 enum State {

src/linechart/linechartitem.cpp +1 0

             void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit XYChart::clicked(calculateDomainPoint(event->pos()));
+                QGraphicsItem::mousePressEvent(event);
             }
             #include "moc_linechartitem_p.cpp"

src/piechart/piesliceitem.cpp +1 0

             void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit clicked(event->buttons());
+                QGraphicsItem::mousePressEvent(event);
             }
             void PieSliceItem::setLayout(const PieSliceData &sliceData)

src/scatterchart/scatterchartitem.cpp +3 -2

                     switch (m_shape) {
                         case QScatterSeries::MarkerShapeCircle: {
-                            QGraphicsEllipseItem* i = new QGraphicsEllipseItem(0,0,m_size,m_size);
+                            QGraphicsEllipseItem* i = new QGraphicsEllipseItem(0,0,m_size,m_size,this);
                             const QRectF& rect = i->boundingRect();
                             i->setPos(-rect.width()/2,-rect.height()/2);
                             item = new Marker(i,this);
                             break;
                         }
                         case QScatterSeries::MarkerShapeRectangle: {
-                            QGraphicsRectItem* i = new QGraphicsRectItem(0,0,m_size,m_size);
+                            QGraphicsRectItem* i = new QGraphicsRectItem(0,0,m_size,m_size,this);
                             i->setPos(-m_size/2,-m_size/2);
                             item = new Marker(i,this);
                             break;
             void ScatterChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit XYChart::clicked(calculateDomainPoint(event->pos()));
+                QGraphicsItem::mousePressEvent(event);
             }
             #include "moc_scatterchartitem_p.cpp"

src/scatterchart/scatterchartitem_p.h +1 0

                {
                    Q_UNUSED(event)
                    m_parent->markerSelected(this);
+                   QAbstractGraphicsShapeItem::mousePressEvent(event);
                }
             private:

src/splinechart/splinechartitem.cpp +2 -1

                 m_pointsVisible(false),
                 m_animation(0)
             {
-                setZValue(ChartPresenter::LineChartZValue);
+                setZValue(ChartPresenter::SplineChartZValue);
                 QObject::connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 handleUpdated();
             void SplineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit XYChart::clicked(calculateDomainPoint(event->pos()));
+                QGraphicsItem::mousePressEvent(event);
             }
             #include "moc_splinechartitem_p.cpp"

General Comments 0

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

No TODOs yet

	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