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>

1 files changed, 8 insertions, 13 deletions

diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 8398dd81..2e751053 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -42,12 +42,12 @@ class QBarDataProxy;
 struct Bars3DChangeBitField {
     bool slicingActiveChanged     : 1;
     bool barSpecsChanged          : 1;
-    bool selectedBarPosChanged    : 1;
+    bool selectedBarChanged       : 1;
 
     Bars3DChangeBitField() :
         slicingActiveChanged(true),
         barSpecsChanged(true),
-        selectedBarPosChanged(true)
+        selectedBarChanged(true)
     {
     }
 };
@@ -60,7 +60,7 @@ private:
     Bars3DChangeBitField m_changeTracker;
 
     // Interaction
-    QPoint m_selectedBarPos;     // Points to row & column in data window.
+    QPoint m_selectedBar;     // Points to row & column in data window.
 
     // Look'n'feel
     bool m_isBarSpecRelative;
@@ -86,15 +86,11 @@ public:
     GLfloat barThickness();
     QSizeF barSpacing();
     bool isBarSpecRelative();
-
-    // bar type; bars (=cubes), pyramids, cones, cylinders, etc.
     void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
-    // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(QDataVis::SelectionMode mode);
-
-    void setSelectedBarPos(const QPoint &position);
-    QPoint selectedBarPos() const;
+    void setSelectionMode(QDataVis::SelectionFlags mode);
+    void setSelectedBar(const QPoint &position);
+    QPoint selectedBar() const;
 
     virtual void setActiveDataProxy(QAbstractDataProxy *proxy);
 
@@ -116,11 +112,10 @@ public slots:
     void handleItemChanged(int rowIndex, int columnIndex);
     void handleDataRowLabelsChanged();
     void handleDataColumnLabelsChanged();
-
-    void handleSelectedBarPosChanged(const QPoint &position);
+    void handleBarClicked(const QPoint &position);
 
 signals:
-    void selectedBarPosChanged(QPoint position);
+    void selectedBarChanged(QPoint position);
 
 protected:
     virtual Q3DAbstractAxis *createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation);