Fix various issues

Change-Id: I4a6d4775f3ca578370a9ce23491bddcb0f5486ec
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h
index 0f82fda0..0e4492b4 100644
--- a/src/datavisualization/engine/axisrendercache_p.h
+++ b/src/datavisualization/engine/axisrendercache_p.h
@@ -80,7 +80,14 @@ public:
     inline float gridLinePosition(int index) { return m_adjustedGridLinePositions.at(index); }
     inline int gridLineCount() { return m_adjustedGridLinePositions.size(); }
     inline float labelPosition(int index) { return m_adjustedLabelPositions.at(index); }
-    inline int labelCount() { return m_adjustedLabelPositions.size(); }
+    inline int labelCount() {
+        // Some value axis formatters may opt to not show all labels,
+        // so use positions array for determining count in that case.
+        if (m_type == QAbstract3DAxis::AxisTypeValue)
+            return m_adjustedLabelPositions.size();
+        else
+            return m_labels.size();
+    }
     void updateAllPositions();
     inline bool positionsDirty() const { return m_positionsDirty; }
     inline void markPositionsDirty() { m_positionsDirty = true; }