HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1386:47613a850965

enable axis layout changes again

sauimone -

r1386:47613a850965

parent child

Context file:

r1386:47613a850965

Collapse all files

src/axis/chartaxisx.cpp +2 -2

                     lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
                 }
-                //presenter()->setMinimumMarginWidth(this,minWidth);
+                presenter()->setMinimumMarginWidth(this,minWidth);
-                //presenter()->setMinimumMarginHeight(this,minHeight);
+                presenter()->setMinimumMarginHeight(this,minHeight);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartaxisy.cpp +2 -2

                     lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                 }
-                //presenter()->setMinimumMarginWidth(this,minWidth);
+                presenter()->setMinimumMarginWidth(this,minWidth);
-                //presenter()->setMinimumMarginHeight(this,minHeight);
+                presenter()->setMinimumMarginHeight(this,minHeight);
             }

tests/auto/qbarseries/tst_qbarseries.cpp +15 -15

                 QTest::qWaitForWindowShown(&view);
             //====================================================================================
-            // barset 1, category test1
+            // barset 1, bar 0
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(106,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(95,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
             //====================================================================================
-            // barset 1, category test2
+            // barset 1, bar 1
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(199,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(164,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
             //====================================================================================
-            // barset 1, category test3
+            // barset 1, bar 2
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(291,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(234,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
             //====================================================================================
-            // barset 2, category test1
+            // barset 2, bar 0
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(134,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
             //====================================================================================
-            // barset 2, category test2
+            // barset 2, bar 1
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(227,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(185,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
             //====================================================================================
-            // barset 2, category test3
+            // barset 2, bar 2
-                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(319,142));
+                QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(254,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
             //=======================================================================
             // move mouse on top of set1
-                QTest::mouseMove(view.viewport(), QPoint(106,142));
+                QTest::mouseMove(view.viewport(), QPoint(95,142));
                 QVERIFY(seriesSpy.count() == 1);
             //=======================================================================
             // move mouse from top of set1 to top of set2
-                QTest::mouseMove(view.viewport(), QPoint(134,142));
+                QTest::mouseMove(view.viewport(), QPoint(116,142));
                 QVERIFY(seriesSpy.count() == 2);
             //=======================================================================
             // move mouse from top of set2 to background
-                QTest::mouseMove(view.viewport(), QPoint(134,0));
+                QTest::mouseMove(view.viewport(), QPoint(116,0));
                 QVERIFY(seriesSpy.count() == 1);
                 // should leave set2

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