HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1652:ea4070861878

Fixes tst_qchartview

Michal Klocek -

r1652:ea4070861878

parent child

Context file:

r1652:ea4070861878

src/axis/qbarcategoriesaxis.cpp +1 -4

             void QBarCategoriesAxisPrivate::emitRange()
             {
-            	Q_Q( QBarCategoriesAxis);
+            	emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
-            	if(!q->signalsBlocked()) {
-            		emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
             }

src/axis/qvaluesaxis.cpp +3 -4

             void QValuesAxis::setRange(qreal min, qreal max)
             {
                 Q_D(QValuesAxis);
                 bool changed = false;
                 if (!qFuzzyIsNull(d->m_min - min)) {
                     d->m_min = min;
             void QValuesAxisPrivate::setMax(const QVariant &max)
             {
                 Q_Q(QValuesAxis);
                 bool ok;
                 qreal value = max.toReal(&ok);
             void QValuesAxisPrivate::emitRange()
             {
-            	Q_Q(QValuesAxis);
+            	emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
-            	if(!q->signalsBlocked()) {
-            		emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
             }
             #include "moc_qvaluesaxis.cpp"

src/chartdataset.cpp +4 -3

             {
                 //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);
             void ChartDataSet::blockAxisSignals(bool enabled)
             {
                 QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
+            Q_UNUSED(enabled);
                 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(axisX) axisX->d_ptr->blockSignals(true);
-                       if(axisY) axisY->blockSignals(enabled);
+                       if(axisY) axisY->d_ptr->blockSignals(true);
                    }
             }

tests/auto/qchartview/tst_qchartview.cpp +10 -5

             #include <qlineseries.h>
             #include <cmath>
             #include <tst_definitions.h>
+            #include <qvaluesaxis.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 *line << QPointF(0, 0) << QPointF(200, 200);
                 m_view->chart()->addSeries(line);
+                m_view->chart()->createDefaultAxes();
                 m_view->resize(200 + padding.left() + padding.right(), 200 +  padding.top()+ padding.bottom());
                 m_view->show();
                 //this is hack since view does not get events otherwise
                 m_view->setMouseTracking(false);
-                //TODO: QVERIFY(axisX->min() - minX < 1);
+                QValuesAxis* vaxisX = qobject_cast<QValuesAxis*>(axisX);
-                //TODO: QVERIFY(axisX->max() - maxX < 1);
+                QValuesAxis* vaxisY = qobject_cast<QValuesAxis*>(axisY);
-                //TODO: QVERIFY(axisY->min() - minY < 1);
-                //TODO: QVERIFY(axisY->max() - maxY < 1);
+                QVERIFY(vaxisX->min() - minX < 1);
-                qFatal("implement TODO");
+                QVERIFY(vaxisX->max() - maxX < 1);
+                QVERIFY(vaxisY->min() - minY < 1);
+                QVERIFY(vaxisY->max() - maxY < 1);
             }
             QTEST_MAIN(tst_QChartView)

General Comments 0

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

No TODOs yet

	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