diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-13 09:56:06 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-13 11:55:34 +0300 |
| commit | 200031404f12422b78e9220aeb4fa12ba8f358a7 (patch) | |
| tree | 151713f22761d693165cd8e9621b822e3c8a296b /src | |
| parent | 604d8a652cc088a4b3a4307ec291916757e03201 (diff) | |
Some changes to querying series selection
Task-number: QTRD-3047
Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0
Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
5 files changed, 10 insertions, 8 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 9995c508..02e4ff4f 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -236,7 +236,8 @@ * * Emits selection \a type when a selection is made in the graph. * - * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem() + * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem(), + * Bars3D::selectedSeries, Scatter3D::selectedSeries, Surface3D::selectedSeries * * \since Qt Data Visualization 1.1 */ diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index c394ad2f..f045a874 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -321,10 +321,10 @@ void Bars3DController::handlePendingClick() QPoint position = m_renderer->clickedPosition(); QBar3DSeries *series = static_cast<QBar3DSeries *>(m_renderer->clickedSeries()); - Abstract3DController::handlePendingClick(); - setSelectedBar(position, series, true); + Abstract3DController::handlePendingClick(); + m_renderer->resetClickedStatus(); } diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index f2942026..48d8494e 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -504,7 +504,8 @@ QImage QAbstract3DGraph::renderToImage(int msaaSamples, const QSize &imageSize) * Signal can be used for example for implementing custom input handlers, as demonstrated in this * \l {Axis Range Dragging With Labels Example}{example}. * - * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem() + * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem(), + * Q3DBars::selectedSeries(), Q3DScatter::selectedSeries(), Q3DSurface::selectedSeries() */ /*! diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index 2d38a4a7..f580244a 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -298,10 +298,10 @@ void Scatter3DController::handlePendingClick() } } - Abstract3DController::handlePendingClick(); - setSelectedItem(index, series); + Abstract3DController::handlePendingClick(); + m_renderer->resetClickedStatus(); } diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 6f27c7df..812efa3a 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -119,10 +119,10 @@ void Surface3DController::handlePendingClick() QPoint position = m_renderer->clickedPosition(); QSurface3DSeries *series = static_cast<QSurface3DSeries *>(m_renderer->clickedSeries()); - Abstract3DController::handlePendingClick(); - setSelectedPoint(position, series, true); + Abstract3DController::handlePendingClick(); + m_renderer->resetClickedStatus(); } |