diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-29 14:01:42 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-30 10:06:08 +0200 |
| commit | 84c156d3e2fcceeab608f401fbc638f2d01219b3 (patch) | |
| tree | 74de2de1635c60645f4864d08f6afb941948aea8 /src/datavisualization/engine/q3dbars.cpp | |
| parent | 233d5c02638903e96687d580ada7188f0e6a9756 (diff) | |
Selection overhaul
Selection modes are now proper flags, so you can easily mix and match
item, row, and column modes as you wish. Slice flag means automatic
slicing control - if user wishes to control slicing himself, he should
not set this mode flag.
Clicking an item on graph now emits clicked signal from renderer to
controller on all graphs instead of setting the selected item.
Controller will set the selected item based on this information.
Task-number: QTRD-2366
Task-number: QTRD-2491
Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dbars.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dbars.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index d6b48e03..086bfc82 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -102,8 +102,8 @@ Q3DBars::Q3DBars() { setVisualController(d_ptr->m_shared); d_ptr->m_shared->initializeOpenGL(); - QObject::connect(d_ptr->m_shared, &Bars3DController::selectedBarPosChanged, this, - &Q3DBars::selectedBarPosChanged); + QObject::connect(d_ptr->m_shared, &Bars3DController::selectedBarChanged, this, + &Q3DBars::selectedBarChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::needRender, this, &Q3DWindow::renderLater); } @@ -297,12 +297,12 @@ QColor Q3DBars::barColor() const * Sets bar selection \a mode to one of \c QDataVis::SelectionMode. It is preset to * \c QDataVis::SelectionModeItem by default. */ -void Q3DBars::setSelectionMode(QDataVis::SelectionMode mode) +void Q3DBars::setSelectionMode(QDataVis::SelectionFlags mode) { d_ptr->m_shared->setSelectionMode(mode); } -QDataVis::SelectionMode Q3DBars::selectionMode() const +QDataVis::SelectionFlags Q3DBars::selectionMode() const { return d_ptr->m_shared->selectionMode(); } @@ -398,20 +398,21 @@ bool Q3DBars::isBackgroundVisible() const } /*! - * \property Q3DBars::selectedBarPos + * \property Q3DBars::selectedBar * - * Selects a bar in a \a position. The position is the position in data window. + * Selects a bar in a \a position. The position is the (row, column) position in + * the data array of the active data proxy. * Only one bar can be selected at a time. * To clear selection, specify an illegal \a position, e.g. (-1, -1). */ -void Q3DBars::setSelectedBarPos(const QPoint &position) +void Q3DBars::setSelectedBar(const QPoint &position) { - d_ptr->m_shared->setSelectedBarPos(position); + d_ptr->m_shared->setSelectedBar(position); } -QPoint Q3DBars::selectedBarPos() const +QPoint Q3DBars::selectedBar() const { - return d_ptr->m_shared->selectedBarPos(); + return d_ptr->m_shared->selectedBar(); } /*! |