Axis formatter customization example

Also refactored the formatter api somewhat:

- Removed virtual from allowNegatives and allowZero and added a
setter function for those. This will make it cleaner if we need to
add similar properties to the axis formatter in the future, as
no new virtual methods can be added without breaking BC.

- Changed the labelValues array to labelStrings list, as it makes
more sense to directly format the strings in recalculate.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h
index 7e661b62..f7fd001e 100644
--- a/src/datavisualization/axis/qvalue3daxisformatter_p.h
+++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h
@@ -29,7 +29,6 @@
 #include "datavisualizationglobal_p.h"
 #include "qvalue3daxisformatter.h"
 #include "utils_p.h"
-#include <QtCore/QVector>
 
 #ifndef QVALUE3DAXISFORMATTER_P_H
 #define QVALUE3DAXISFORMATTER_P_H
@@ -51,7 +50,6 @@ public:
     void populateCopy(QValue3DAxisFormatter &copy);
     void doPopulateCopy(QValue3DAxisFormatterPrivate &copy);
 
-    QString labelForIndex(int index) const;
     QString stringForValue(qreal value, const QString &format);
     float positionAt(float value) const;
     float valueAt(float position) const;
@@ -74,7 +72,7 @@ protected:
     QVector<float> m_gridPositions;
     QVector<float> m_subGridPositions;
     QVector<float> m_labelPositions;
-    QVector<qreal> m_labelValues;
+    QStringList m_labelStrings;
 
     QValue3DAxis *m_axis;
 
@@ -82,6 +80,9 @@ protected:
     QByteArray m_labelFormatArray;
     Utils::ParamType m_preparsedParamType;
 
+    bool m_allowNegatives;
+    bool m_allowZero;
+
     friend class QValue3DAxisFormatter;
 };