Row/colun selection using axis labels, part 1

Task-number: QTRD-2981

+ Bars done
+ Scatter done (= no label selection)
- Surface to be done

Change-Id: Icd352e40ad6d0ada76380f3dba742f280fd278b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 2c0417e4..3e7e5178 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -143,6 +143,10 @@ private:
 
     void drawSlicedScene();
     void drawScene(GLuint defaultFboHandle);
+    void drawLabels(bool drawSelection, const Q3DCamera *activeCamera,
+                    const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionMatrix,
+                    GLfloat rowScaleFactor, GLfloat columnScaleFactor,
+                    bool barSelectionFound, BarRenderItem *selectedBar);
 
     void loadBackgroundMesh();
     void loadGridLineMesh();
@@ -158,8 +162,8 @@ private:
     void calculateSceneScalingFactors();
     void calculateHeightAdjustment();
     Abstract3DController::SelectionType isSelected(int row, int bar, int seriesIndex);
-    QPoint selectionColorToArrayPosition(const QVector3D &selectionColor);
-    QBar3DSeries *selectionColorToSeries(const QVector3D &selectionColor);
+    QPoint selectionColorToArrayPosition(const QVector4D &selectionColor);
+    QBar3DSeries *selectionColorToSeries(const QVector4D &selectionColor);
 
     Q_DISABLE_COPY(Bars3DRenderer)