HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1593:c1bed7868e27

Fix all tst_chartdataset test cases

Michal Klocek -

r1593:c1bed7868e27

parent child

Context file:

r1593:c1bed7868e27

Collapse all files

src/axis/qvaluesaxis.cpp +4 -3

                 }
                 if (changed) {
-                   emit rangeChanged(d->m_min,d->m_max);
+                    emit rangeChanged(d->m_min,d->m_max);
-                   emit d->changed(d->m_min, d->m_max, d->m_ticksCount, d->m_niceNumbers);
+                    if(!signalsBlocked()){
+                        emit d->changed(d->m_min, d->m_max, d->m_ticksCount, d->m_niceNumbers);
+                    }
                 }
-            //    d->setRange(min,max);
             }
             /*!

src/chartdataset.cpp +30 0

             void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
             {
+                //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates
+                blockAxisSignals(true);
                 QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
                 while (i.hasNext()) {
                     i.next();
                     i.value()->zoomIn(rect,size);
                 }
+                blockAxisSignals(false);
             }
             void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
             {
+                //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates
+                blockAxisSignals(true);
                 QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
                 while (i.hasNext()) {
                     i.next();
                     i.value()->zoomOut(rect,size);
                 }
+                blockAxisSignals(false);
+            }
+            void ChartDataSet::blockAxisSignals(bool enabled)
+            {
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
+                while (i.hasNext()) {
+                       i.next();
+                       QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key());
+                       QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key());
+                       if(axisX) axisX->blockSignals(enabled);
+                       if(axisY) axisY->blockSignals(enabled);
+                   }
             }
             int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
             void ChartDataSet::scrollDomain(qreal dx,qreal dy,const QSizeF& size)
             {
+                blockAxisSignals(true);
                 QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
                 while (i.hasNext()) {
                     i.next();
                     i.value()->move(dx,dy,size);
                 }
+                blockAxisSignals(false);
             }
             QList<QAbstractSeries*> ChartDataSet::series() const

src/chartdataset_p.h +1 0

                 void addAxisX(QAbstractAxis* axis,QAbstractSeries* series);
                 void addAxisY(QAbstractAxis* axis,QAbstractSeries* series);
                 void removeAxes(QAbstractSeries* series);
+                void blockAxisSignals(bool enabled);
             private:
                 QMap<QAbstractSeries*, QAbstractAxis*> m_seriesAxisXMap;

tests/auto/chartdataset/tst_chartdataset.cpp +47 -59

             	void domain();
                 void zoomInDomain_data();
             	void zoomInDomain();
-            	/*
                 void zoomOutDomain_data();
                 void zoomOutDomain();
                 void scrollDomain_data();
                 void scrollDomain();
-                */
             private:
                 ChartDataSet* m_dataset;
             };
             void tst_ChartDataSet::zoomInDomain_data()
             {
+                QTest::addColumn<bool >("sameAxis");
                 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
-                QTest::newRow("line,line, line, spline") << (QList<QAbstractSeries*>() <<  new QLineSeries(this) <<  new QLineSeries(this) <<  new QLineSeries(this) << new QSplineSeries(this) );
+                QTest::newRow("sameAxis: line,line, line, spline") << true << (QList<QAbstractSeries*>() <<  new QLineSeries(this) <<  new QLineSeries(this) <<  new QLineSeries(this) << new QSplineSeries(this) );
+                QTest::newRow("separeateAxis: line,line, line, spline") << false << (QList<QAbstractSeries*>() <<  new QLineSeries(this) <<  new QLineSeries(this) <<  new QLineSeries(this) << new QSplineSeries(this) );
             }
             void tst_ChartDataSet::zoomInDomain()
             {
+                QFETCH(bool, sameAxis);
                 QFETCH(QList<QAbstractSeries*>, seriesList);
                 foreach(QAbstractSeries* series, seriesList) {
                     m_dataset->addSeries(series);
                 }
-                /*
+                if(sameAxis) m_dataset->createDefaultAxes();
-                QValuesAxis* axis = new QValuesAxis();
-                for (int i = 0; i < seriesList.count(); i++) {
-                    m_dataset->setAxisX(seriesList.at(i), axis);
-            */
-                m_dataset->createDefaultAxes();
                 QList<QSignalSpy*> spyList;
                 qDeleteAll(spyList);
             }
