HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1807:d572c33906e7

QValueAxis ticksCount to tickCount

Marek Rosa -

r1807:d572c33906e7

parent child

Context file:

r1807:d572c33906e7

Collapse all files

demos/dynamicspline/chart.cpp +3 -3

                 addSeries(m_series);
                 createDefaultAxes();
                 setAxisX(m_axis,m_series);
-                m_axis->setTicksCount(5);
+                m_axis->setTickCount(5);
                 axisX()->setRange(0, 10);
                 axisY()->setRange(-5, 10);
             void Chart::handleTimeout()
             {
-                qreal x = plotArea().width()/m_axis->ticksCount();
+                qreal x = plotArea().width()/m_axis->tickCount();
-                qreal y =(m_axis->max() - m_axis->min())/m_axis->ticksCount();
+                qreal y =(m_axis->max() - m_axis->min())/m_axis->tickCount();
                 m_x += y;
                 m_y = qrand() % 5 - 2.5;
                 m_series->append(m_x, m_y);

src/axis/valueaxis/chartvalueaxisx.cpp +1 -1

             {
                 //TODO:: fix this
                 QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);
-                m_tickCount = axis->ticksCount();
+                m_tickCount = axis->tickCount();
                 ChartAxis::handleAxisUpdated();
             }

src/axis/valueaxis/chartvalueaxisy.cpp +1 -1

             {
                 //TODO:: fix this
                 QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);
-                m_tickCount = axis->ticksCount();
+                m_tickCount = axis->tickCount();
                 ChartAxis::handleAxisUpdated();
             }

src/axis/valueaxis/qvalueaxis.cpp +3 -3

                 if(d->m_niceNumbers) {
                     int ticks = d->m_tickCount;
                     d->looseNiceNumbers(min, max, ticks);
-                    if(ticks!=d->m_tickCount) setTicksCount(ticks);
+                    if(ticks!=d->m_tickCount) setTickCount(ticks);
                 }
                 if (!qFuzzyIsNull(d->m_min - min)) {
             /*!
               Sets \a count for ticks on the axis.
             */
-            void QValueAxis::setTicksCount(int count)
+            void QValueAxis::setTickCount(int count)
             {
                 Q_D(QValueAxis);
                 if (d->m_tickCount != count && count >=2) {
               \fn int QValueAxis::ticksCount() const
               Return number of ticks on the axis
             */
-            int QValueAxis::ticksCount() const
+            int QValueAxis::tickCount() const
             {
                 Q_D(const QValueAxis);
                 return d->m_tickCount;

src/axis/valueaxis/qvalueaxis.h +3 -3

             class QTCOMMERCIALCHART_EXPORT QValueAxis : public QAbstractAxis
             {
                 Q_OBJECT
-                Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount)
+                Q_PROPERTY(int tickCount READ tickCount WRITE setTickCount)
                 Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled)
                 Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged)
                 Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged)
                 void setRange(qreal min, qreal max);
                 //ticks handling
-                void setTicksCount(int count);
+                void setTickCount(int count);
-                int ticksCount() const;
+                int tickCount() const;
                 void setNiceNumbersEnabled(bool enable = true);
                 bool niceNumbersEnabled() const;

tests/auto/qvalueaxis/tst_qvalueaxis.cpp +7 -7

                 QVERIFY(qFuzzyIsNull(m_valuesaxis->max()));
                 QVERIFY(qFuzzyIsNull(m_valuesaxis->min()));
                 QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
-                QCOMPARE(m_valuesaxis->ticksCount(), 5);
+                QCOMPARE(m_valuesaxis->tickCount(), 5);
                 QCOMPARE(m_valuesaxis->type(), QAbstractAxis::AxisTypeValues);
                 m_chart->setAxisX(m_valuesaxis, m_series);
                 QVERIFY(!qFuzzyIsNull(m_valuesaxis->max()));
                 QVERIFY(!qFuzzyIsNull(m_valuesaxis->min()));
                 QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
-                QCOMPARE(m_valuesaxis->ticksCount(), 5);
+                QCOMPARE(m_valuesaxis->tickCount(), 5);
             }
             void tst_QValueAxis::max_raw_data()
                 QFETCH(int, expectedTicks);
                 m_valuesaxis->setRange(min, max);
-                m_valuesaxis->setTicksCount(ticks);
+                m_valuesaxis->setTickCount(ticks);
                 QVERIFY2(qFuzzyIsNull(m_valuesaxis->min() - min), "Min not equal");
                 QVERIFY2(qFuzzyIsNull(m_valuesaxis->max() - max), "Max not equal");
                 QVERIFY2(qFuzzyIsNull(m_valuesaxis->min() - expectedMin), "Min not equal");
                 QVERIFY2(qFuzzyIsNull(m_valuesaxis->max() - expectedMax), "Max not equal");
-                QCOMPARE(m_valuesaxis->ticksCount(), expectedTicks);
+                QCOMPARE(m_valuesaxis->tickCount(), expectedTicks);
             }
                 QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal)));
                 QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal)));
-                m_valuesaxis->setTicksCount(ticksCount);
+                m_valuesaxis->setTickCount(ticksCount);
-                QCOMPARE(m_valuesaxis->ticksCount(), ticksCount);
+                QCOMPARE(m_valuesaxis->tickCount(), ticksCount);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
-                QCOMPARE(m_valuesaxis->ticksCount(), ticksCount);
+                QCOMPARE(m_valuesaxis->tickCount(), ticksCount);
             }
             void tst_QValueAxis::noautoscale_data()

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