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>

2 files changed, 36 insertions, 29 deletions

diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
index 3d765ff2..22599fbb 100644
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ b/src/datavisualization/global/qdatavisualizationenums.h
@@ -31,9 +31,9 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
     Q_ENUMS(MeshStyle)
     Q_ENUMS(CameraPreset)
     Q_ENUMS(Theme)
-    Q_ENUMS(SelectionMode)
     Q_ENUMS(ShadowQuality)
     Q_ENUMS(LabelStyle)
+    Q_FLAGS(SelectionFlag SelectionFlags)
 
 public:
     enum InputState {
@@ -95,15 +95,18 @@ public:
         ThemeIsabelle
     };
 
-    enum SelectionMode {
-        SelectionModeNone = 0,
-        SelectionModeItem,
-        SelectionModeItemAndRow,
-        SelectionModeItemAndColumn,
-        SelectionModeItemRowAndColumn,
-        SelectionModeSliceRow,
-        SelectionModeSliceColumn
+    enum SelectionFlag {
+        SelectionNone              = 0,
+        SelectionItem              = 1,
+        SelectionRow               = 2,
+        SelectionItemAndRow        = SelectionItem | SelectionRow,
+        SelectionColumn            = 4,
+        SelectionItemAndColumn     = SelectionItem | SelectionColumn,
+        SelectionRowAndColumn      = SelectionRow | SelectionColumn,
+        SelectionItemRowAndColumn  = SelectionItem | SelectionRow | SelectionColumn,
+        SelectionSlice             = 8
     };
+    Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
 
     enum ShadowQuality {
         ShadowQualityNone = 0,
@@ -121,6 +124,8 @@ public:
         LabelStyleTransparent
     };
 };
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDataVis::SelectionFlags)
 }
 
 #endif
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
index d448953d..c3569ee4 100644
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc
@@ -130,29 +130,31 @@
 */
 
 /*!
-    \enum QtDataVisualization::QDataVis::SelectionMode
+    \enum QtDataVisualization::QDataVis::SelectionFlag
 
-    Item selection modes.
+    Item selection modes. Values of this enumeration can be combined with OR operator.
 
-    \value SelectionModeNone
+    \value SelectionNone
            Selection mode disabled.
-    \value SelectionModeItem
-           Selection selects a single item.
-    \value SelectionModeItemAndRow
-           Selection selects a single item and highlights the row it is on. In Q3DBars only.
-    \value SelectionModeItemAndColumn
-           Selection selects a single item and highlights the column it is on. In Q3DBars only.
-    \value SelectionModeItemRowAndColumn
-           Selection selects a single item and highlights the row and the column it is on. In
-           Q3DBars only.
-    \value SelectionModeSliceRow
-           Selection selects a single item and displays the row it is on in a separate view. The
-           original view is shrunk into upper left corner. Original view is restored by clicking
-           on it. In Q3DBars only.
-    \value SelectionModeSliceColumn
-           Selection selects a single item and displays the column it is on in a separate view. The
-           original view is shrunk into upper left corner. Original view is restored by clicking
-           on it. In Q3DBars only.
+    \value SelectionItem
+           Selection highlights a single item.
+    \value SelectionRow
+           Selection highlights a single row.
+    \value SelectionItemAndRow
+           Combination flag for highlighting both item and row with different colors.
+    \value SelectionColumn
+           Selection highlights a single column.
+    \value SelectionItemAndColumn
+           Combination flag for highlighting both item and column with different colors.
+    \value SelectionRowAndColumn
+           Combination flag for highlighting both row and column.
+    \value SelectionItemRowAndColumn
+           Combination flag for highlighting item, row, and column.
+    \value SelectionSlice
+           Setting this mode flag indicates that the graph should take care of the slice view handling
+           automatically. If you wish to control the slice view yourself via Q3DScene, do not set this
+           flag. When setting this mode flag, either \c SelectionRow or \c SelectionColumn must also
+           be set, but not both. Slicing is supported by Q3DBars and Q3DSurface only.
 */
 
 /*!