From fe3c9ec0a9fb734e83eb70bc725c303a9d36cd6d Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 28 Mar 2014 14:51:26 +0200
Subject: Axis formatter customization example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/datavisualization/axis/qvalue3daxisformatter.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/datavisualization/axis/qvalue3daxisformatter.h')

diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h
index 970087d3..5ecc798d 100644
--- a/src/datavisualization/axis/qvalue3daxisformatter.h
+++ b/src/datavisualization/axis/qvalue3daxisformatter.h
@@ -22,6 +22,8 @@
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
+#include <QtCore/QVector>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -31,7 +33,6 @@ class QValue3DAxis;
 class QT_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject
 {
     Q_OBJECT
-
 protected:
     explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = 0);
 public:
@@ -39,11 +40,13 @@ public:
     virtual ~QValue3DAxisFormatter();
 
 protected:
-    virtual bool allowNegatives() const;
-    virtual bool allowZero() const;
+    void setAllowNegatives(bool allow);
+    bool allowNegatives() const;
+    void setAllowZero(bool allow);
+    bool allowZero() const;
+
     virtual QValue3DAxisFormatter *createNewInstance() const;
     virtual void recalculate();
-    virtual QString labelForIndex(int index) const;
     virtual QString stringForValue(qreal value, const QString &format) const;
     virtual float positionAt(float value) const;
     virtual float valueAt(float position) const;
@@ -55,7 +58,7 @@ protected:
     QVector<float> &gridPositions() const;
     QVector<float> &subGridPositions() const;
     QVector<float> &labelPositions() const;
-    QVector<qreal> &labelValues() const;
+    QStringList &labelStrings() const;
 
     QScopedPointer<QValue3DAxisFormatterPrivate> d_ptr;
 
-- 
cgit v1.2.3