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, 4 insertions, 5 deletions

diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index 418dba77..61454bd8 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -164,11 +164,10 @@ void Drawer::drawSurfaceGrid(ShaderHelper *shader, SurfaceObject *object)
 void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
                        const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                        const QVector3D &positionComp, const QVector3D &rotation,
-                       GLfloat itemHeight, QDataVis::SelectionMode mode,
+                       GLfloat itemHeight, QDataVis::SelectionFlags mode,
                        ShaderHelper *shader, ObjectHelper *object,
-                       const Q3DCamera *camera,
-                       bool useDepth, bool rotateAlong,
-                       LabelPosition position, Qt::AlignmentFlag alignment)
+                       const Q3DCamera *camera, bool useDepth, bool rotateAlong,
+                       LabelPosition position, Qt::AlignmentFlag alignment, bool isSlicing)
 {
     // Draw label
     if (!labelItem.textureId())
@@ -275,7 +274,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
         xPosition = item.translation().x();
         if (useDepth)
             zPosition = item.translation().z();
-        else if (QDataVis::SelectionModeSliceColumn == mode)
+        else if (mode.testFlag(QDataVis::SelectionColumn) && isSlicing)
             xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left
     }