-            /*
             void tst_ChartDataSet::zoomOutDomain_data()
             {
-                addSeries_data();
+                zoomInDomain_data();
             }
             void tst_ChartDataSet::zoomOutDomain()
             {
-                QFETCH(QLineSeries*, series0);
+                QFETCH(bool, sameAxis);
-                QFETCH(QAxis*, axis0);
+                QFETCH(QList<QAbstractSeries*>, seriesList);
-                QFETCH(QLineSeries*, series1);
-                QFETCH(QAxis*, axis1);
-                QFETCH(QLineSeries*, series2);
-                QFETCH(QAxis*, axis2);
-                QFETCH(int, axisCount);
-                Q_UNUSED(axisCount);
+                foreach(QAbstractSeries* series, seriesList) {
+                    m_dataset->addSeries(series);
+                }
-                m_dataset->addSeries(series0, axis0);
+                if (sameAxis)
-                m_dataset->addSeries(series1, axis1);
+                    m_dataset->createDefaultAxes();
-                m_dataset->addSeries(series2, axis2);
-                Domain* domain0 = m_dataset->domain(series0);
+                QList<QSignalSpy*> spyList;
-                Domain* domain1 = m_dataset->domain(series1);
-                Domain* domain2 = m_dataset->domain(series2);
-                QSignalSpy spy0(domain0, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
+                foreach(QAbstractSeries* series, seriesList) {
-                QSignalSpy spy1(domain1, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
+                    spyList << new QSignalSpy(m_dataset->domain(series), SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
-                QSignalSpy spy2(domain2, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
-                m_dataset->zoomOutDomain(QRect(0,0,100,100),QSize(1000,1000));
+                m_dataset->zoomOutDomain(QRect(0, 0, 100, 100), QSize(1000, 1000));
-                TRY_COMPARE(spy0.count(), 1);
+                foreach(QSignalSpy* spy, spyList) {
-                TRY_COMPARE(spy1.count(), 1);
+                    TRY_COMPARE(spy->count(), 1);
-                TRY_COMPARE(spy2.count(), 1);
+                qDeleteAll (spyList);
             }
             void tst_ChartDataSet::scrollDomain_data()
             {
-                addSeries_data();
+                zoomInDomain_data();
             }
             void tst_ChartDataSet::scrollDomain()
             {
-                QFETCH(QLineSeries*, series0);
+                QFETCH(bool, sameAxis);
-                QFETCH(QAxis*, axis0);
+                QFETCH(QList<QAbstractSeries*>, seriesList);
-                QFETCH(QLineSeries*, series1);
-                QFETCH(QAxis*, axis1);
+                foreach(QAbstractSeries* series, seriesList) {
-                QFETCH(QLineSeries*, series2);
+                    m_dataset->addSeries(series);
-                QFETCH(QAxis*, axis2);
-                QFETCH(int, axisCount);
-                Q_UNUSED(axisCount);
+                if (sameAxis)
+                    m_dataset->createDefaultAxes();
-                m_dataset->addSeries(series0, axis0);
+                QList<QSignalSpy*> spyList;
-                m_dataset->addSeries(series1, axis1);
-                m_dataset->addSeries(series2, axis2);
-                Domain* domain0 = m_dataset->domain(series0);
+                foreach(QAbstractSeries* series, seriesList) {
-                Domain* domain1 = m_dataset->domain(series1);
+                    spyList
-                Domain* domain2 = m_dataset->domain(series2);
+                        << new QSignalSpy(m_dataset->domain(series),
+                            SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
+                }
-                QSignalSpy spy0(domain0, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
+                m_dataset->scrollDomain(10, 10, QSize(1000, 1000));
-                QSignalSpy spy1(domain1, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
-                QSignalSpy spy2(domain2, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
-                m_dataset->scrollDomain(10,10,QSize(1000,1000));
+                foreach(QSignalSpy* spy, spyList) {
+                    TRY_COMPARE(spy->count(), 1);
+                }
-                TRY_COMPARE(spy0.count(), 1);
+                qDeleteAll(spyList);
-                TRY_COMPARE(spy1.count(), 1);
-                TRY_COMPARE(spy2.count(), 1);
             }
-            */
             QTEST_MAIN(tst_ChartDataSet)
             #include "tst_chartdataset.moc"

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