HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2746:4909289ecbd7

Fix clicked, released and doubleClicked signal points...

Titta Heikkala -

r2746:4909289ecbd7

parent child

Context file:

r2746:4909289ecbd7

Collapse all files

src/charts/areachart/areachartitem.cpp +4 -4

             void AreaChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit released(m_upper->domain()->calculateDomainPoint(event->pos()));
+                emit released(m_upper->domain()->calculateDomainPoint(m_lastMousePos));
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
-                    emit clicked(m_upper->domain()->calculateDomainPoint(event->pos()));
+                    emit clicked(m_upper->domain()->calculateDomainPoint(m_lastMousePos));
                 m_mousePressed = false;
                 ChartItem::mouseReleaseEvent(event);
             }
             void AreaChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit doubleClicked(m_upper->domain()->calculateDomainPoint(event->pos()));
+                emit doubleClicked(m_upper->domain()->calculateDomainPoint(m_lastMousePos));
                 ChartItem::mouseDoubleClickEvent(event);
             }

src/charts/areachart/qareaseries.cpp +19 -6

             /*!
                 \fn void QAreaSeries::clicked(const QPointF& point)
-                \brief Signal is emitted when user clicks the \a point on area chart.
+                \brief Signal is emitted when user clicks the \a point on area chart. The \a point is the point
+                where the press was triggered.
+                \sa pressed, released, doubleClicked
             */
             /*!
                 \qmlsignal AreaSeries::onClicked(QPointF point)
-                Signal is emitted when user clicks the \a point on area chart.
+                Signal is emitted when user clicks the \a point on area chart. The \a point is the point where
+                the press was triggered.
+                \sa onPressed, onReleased, onDoubleClicked
             */
             /*!
             /*!
                 \fn void QAreaSeries::pressed(const QPointF& point)
                 \brief Signal is emitted when user presses the \a point on area chart.
+                \sa clicked, released, doubleClicked
             */
             /*!
                 \qmlsignal AreaSeries::onPressed(QPointF point)
                 Signal is emitted when user presses the \a point on area chart.
+                \sa onClicked, onReleased, onDoubleClicked
             */
             /*!
                 \fn void QAreaSeries::released(const QPointF& point)
-                \brief Signal is emitted when user releases the \a point on area chart.
+                \brief Signal is emitted when user releases a press that was triggered on a \a point on area
+                chart.
+                \sa pressed, clicked, doubleClicked
             */
             /*!
                 \qmlsignal AreaSeries::onReleased(QPointF point)
-                Signal is emitted when user releases the \a point on area chart.
+                Signal is emitted when user releases a press that was triggered on a \a point on area chart.
+                \sa onPressed, onClicked, onDoubleClicked
             */
             /*!
                 \fn void QAreaSeries::doubleClicked(const QPointF& point)
-                \brief Signal is emitted when user doubleclicks the \a point on area chart.
+                \brief Signal is emitted when user doubleclicks the \a point on area chart. The \a point is the
+                point where the first press was triggered.
+                \sa pressed, released, clicked
             */
             /*!
                 \qmlsignal AreaSeries::onDoubleClicked(QPointF point)
-                Signal is emitted when user doubleclicks the \a point on area chart.
+                Signal is emitted when user doubleclicks the \a point on area chart. The \a point is the point
+                where the first press was triggered.
+                \sa onPressed, onReleased, onClicked
             */
             /*!

src/charts/barchart/bar.cpp +1 -2

             void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit pressed(m_index, m_barset);
-                m_lastMousePos = event->pos();
                 m_mousePressed = true;
                 QGraphicsItem::mousePressEvent(event);
             }
             void Bar::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit released(m_index, m_barset);
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
                     emit clicked(m_index, m_barset);
                 m_mousePressed = false;
                 QGraphicsItem::mouseReleaseEvent(event);

src/charts/barchart/bar_p.h 0 -1

                 QBarSet *m_barset;
                 bool m_hovering;
-                QPointF m_lastMousePos;
                 bool m_mousePressed;
             };

src/charts/boxplotchart/boxwhiskers.cpp +3 -2

             void BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
+                Q_UNUSED(event)
                 emit pressed(m_boxSet);
-                m_lastMousePos = event->pos();
                 m_mousePressed = true;
             }
             void BoxWhiskers::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
+                Q_UNUSED(event)
                 emit released(m_boxSet);
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
                     emit clicked(m_boxSet);
             }

src/charts/boxplotchart/boxwhiskers_p.h 0 -1

                 qreal m_geometryLeft;
                 qreal m_geometryRight;
-                QPointF m_lastMousePos;
                 bool m_mousePressed;
             };

src/charts/linechart/linechartitem.cpp +4 -4

             void LineChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit XYChart::released(domain()->calculateDomainPoint(event->pos()));
+                emit XYChart::released(domain()->calculateDomainPoint(m_lastMousePos));
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
-                    emit XYChart::clicked(domain()->calculateDomainPoint(event->pos()));
+                    emit XYChart::clicked(domain()->calculateDomainPoint(m_lastMousePos));
                 m_mousePressed = false;
                 QGraphicsItem::mouseReleaseEvent(event);
             }
             void LineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit XYChart::doubleClicked(domain()->calculateDomainPoint(event->pos()));
+                emit XYChart::doubleClicked(domain()->calculateDomainPoint(m_lastMousePos));
                 QGraphicsItem::mouseDoubleClickEvent(event);
             }

src/charts/piechart/piesliceitem.cpp +1 -2

             void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit pressed(event->buttons());
-                m_lastMousePos = event->pos();
                 m_mousePressed = true;
             }
             void PieSliceItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit released(event->buttons());
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
                     emit clicked(event->buttons());
             }

src/charts/piechart/piesliceitem_p.h 0 -1

                 bool m_hovered;
                 QGraphicsTextItem *m_labelItem;
-                QPointF m_lastMousePos;
                 bool m_mousePressed;
                 friend class PieSliceAnimation;

src/charts/piechart/qpieseries.cpp 0 0

NO CONTENT: modified file

src/charts/scatterchart/scatterchartitem_p.h +2 -7

                 void markerReleased(QGraphicsItem *item);
                 void markerDoubleClicked(QGraphicsItem *item);
-                void setLastMousePosition(const QPointF pos) {m_lastMousePos = pos;}
-                QPointF lastMousePosition() const {return m_lastMousePos;}
                 void setMousePressed(bool pressed = true) {m_mousePressed = pressed;}
                 bool mousePressed() {return m_mousePressed;}
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
-                QPointF m_lastMousePos;
                 bool m_mousePressed;
             };
                 {
                     QGraphicsEllipseItem::mousePressEvent(event);
                     m_parent->markerPressed(this);
-                    m_parent->setLastMousePosition(event->pos());
                     m_parent->setMousePressed();
                 }
                 void hoverEnterEvent(QGraphicsSceneHoverEvent *event)
                 {
                     QGraphicsEllipseItem::mouseReleaseEvent(event);
                     m_parent->markerReleased(this);
-                    if (m_parent->lastMousePosition() == event->pos() && m_parent->mousePressed())
+                    if (m_parent->mousePressed())
                         m_parent->markerSelected(this);
                     m_parent->setMousePressed(false);
                 }
                 {
                     QGraphicsRectItem::mousePressEvent(event);
                     m_parent->markerPressed(this);
-                    m_parent->setLastMousePosition(event->pos());
                     m_parent->setMousePressed();
                 }
                 void hoverEnterEvent(QGraphicsSceneHoverEvent *event)
                 {
                     QGraphicsRectItem::mouseReleaseEvent(event);
                     m_parent->markerReleased(this);
-                    if (m_parent->lastMousePosition() == event->pos() && m_parent->mousePressed())
+                    if (m_parent->mousePressed())
                         m_parent->markerSelected(this);
                     m_parent->setMousePressed(false);
                 }

src/charts/splinechart/splinechartitem.cpp +4 -4

             void SplineChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit XYChart::released(domain()->calculateDomainPoint(event->pos()));
+                emit XYChart::released(domain()->calculateDomainPoint(m_lastMousePos));
-                if (m_lastMousePos == event->pos() && m_mousePressed)
+                if (m_mousePressed)
-                    emit XYChart::clicked(domain()->calculateDomainPoint(event->pos()));
+                    emit XYChart::clicked(domain()->calculateDomainPoint(m_lastMousePos));
                 m_mousePressed = false;
                 QGraphicsItem::mouseReleaseEvent(event);
             }
             void SplineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit XYChart::doubleClicked(domain()->calculateDomainPoint(event->pos()));
+                emit XYChart::doubleClicked(domain()->calculateDomainPoint(m_lastMousePos));
                 QGraphicsItem::mouseDoubleClickEvent(event);
             }

src/charts/xychart/qxyseries.cpp +19 -6

             /*!
                 \fn void QXYSeries::clicked(const QPointF& point)
-                \brief Signal is emitted when user clicks the \a point on chart.
+                \brief Signal is emitted when user clicks the \a point on chart. The \a point is the point
+                where the press was triggered.
+                \sa pressed, released, doubleClicked
             */
             /*!
                 \qmlsignal XYSeries::onClicked(QPointF point)
-                Signal is emitted when user clicks the \a point on chart. For example:
+                Signal is emitted when user clicks the \a point on chart. The \a point is the point where the
+                press was triggered. For example:
                 \code
                 LineSeries {
                     XYPoint { x: 0; y: 0 }
                     onClicked: console.log("onClicked: " + point.x + ", " + point.y);
                 }
                 \endcode
+                \sa onPressed, onReleased, onDoubleClicked
             */
             /*!
             /*!
                 \fn void QXYSeries::pressed(const QPointF& point)
                 \brief Signal is emitted when user presses the \a point on chart.
+                \sa clicked, released, doubleClicked
             */
             /*!
                 \qmlsignal XYSeries::onPressed(QPointF point)
                     onPressed: console.log("onPressed: " + point.x + ", " + point.y);
                 }
                 \endcode
+                \sa onClicked, onReleased, onDoubleClicked
             */
             /*!
                 \fn void QXYSeries::released(const QPointF& point)
-                \brief Signal is emitted when user releases the \a point on chart.
+                \brief Signal is emitted when user releases a press that was triggered on a \a point on chart.
+                \sa pressed, clicked, doubleClicked
             */
             /*!
                 \qmlsignal XYSeries::onReleased(QPointF point)
-                Signal is emitted when user releases the \a point on chart. For example:
+                Signal is emitted when user releases a press that was triggered on a \a point on chart.
+                For example:
                 \code
                 LineSeries {
                     XYPoint { x: 0; y: 0 }
                     onReleased: console.log("onReleased: " + point.x + ", " + point.y);
                 }
                 \endcode
+                \sa onPressed, onClicked, onDoubleClicked
             */
             /*!
                 \fn void QXYSeries::doubleClicked(const QPointF& point)
-                \brief Signal is emitted when user doubleclicks the \a point on chart.
+                \brief Signal is emitted when user doubleclicks the \a point on chart. The \a point is the
+                point where the first press was triggered.
+                \sa pressed, released, clicked
             */
             /*!
                 \qmlsignal XYSeries::onDoubleClicked(QPointF point)
-                Signal is emitted when user doubleclicks the \a point on chart. For example:
+                Signal is emitted when user doubleclicks the \a point on chart. The \a point is the point where
+                the first press was triggered. For example:
                 \code
                 LineSeries {
                     XYPoint { x: 0; y: 0 }
                     onDoubleClicked: console.log("onDoubleClicked: " + point.x + ", " + point.y);
                 }
                 \endcode
+                \sa onPressed, onReleased, onClicked
             */
             /*!

tests/auto/qlineseries/tst_qlineseries.cpp +2 0

                 QSignalSpy seriesSpy(lineSeries, SIGNAL(doubleClicked(QPointF)));
                 QPointF checkPoint = view.chart()->mapToPosition(linePoint);
+                // mouseClick needed first to save the position
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint());
                 QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint());
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);

tests/auto/qsplineseries/tst_qsplineseries.cpp +2 0

                 QSignalSpy seriesSpy(splineSeries, SIGNAL(doubleClicked(QPointF)));
                 QPointF checkPoint = view.chart()->mapToPosition(splinePoint);
+                // mouseClick needed first to save the position
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint());
                 QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint());
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);

tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +5 -4

                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onBorderWidthChanged:       console.log("scatterSeries.onBorderChanged: " + borderWidth);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);
-                    onPointLabelsVisibilityChanged:  console.log("lineSeries.onPointLabelsVisibilityChanged: "
+                    onPointLabelsVisibilityChanged:  console.log("scatterSeries.onPointLabelsVisibilityChanged: "
                                                                  + visible);
-                    onPointLabelsFormatChanged:      console.log("lineSeries.onPointLabelsFormatChanged: "
+                    onPointLabelsFormatChanged:      console.log("scatterSeries.onPointLabelsFormatChanged: "
                                                                  + format);
-                    onPointLabelsFontChanged:        console.log("lineSeries.onPointLabelsFontChanged: "
+                    onPointLabelsFontChanged:        console.log("scatterSeries.onPointLabelsFontChanged: "
                                                                  + font.family);
-                    onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
+                    onPointLabelsColorChanged:       console.log("scatterSeries.onPointLabelsColorChanged: "
                                                                  + color);
                     onPressed:          console.log(name + ".onPressed: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onDoubleClicked:    console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);
                 }
             }

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