@@ -281,8 +281,7 void tst_qpieseries::clickedSignal() | |||||
281 | // simulate clicks |
|
281 | // simulate clicks | |
282 | // pie rectangle: QRectF(60,60 121x121) |
|
282 | // pie rectangle: QRectF(60,60 121x121) | |
283 | QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(139, 85)); // inside slice 1 |
|
283 | QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(139, 85)); // inside slice 1 | |
284 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
284 | TRY_COMPARE(clickSpy1.count(), 1); | |
285 | QCOMPARE(clickSpy1.count(), 1); |
|
|||
286 | QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy1.at(0).at(0)), s1); |
|
285 | QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy1.at(0).at(0)), s1); | |
287 | } |
|
286 | } | |
288 |
|
287 | |||
@@ -310,15 +309,13 void tst_qpieseries::hoverSignal() | |||||
310 | // pie rectangle: QRectF(60,60 121x121) |
|
309 | // pie rectangle: QRectF(60,60 121x121) | |
311 | QSignalSpy hoverSpy(series, SIGNAL(hovered(QPieSlice*,bool))); |
|
310 | QSignalSpy hoverSpy(series, SIGNAL(hovered(QPieSlice*,bool))); | |
312 | QTest::mouseMove(view.viewport(), QPoint(139, 85)); |
|
311 | QTest::mouseMove(view.viewport(), QPoint(139, 85)); | |
313 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
312 | TRY_COMPARE(hoverSpy.count(), 1); | |
314 | QCOMPARE(hoverSpy.count(), 1); |
|
|||
315 | QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(0).at(0)), s1); |
|
313 | QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(0).at(0)), s1); | |
316 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(1)), true); |
|
314 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(1)), true); | |
317 |
|
315 | |||
318 | // move outside the slice |
|
316 | // move outside the slice | |
319 | QTest::mouseMove(view.viewport(), QPoint(200, 0)); |
|
317 | QTest::mouseMove(view.viewport(), QPoint(200, 0)); | |
320 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
318 | TRY_COMPARE(hoverSpy.count(), 2); | |
321 | QCOMPARE(hoverSpy.count(), 2); |
|
|||
322 | QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(1).at(0)), s1); |
|
319 | QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(1).at(0)), s1); | |
323 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(1)), false); |
|
320 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(1)), false); | |
324 | } |
|
321 | } |
@@ -249,19 +249,16 void tst_qpieslice::mouseHover() | |||||
249 | // pie rectangle: QRectF(60,60 121x121) |
|
249 | // pie rectangle: QRectF(60,60 121x121) | |
250 | QSignalSpy hoverSpy(s1, SIGNAL(hovered(bool))); |
|
250 | QSignalSpy hoverSpy(s1, SIGNAL(hovered(bool))); | |
251 | QTest::mouseMove(view.viewport(), QPoint(170, 70)); |
|
251 | QTest::mouseMove(view.viewport(), QPoint(170, 70)); | |
252 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
252 | TRY_COMPARE(hoverSpy.count(), 0); | |
253 | QCOMPARE(hoverSpy.count(), 0); |
|
|||
254 |
|
253 | |||
255 | // move inside the slice |
|
254 | // move inside the slice | |
256 | QTest::mouseMove(view.viewport(), QPoint(139, 85)); |
|
255 | QTest::mouseMove(view.viewport(), QPoint(139, 85)); | |
257 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
256 | TRY_COMPARE(hoverSpy.count(), 1); | |
258 | QCOMPARE(hoverSpy.count(), 1); |
|
|||
259 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(0)), true); |
|
257 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(0)), true); | |
260 |
|
258 | |||
261 | // move outside the slice |
|
259 | // move outside the slice | |
262 | QTest::mouseMove(view.viewport(), QPoint(200, 0)); |
|
260 | QTest::mouseMove(view.viewport(), QPoint(200, 0)); | |
263 | QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); |
|
261 | TRY_COMPARE(hoverSpy.count(), 2); | |
264 | QCOMPARE(hoverSpy.count(), 2); |
|
|||
265 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(0)), false); |
|
262 | QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(0)), false); | |
266 | } |
|
263 | } | |
267 |
|
264 |
General Comments 0
You need to be logged in to leave comments.
Login now