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/datavisualizationqml2/declarativebars.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/datavisualizationqml2/declarativebars.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativebars.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 9ed80106..52b19807 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -41,8 +41,8 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent) // Create the shared component on the main GUI thread. m_shared = new Bars3DController(boundingRect().toRect()); AbstractDeclarative::setSharedController(m_shared); - QObject::connect(m_shared, &Bars3DController::selectedBarPosChanged, this, - &DeclarativeBars::selectedBarPosChanged); + QObject::connect(m_shared, &Bars3DController::selectedBarChanged, this, + &DeclarativeBars::selectedBarChanged); QItemModelBarDataProxy *proxy = new QItemModelBarDataProxy; m_shared->setActiveDataProxy(proxy); @@ -201,14 +201,14 @@ QString DeclarativeBars::meshFileName() const return m_shared->meshFileName(); } -void DeclarativeBars::setSelectedBarPos(const QPointF &position) +void DeclarativeBars::setSelectedBar(const QPointF &position) { - m_shared->setSelectedBarPos(position.toPoint()); + m_shared->setSelectedBar(position.toPoint()); } -QPointF DeclarativeBars::selectedBarPos() const +QPointF DeclarativeBars::selectedBar() const { - return QPointF(m_shared->selectedBarPos()); + return QPointF(m_shared->selectedBar()); } QT_DATAVISUALIZATION_END_NAMESPACE |