Fix formating, do not show shit if no format set

2 files changed, 16 insertions, 6 deletions

diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index b5125a78..8c0b217b 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -363,11 +363,21 @@ void ChartAxis::createNumberLabels(QStringList &labels,qreal min, qreal max, int
     n++;
 
     QValueAxis *axis = qobject_cast<QValueAxis *>(m_chartAxis);
-    QByteArray array = axis->labelFormat().toAscii();
-    for (int i=0; i< ticks; i++) {
-        qreal value = min + (i * (max - min)/ (ticks-1));
-        QString label;
-        labels << label.sprintf(array, value);;
+
+    QString format = axis->labelFormat();
+
+    if(format.isNull()) {
+        for (int i=0; i< ticks; i++) {
+            qreal value = min + (i * (max - min)/ (ticks-1));
+            labels << QString::number(value,'f',n);
+        }
+    }
+    else {
+        QByteArray array = format.toAscii();
+        for (int i=0; i< ticks; i++) {
+            qreal value = min + (i * (max - min)/ (ticks-1));
+            labels << QString().sprintf(array, value);
+        }
     }
 }
 
diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp
index 869415d6..9d047840 100644
--- a/src/axis/valueaxis/qvalueaxis.cpp
+++ b/src/axis/valueaxis/qvalueaxis.cpp
@@ -302,7 +302,7 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis* q):
     m_max(0),
     m_tickCount(5),
     m_niceNumbers(false),
-    m_format("%g")
+    m_format(QString::null)
 {
 
 }