QBarDataProxy now has list of row and column labels

Category axes use those labels if no explicit labels are set to them.

+ Other misc fixes

Task-number: QTRD-2252
Change-Id: Idc15e0cc1cdeb08195b2e2baeead9cfef2533e04
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index ec922f2b..07a802cd 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -88,7 +88,17 @@ void BarItemModelHandler::resolveModel()
         }
     }
 
-    m_proxy->resetArray(newProxyArray);
+    // Generate labels from headers if using model rows/columns
+    QStringList rowLabels;
+    QStringList columnLabels;
+    if (useModelRows) {
+        for (int i = 0; i < rowCount; i++)
+            rowLabels << m_itemModel->headerData(i, Qt::Vertical).toString();
+        for (int i = 0; i < columnCount; i++)
+            columnLabels << m_itemModel->headerData(i, Qt::Horizontal).toString();
+    }
+
+    m_proxy->resetArray(newProxyArray, rowLabels, columnLabels);
 }
 
 QT_DATAVISUALIZATION_END_NAMESPACE