diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-15 12:48:13 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-20 09:34:06 +0200 |
commit | 51d4a9fcba6089ba433ae126f554b50979220d07 (patch) | |
tree | 5ffdabb461efc3989224226b600a649d395ef80a /src/datavisualization/engine/bars3dcontroller_p.h | |
parent | 96995bda0da7ecf99d2ac4a4e417545c3506bf02 (diff) |
Multi series selection part 1: bars
Task-number: QTRD-2556
Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/bars3dcontroller_p.h')
-rw-r--r-- | src/datavisualization/engine/bars3dcontroller_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index f1eda225..4da6c730 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -61,6 +61,8 @@ private: // Interaction QPoint m_selectedBar; // Points to row & column in data window. + QBar3DSeries *m_selectedBarSeries; // Points to the series for which the bar is selected in + // single series selection cases. // Look'n'feel bool m_isBarSpecRelative; @@ -89,10 +91,10 @@ public: void setBarType(QDataVis::MeshStyle style, bool smooth = false); void setSelectionMode(QDataVis::SelectionFlags mode); - void setSelectedBar(const QPoint &position); - QPoint selectedBar() const; + void setSelectedBar(const QPoint &position, QBar3DSeries *series); virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust); + virtual void handleSeriesVisibilityChangedBySender(QObject *sender); static QPoint noSelectionPoint(); @@ -116,16 +118,14 @@ public slots: void handleDataColumnLabelsChanged(); // Renderer callback handlers - void handleBarClicked(const QPoint &position); - -signals: - void selectedBarChanged(QPoint position); + void handleBarClicked(const QPoint &position, QBar3DSeries *series); protected: virtual Q3DAbstractAxis *createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation); private: void adjustAxisRanges(); + void adjustSelectionPosition(QPoint &pos, const QBar3DSeries *series); Q_DISABLE_COPY(Bars3DController) |