HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2314:9f65e31516fe

Fix niceNumbers legacy support

Michal Klocek -

r2314:9f65e31516fe

parent child

Context file:

r2314:9f65e31516fe

Collapse all files

examples/zoomlinechart/main.cpp +4 0

             #include <QMainWindow>
             #include <qmath.h>
             #include <QLineSeries>
+            #include <QValueAxis>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 chart->setAnimationOptions(QChart::SeriesAnimations);
                 chart->legend()->hide();
                 chart->createDefaultAxes();
+                qobject_cast<QValueAxis*>(chart->axisX())->setNiceNumbersEnabled(true);
                 ChartView *chartView = new ChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
                 window.grabGesture(Qt::PinchGesture);
                 window.show();
+                qobject_cast<QValueAxis*>(chart->axisX())->setMax(600);
                 return a.exec();
             }

src/axis/valueaxis/qvalueaxis.cpp +21 -6

             void QValueAxis::setNiceNumbersEnabled(bool enable)
             {
-                Q_UNUSED(enable);
+                Q_D(QValueAxis);
-                qWarning()<<"This function is depreciated.Use applyNiceNumbers().";
+                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)
             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;
             }
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                   m_min(0),
                   m_max(0),
                   m_tickCount(5),
-                  m_format(QString::null)
+                  m_format(QString::null),
+                  m_applying(false),
+                  m_niceNumbersEnabled(false)
             {
             }
             void QValueAxisPrivate::setMax(const QVariant &max)
             {
                 Q_Q(QValueAxis);
                 bool ok;
                 qreal value = max.toReal(&ok);
                 }
                 if (changed) {
-                    emit q->rangeChanged(min, max);
                     emit rangeChanged(min,max);
+                    emit q->rangeChanged(min, max);
                 }
             }

src/axis/valueaxis/qvalueaxis_p.h +2 0

                 qreal m_max;
                 int m_tickCount;
                 QString m_format;
+                bool m_applying;
+                bool m_niceNumbersEnabled; //TODO: this depreciated
                 Q_DECLARE_PUBLIC(QValueAxis)
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages