Expose QQuickPath::pointAtPercent as Q_INVOKABLE

So it can be used in QML. Useful in combination with ShapePath,
in order to add graphics along a Shape.

[ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent
as invokable in QML.

Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
 

2 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/quick/qquickpath/tst_qquickpath.cpp b/tests/auto/quick/qquickpath/tst_qquickpath.cpp
index bac1fc5861..c89ce730a8 100644
--- a/tests/auto/quick/qquickpath/tst_qquickpath.cpp
+++ b/tests/auto/quick/qquickpath/tst_qquickpath.cpp
@@ -99,13 +99,13 @@ void tst_QuickPath::arc(QSizeF scale)
     QPainterPath path = obj->path();
     QVERIFY(path != QPainterPath());
 
-    QPointF pos = obj->pointAt(0);
+    QPointF pos = obj->pointAtPercent(0);
     QCOMPARE(pos, QPointF(0,0));
-    pos = obj->pointAt(.25);
+    pos = obj->pointAtPercent(.25);
     compare(pos, scale, __LINE__, 38.9244897744, 7.85853964341);
-    pos = obj->pointAt(.75);
+    pos = obj->pointAtPercent(.75);
     compare(pos, scale, __LINE__, 92.141460356592, 61.07551022559);
-    pos = obj->pointAt(1);
+    pos = obj->pointAtPercent(1);
     QCOMPARE(pos, QPointF(100 * scale.width(), 100 * scale.height()));
 }
 
@@ -140,18 +140,18 @@ void tst_QuickPath::angleArc(QSizeF scale)
     QPainterPath path = obj->path();
     QVERIFY(path != QPainterPath());
 
-    QPointF pos = obj->pointAt(0);
+    QPointF pos = obj->pointAtPercent(0);
     compare(pos, scale, __LINE__, 135.35533905867, 135.35533905867);
-    pos = obj->pointAt(.25);
+    pos = obj->pointAtPercent(.25);
     compare(pos, scale, __LINE__, 119.46222180396, 146.07068621369);
-    pos = obj->pointAt(.75);
+    pos = obj->pointAtPercent(.75);
     compare(pos, scale, __LINE__, 80.537778196007, 146.07068621366);
-    pos = obj->pointAt(1);
+    pos = obj->pointAtPercent(1);
     compare(pos, scale, __LINE__, 64.644660941173, 135.35533905867);
 
     // if moveToStart is false, we should have a line starting from startX/Y
     arc->setMoveToStart(false);
-    pos = obj->pointAt(0);
+    pos = obj->pointAtPercent(0);
     QCOMPARE(pos, QPointF(0,0));
 }
 
@@ -280,13 +280,13 @@ void tst_QuickPath::svg(QSizeF scale)
     QPainterPath path = obj->path();
     QVERIFY(path != QPainterPath());
 
-    QPointF pos = obj->pointAt(0);
+    QPointF pos = obj->pointAtPercent(0);
     QCOMPARE(pos, QPointF(200 * scale.width(),300 * scale.height()));
-    pos = obj->pointAt(.25);
+    pos = obj->pointAtPercent(.25);
     QCOMPARE(pos.toPoint(), QPoint(400 * scale.width(),175 * scale.height()));  //fuzzy compare
-    pos = obj->pointAt(.75);
+    pos = obj->pointAtPercent(.75);
     QCOMPARE(pos.toPoint(), QPoint(800 * scale.width(),425 * scale.height())); //fuzzy compare
-    pos = obj->pointAt(1);
+    pos = obj->pointAtPercent(1);
     QCOMPARE(pos, QPointF(1000 * scale.width(),300 * scale.height()));
 }
 
@@ -329,10 +329,10 @@ void tst_QuickPath::line(QSizeF scale)
     for (int i = 0; i < 167; ++i) {
         qreal t = i / 167.0;
 
-        QPointF p1 = path1->pointAt(t);
+        QPointF p1 = path1->pointAtPercent(t);
         QCOMPARE(p1.x(), p1.y());
 
-        QPointF p2 = path2->pointAt(t);
+        QPointF p2 = path2->pointAtPercent(t);
         QCOMPARE(p1.toPoint(), p2.toPoint());
     }
 }
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 9f7ede44cf..8b963117ed 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -241,7 +241,7 @@ void tst_QQuickPathView::items()
     QVERIFY(path);
 
     QVERIFY(pathview->highlightItem());
