From 9f65e31516fe9bda4fb6cd1c650dbbba2e3cae84 2012-11-28 14:28:18 From: Michal Klocek Date: 2012-11-28 14:28:18 Subject: [PATCH] Fix niceNumbers legacy support --- diff --git a/examples/zoomlinechart/main.cpp b/examples/zoomlinechart/main.cpp index 78b0d2c..2f9927b 100644 --- a/examples/zoomlinechart/main.cpp +++ b/examples/zoomlinechart/main.cpp @@ -24,6 +24,7 @@ #include #include #include +#include QTCOMMERCIALCHART_USE_NAMESPACE @@ -46,6 +47,7 @@ int main(int argc, char *argv[]) chart->setAnimationOptions(QChart::SeriesAnimations); chart->legend()->hide(); chart->createDefaultAxes(); + qobject_cast(chart->axisX())->setNiceNumbersEnabled(true); ChartView *chartView = new ChartView(chart); chartView->setRenderHint(QPainter::Antialiasing); @@ -57,5 +59,7 @@ int main(int argc, char *argv[]) window.grabGesture(Qt::PinchGesture); window.show(); + qobject_cast(chart->axisX())->setMax(600); + return a.exec(); } diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp index fefbb62..92f748e 100644 --- a/src/axis/valueaxis/qvalueaxis.cpp +++ b/src/axis/valueaxis/qvalueaxis.cpp @@ -240,14 +240,25 @@ int QValueAxis::tickCount() const void QValueAxis::setNiceNumbersEnabled(bool enable) { - Q_UNUSED(enable); - qWarning()<<"This function is depreciated.Use applyNiceNumbers()."; + Q_D(QValueAxis); + qWarning()<<"This function is depreciated, it can lead to unexpected behaviour.Use applyNiceNumbers(). "; + if(enable) { + QObject::connect(this,SIGNAL(rangeChanged(qreal,qreal)),this,SLOT(applyNiceNumbers())); + QObject::connect(this,SIGNAL(tickCountChanged(int)),this,SLOT(applyNiceNumbers())); + applyNiceNumbers(); + } + else { + QObject::disconnect(this,SIGNAL(rangeChanged(qreal,qreal)),this,SLOT(applyNiceNumbers())); + QObject::disconnect(this,SIGNAL(tickCountChanged(int)),this,SLOT(applyNiceNumbers())); + } + d->m_niceNumbersEnabled=true; } bool QValueAxis::niceNumbersEnabled() const { + Q_D(const QValueAxis); qWarning()<<"This function is depreciated.Use applyNiceNumbers()."; - return false; + return d->m_niceNumbersEnabled; } void QValueAxis::setLabelFormat(const QString &format) @@ -273,12 +284,15 @@ QAbstractAxis::AxisType QValueAxis::type() const void QValueAxis::applyNiceNumbers() { Q_D(QValueAxis); + if(d->m_applying) return; qreal min = d->m_min; qreal max = d->m_max; int ticks = d->m_tickCount; AbstractDomain::looseNiceNumbers(min,max,ticks); + d->m_applying=true; d->setRange(min,max); setTickCount(ticks); + d->m_applying=false; } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -288,7 +302,9 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q) m_min(0), m_max(0), m_tickCount(5), - m_format(QString::null) + m_format(QString::null), + m_applying(false), + m_niceNumbersEnabled(false) { } @@ -309,7 +325,6 @@ void QValueAxisPrivate::setMin(const QVariant &min) void QValueAxisPrivate::setMax(const QVariant &max) { - Q_Q(QValueAxis); bool ok; qreal value = max.toReal(&ok); @@ -349,8 +364,8 @@ void QValueAxisPrivate::setRange(qreal min, qreal max) } if (changed) { - emit q->rangeChanged(min, max); emit rangeChanged(min,max); + emit q->rangeChanged(min, max); } } diff --git a/src/axis/valueaxis/qvalueaxis_p.h b/src/axis/valueaxis/qvalueaxis_p.h index e5f41b3..aaa7037 100644 --- a/src/axis/valueaxis/qvalueaxis_p.h +++ b/src/axis/valueaxis/qvalueaxis_p.h @@ -60,6 +60,8 @@ private: qreal m_max; int m_tickCount; QString m_format; + bool m_applying; + bool m_niceNumbersEnabled; //TODO: this depreciated Q_DECLARE_PUBLIC(QValueAxis) };