Multi series selection part 1: bars

Task-number: QTRD-2556

Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index e8b0a0f4..85e189f8 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -197,12 +197,12 @@ void Surface3DRenderer::initializeOpenGL()
     loadBackgroundMesh();
 }
 
-void Surface3DRenderer::updateSeriesData(const QList<QAbstract3DSeries *> &seriesList)
+void Surface3DRenderer::updateData()
 {
     // Surface only supports single series for now, so we are only interested in the first series
     const QSurfaceDataArray *array = 0;
-    if (seriesList.size()) {
-        QSurface3DSeries *firstSeries = static_cast<QSurface3DSeries *>(seriesList.at(0));
+    if (m_visibleSeriesList.size()) {
+        QSurface3DSeries *firstSeries = static_cast<QSurface3DSeries *>(m_visibleSeriesList.at(0).series());
         m_cachedSurfaceVisible = firstSeries->isVisible(); // TODO: To series visuals update?
         if (m_cachedSurfaceGridOn || m_cachedSurfaceVisible) {
             QSurfaceDataProxy *dataProxy = firstSeries->dataProxy();
@@ -268,8 +268,6 @@ void Surface3DRenderer::updateSeriesData(const QList<QAbstract3DSeries *> &serie
     m_sliceDataArray.clear();
 
     m_selectionDirty = true;
-
-    Abstract3DRenderer::updateSeriesData(seriesList);
 }
 
 void Surface3DRenderer::updateSliceDataModel(const QPoint &point)
@@ -1871,7 +1869,8 @@ QPoint Surface3DRenderer::selectionIdToSurfacePoint(uint id)
 
 QString Surface3DRenderer::createSelectionLabel(qreal value, int column, int row)
 {
-    QString labelText = itemLabelFormat();
+    // TODO: Get from correct series once multiple series supported
+    QString labelText = m_visibleSeriesList[0].itemLabelFormat();
     static const QString xTitleTag(QStringLiteral("@xTitle"));
     static const QString yTitleTag(QStringLiteral("@yTitle"));
     static const QString zTitleTag(QStringLiteral("@zTitle"));