-    QPointF start = path->pointAt(0.0);
+    QPointF start = path->pointAtPercent(0.0);
     QPointF offset;
     offset.setX(pathview->highlightItem()->width()/2);
     offset.setY(pathview->highlightItem()->height()/2);
@@ -919,7 +919,7 @@ void tst_QQuickPathView::pathMoved()
     QVERIFY(firstItem);
     QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
     QVERIFY(path);
-    QPointF start = path->pointAt(0.0);
+    QPointF start = path->pointAtPercent(0.0);
     QPointF offset;//Center of item is at point, but pos is from corner
     offset.setX(firstItem->width()/2);
     offset.setY(firstItem->height()/2);
@@ -928,7 +928,7 @@ void tst_QQuickPathView::pathMoved()
 
     for (int i=0; i<model.count(); i++) {
         QQuickRectangle *curItem = findItem<QQuickRectangle>(pathview, "wrapper", i);
-        QPointF itemPos(path->pointAt(0.25 + i*0.25));
+        QPointF itemPos(path->pointAtPercent(0.25 + i*0.25));
         QCOMPARE(curItem->position() + offset, QPointF(itemPos.x(), itemPos.y()));
     }
 
@@ -1007,7 +1007,7 @@ void tst_QQuickPathView::setCurrentIndex()
     QVERIFY(firstItem);
     QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
     QVERIFY(path);
-    QPointF start = path->pointAt(0.0);
+    QPointF start = path->pointAtPercent(0.0);
     QPointF offset;//Center of item is at point, but pos is from corner
     offset.setX(firstItem->width()/2);
     offset.setY(firstItem->height()/2);
@@ -1648,7 +1648,7 @@ void tst_QQuickPathView::changePreferredHighlight()
     QVERIFY(firstItem);
     QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
     QVERIFY(path);
-    QPointF start = path->pointAt(0.5);
+    QPointF start = path->pointAtPercent(0.5);
     QPointF offset;//Center of item is at point, but pos is from corner
     offset.setX(firstItem->width()/2);
     offset.setY(firstItem->height()/2);
@@ -1656,7 +1656,7 @@ void tst_QQuickPathView::changePreferredHighlight()
 
     pathview->setPreferredHighlightBegin(0.8);
     pathview->setPreferredHighlightEnd(0.8);
-    start = path->pointAt(0.8);
+    start = path->pointAtPercent(0.8);
     QTRY_COMPARE(firstItem->position() + offset, start);
     QCOMPARE(pathview->currentIndex(), 0);
 
@@ -1709,7 +1709,7 @@ void tst_QQuickPathView::currentOffsetOnInsertion()
     QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
     QVERIFY(path);
 
-    QPointF start = path->pointAt(0.5);
+    QPointF start = path->pointAtPercent(0.5);
     QPointF offset;//Center of item is at point, but pos is from corner
     offset.setX(item->width()/2);
     offset.setY(item->height()/2);
@@ -1798,7 +1798,7 @@ void tst_QQuickPathView::asynchronous()
     QVERIFY(firstItem);
     QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
     QVERIFY(path);
-    QPointF start = path->pointAt(0.0);
+    QPointF start = path->pointAtPercent(0.0);
     QPointF offset;//Center of item is at point, but pos is from corner
     offset.setX(firstItem->width()/2);
     offset.setY(firstItem->height()/2);
@@ -1807,7 +1807,7 @@ void tst_QQuickPathView::asynchronous()
 
     for (int i=0; i<5; i++) {
         QQuickItem *curItem = findItem<QQuickItem>(pathview, "wrapper", i);
-        QPointF itemPos(path->pointAt(0.2 + i*0.2));
+        QPointF itemPos(path->pointAtPercent(0.2 + i*0.2));
         QCOMPARE(curItem->position() + offset, itemPos);
     }