Fixed: axis not redrawing when labelFormat changed

9 files changed, 38 insertions, 0 deletions

diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 5cd75766..91e06ee6 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -455,6 +455,8 @@ QStringList ChartAxis::createValueLabels(qreal min, qreal max, int ticks,const Q
                       || format.contains("e", Qt::CaseInsensitive)
                       || format.contains("g", Qt::CaseInsensitive))
                 labels << QString().sprintf(array, value);
+            else
+                labels << QString();
         }
     }
 
@@ -500,6 +502,8 @@ QStringList ChartAxis::createLogValueLabels(qreal min, qreal max, qreal base, in
                       || format.contains("e", Qt::CaseInsensitive)
                       || format.contains("g", Qt::CaseInsensitive))
                 labels << QString().sprintf(array, value);
+            else
+                labels << QString();
         }
     }
 
diff --git a/src/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/axis/logvalueaxis/chartlogvalueaxisx.cpp
index 08bf48e6..c6390f1c 100644
--- a/src/axis/logvalueaxis/chartlogvalueaxisx.cpp
+++ b/src/axis/logvalueaxis/chartlogvalueaxisx.cpp
@@ -33,6 +33,7 @@ ChartLogValueAxisX::ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem* item)
       m_axis(axis)
 {
     QObject::connect(m_axis,SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
+    QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
 }
 
 ChartLogValueAxisX::~ChartLogValueAxisX()
@@ -74,6 +75,12 @@ void ChartLogValueAxisX::handleBaseChanged(qreal base)
     if(presenter()) presenter()->layout()->invalidate();
 }
 
+void ChartLogValueAxisX::handleLabelFormatChanged(const QString &format)
+{
+    Q_UNUSED(format);
+    if(presenter()) presenter()->layout()->invalidate();
+}
+
 QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(constraint)
diff --git a/src/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/axis/logvalueaxis/chartlogvalueaxisx_p.h
index a7bf49e4..af17fdcf 100644
--- a/src/axis/logvalueaxis/chartlogvalueaxisx_p.h
+++ b/src/axis/logvalueaxis/chartlogvalueaxisx_p.h
@@ -54,6 +54,7 @@ protected:
 
 private Q_SLOTS:
     void handleBaseChanged(qreal base);
+    void handleLabelFormatChanged(const QString &format);
 
 private:
     QLogValueAxis *m_axis;
diff --git a/src/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/axis/logvalueaxis/chartlogvalueaxisy.cpp
index 1fe5c55b..c93a9e5e 100644
--- a/src/axis/logvalueaxis/chartlogvalueaxisy.cpp
+++ b/src/axis/logvalueaxis/chartlogvalueaxisy.cpp
@@ -33,6 +33,7 @@ ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item)
       m_axis(axis)
 {
     QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
+    QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
 }
 
 ChartLogValueAxisY::~ChartLogValueAxisY()
@@ -74,6 +75,12 @@ void ChartLogValueAxisY::handleBaseChanged(qreal base)
     if(presenter()) presenter()->layout()->invalidate();
 }
 
+void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format)
+{
+    Q_UNUSED(format);
+    if(presenter()) presenter()->layout()->invalidate();
+}
+
 QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(constraint)
diff --git a/src/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/axis/logvalueaxis/chartlogvalueaxisy_p.h
index bc98c01a..a5fa8678 100644
--- a/src/axis/logvalueaxis/chartlogvalueaxisy_p.h
+++ b/src/axis/logvalueaxis/chartlogvalueaxisy_p.h
@@ -54,6 +54,7 @@ protected:
 
 private Q_SLOTS:
     void handleBaseChanged(qreal base);
+    void handleLabelFormatChanged(const QString &format);
 
 private:
     QLogValueAxis *m_axis;
diff --git a/src/axis/valueaxis/chartvalueaxisx.cpp b/src/axis/valueaxis/chartvalueaxisx.cpp
index 51c176d0..5cff9094 100644
--- a/src/axis/valueaxis/chartvalueaxisx.cpp
+++ b/src/axis/valueaxis/chartvalueaxisx.cpp
@@ -36,6 +36,7 @@ ChartValueAxisX::ChartValueAxisX(QValueAxis *axis, QGraphicsItem* item )
       m_axis(axis)
 {
 	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
+    QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
 }
 
 ChartValueAxisX::~ChartValueAxisX()
@@ -74,6 +75,12 @@ void ChartValueAxisX::handleTickCountChanged(int tick)
     if(presenter()) presenter()->layout()->invalidate();
 }
 
+void ChartValueAxisX::handleLabelFormatChanged(const QString &format)
+{
+    Q_UNUSED(format);
+    if(presenter()) presenter()->layout()->invalidate();
+}
+
 QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(constraint)
diff --git a/src/axis/valueaxis/chartvalueaxisx_p.h b/src/axis/valueaxis/chartvalueaxisx_p.h
index 44047f6f..b7f27a01 100644
--- a/src/axis/valueaxis/chartvalueaxisx_p.h
+++ b/src/axis/valueaxis/chartvalueaxisx_p.h
@@ -50,6 +50,8 @@ protected:
     void updateGeometry();
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
+    void handleLabelFormatChanged(const QString &format);
+
 private:
     QValueAxis *m_axis;
 };
diff --git a/src/axis/valueaxis/chartvalueaxisy.cpp b/src/axis/valueaxis/chartvalueaxisy.cpp
index 2cb4ba2d..4a3f1505 100644
--- a/src/axis/valueaxis/chartvalueaxisy.cpp
+++ b/src/axis/valueaxis/chartvalueaxisy.cpp
@@ -35,6 +35,7 @@ ChartValueAxisY::ChartValueAxisY(QValueAxis *axis, QGraphicsItem* item)
       m_axis(axis)
 {
 	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
+    QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
 }
 
 ChartValueAxisY::~ChartValueAxisY()
@@ -75,6 +76,12 @@ void ChartValueAxisY::handleTickCountChanged(int tick)
 	if(presenter()) presenter()->layout()->invalidate();
 }
 
+void ChartValueAxisY::handleLabelFormatChanged(const QString &format)
+{
+    Q_UNUSED(format);
+    if(presenter()) presenter()->layout()->invalidate();
+}
+
 QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(constraint)
diff --git a/src/axis/valueaxis/chartvalueaxisy_p.h b/src/axis/valueaxis/chartvalueaxisy_p.h
index 2cf17706..4eab2126 100644
--- a/src/axis/valueaxis/chartvalueaxisy_p.h
+++ b/src/axis/valueaxis/chartvalueaxisy_p.h
@@ -50,6 +50,8 @@ protected:
     void updateGeometry();
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
+    void handleLabelFormatChanged(const QString &format);
+
 private:
     QValueAxis *m_axis;
 };