From: Yann Bodson Date: Wed, 16 May 2012 02:59:32 +0000 (+1000) Subject: Add optional width and height arguments to mapToItem()/mapFromItem() X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7ac1a943b824d8624d16397fd4f8a5fa17a7dd9b;p=konrad%2Fqtdeclarative.git Add optional width and height arguments to mapToItem()/mapFromItem() When specifying the width and height from QML, mapToItem()/mapFromItem() will use QQuickItem::mapRectToItem (and mapRectFromItem). Task-number: QTBUG-25755 Change-Id: Iae87671913623969d7428dd008afaa6faf3faf33 Reviewed-by: Martin Jones --- diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index be36d76..879d6a4 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3422,6 +3422,17 @@ void QQuickItem::polish() } } +/*! + \qmlmethod object QtQuick2::Item::mapFromItem(Item item, real x, real y) + \qmlmethod object QtQuick2::Item::mapFromItem(Item item, real x, real y, real width, real height) + + Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in \a + item's coordinate system, to this item's coordinate system, and returns an object with \c x and + \c y (and optionally \c width and \c height) properties matching the mapped coordinate. + + If \a item is a \c null value, this maps the point or rect from the coordinate system of + the root QML view. +*/ void QQuickItem::mapFromItem(QQmlV8Function *args) const { if (args->Length() != 0) { @@ -3444,10 +3455,22 @@ void QQuickItem::mapFromItem(QQmlV8Function *args) const qreal x = (args->Length() > 1)?(*args)[1]->NumberValue():0; qreal y = (args->Length() > 2)?(*args)[2]->NumberValue():0; - QPointF p = mapFromItem(itemObj, QPointF(x, y)); + if (args->Length() > 3) { + qreal w = (*args)[3]->NumberValue(); + qreal h = (args->Length() > 4)?(*args)[4]->NumberValue():0; + + QRectF r = mapRectFromItem(itemObj, QRectF(x, y, w, h)); + + rv->Set(v8::String::New("x"), v8::Number::New(r.x())); + rv->Set(v8::String::New("y"), v8::Number::New(r.y())); + rv->Set(v8::String::New("width"), v8::Number::New(r.width())); + rv->Set(v8::String::New("height"), v8::Number::New(r.height())); + } else { + QPointF p = mapFromItem(itemObj, QPointF(x, y)); - rv->Set(v8::String::New("x"), v8::Number::New(p.x())); - rv->Set(v8::String::New("y"), v8::Number::New(p.y())); + rv->Set(v8::String::New("x"), v8::Number::New(p.x())); + rv->Set(v8::String::New("y"), v8::Number::New(p.y())); + } } } @@ -3465,6 +3488,17 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const return t; } +/*! + \qmlmethod object QtQuick2::Item::mapToItem(Item item, real x, real y) + \qmlmethod object QtQuick2::Item::mapToItem(Item item, real x, real y, real width, real height) + + Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in this + item's coordinate system, to \a item's coordinate system, and returns an object with \c x and + \c y (and optionally \c width and \c height) properties matching the mapped coordinate. + + If \a item is a \c null value, this maps the point or rect to the coordinate system of the + root QML view. +*/ void QQuickItem::mapToItem(QQmlV8Function *args) const { if (args->Length() != 0) { @@ -3487,10 +3521,22 @@ void QQuickItem::mapToItem(QQmlV8Function *args) const qreal x = (args->Length() > 1)?(*args)[1]->NumberValue():0; qreal y = (args->Length() > 2)?(*args)[2]->NumberValue():0; - QPointF p = mapToItem(itemObj, QPointF(x, y)); + if (args->Length() > 3) { + qreal w = (*args)[3]->NumberValue(); + qreal h = (args->Length() > 4)?(*args)[4]->NumberValue():0; - rv->Set(v8::String::New("x"), v8::Number::New(p.x())); - rv->Set(v8::String::New("y"), v8::Number::New(p.y())); + QRectF r = mapRectToItem(itemObj, QRectF(x, y, w, h)); + + rv->Set(v8::String::New("x"), v8::Number::New(r.x())); + rv->Set(v8::String::New("y"), v8::Number::New(r.y())); + rv->Set(v8::String::New("width"), v8::Number::New(r.width())); + rv->Set(v8::String::New("height"), v8::Number::New(r.height())); + } else { + QPointF p = mapToItem(itemObj, QPointF(x, y)); + + rv->Set(v8::String::New("x"), v8::Number::New(p.x())); + rv->Set(v8::String::New("y"), v8::Number::New(p.y())); + } } } @@ -5139,26 +5185,6 @@ bool QQuickItem::contains(const QPointF &point) const return QRectF(0, 0, d->width, d->height).contains(point); } -/*! - \qmlmethod object QtQuick2::Item::mapFromItem(Item item, real x, real y) - - Maps the point (\a x, \a y), which is in \a item's coordinate system, to - this item's coordinate system, and returns an object with \c x and \c y - properties matching the mapped coordinate. - - If \a item is a \c null value, this maps the point from the coordinate - system of the root QML view. -*/ -/*! - \qmlmethod object QtQuick2::Item::mapToItem(Item item, real x, real y) - - Maps the point (\a x, \a y), which is in this item's coordinate system, to - \a item's coordinate system, and returns an object with \c x and \c y - properties matching the mapped coordinate. - - If \a item is a \c null value, this maps \a x and \a y to the coordinate - system of the root QML view. -*/ QPointF QQuickItem::mapToItem(const QQuickItem *item, const QPointF &point) const { QPointF p = mapToScene(point); diff --git a/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml b/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml new file mode 100644 index 0000000..4742e93 --- /dev/null +++ b/tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Item { + id: root; objectName: "root" + width: 200; height: 200 + + Item { id: itemA; objectName: "itemA"; x: 50; y: 50; width: 25; height: 70 } + + Item { + x: 50; y: 50 + rotation: 45 + Item { id: itemB; objectName: "itemB"; x: 100; y: 100; width: 30; height: 45 } + } + + function mapAToB(x, y, w, h) { + var pos = itemA.mapToItem(itemB, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAFromB(x, y, w, h) { + var pos = itemA.mapFromItem(itemB, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAToNull(x, y, w, h) { + var pos = itemA.mapToItem(null, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function mapAFromNull(x, y, w, h) { + var pos = itemA.mapFromItem(null, x, y, w, h) + return Qt.rect(pos.x, pos.y, pos.width, pos.height) + } + + function checkMapAToInvalid(x, y, w, h) { + var pos = itemA.mapToItem(1122, x, y, w, h) + return pos == undefined; + } + + function checkMapAFromInvalid(x, y, w, h) { + var pos = itemA.mapFromItem(1122, x, y, w, h) + return pos == undefined; + } +} diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 44b0558..f4e5108 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -77,6 +77,8 @@ private slots: void clip(); void mapCoordinates(); void mapCoordinates_data(); + void mapCoordinatesRect(); + void mapCoordinatesRect_data(); void propertyChanges(); void transforms(); void transforms_data(); @@ -1083,6 +1085,71 @@ void tst_QQuickItem::mapCoordinates_data() QTest::newRow(QTest::toString(i)) << i << i; } +void tst_QQuickItem::mapCoordinatesRect() +{ + QFETCH(int, x); + QFETCH(int, y); + QFETCH(int, width); + QFETCH(int, height); + + QQuickView *canvas = new QQuickView(0); + canvas->setBaseSize(QSize(300, 300)); + canvas->setSource(testFileUrl("mapCoordinatesRect.qml")); + canvas->show(); + qApp->processEvents(); + + QQuickItem *root = qobject_cast(canvas->rootObject()); + QVERIFY(root != 0); + QQuickItem *a = findItem(canvas->rootObject(), "itemA"); + QVERIFY(a != 0); + QQuickItem *b = findItem(canvas->rootObject(), "itemB"); + QVERIFY(b != 0); + + QVariant result; + + QVERIFY(QMetaObject::invokeMethod(root, "mapAToB", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value(), qobject_cast(a)->mapRectToItem(b, QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAFromB", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value(), qobject_cast(a)->mapRectFromItem(b, QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAToNull", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value(), qobject_cast(a)->mapRectToScene(QRectF(x, y, width, height))); + + QVERIFY(QMetaObject::invokeMethod(root, "mapAFromNull", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QCOMPARE(result.value(), qobject_cast(a)->mapRectFromScene(QRectF(x, y, width, height))); + + QString warning1 = testFileUrl("mapCoordinatesRect.qml").toString() + ":48:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item"; + QString warning2 = testFileUrl("mapCoordinatesRect.qml").toString() + ":48:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item"; + + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); + QVERIFY(QMetaObject::invokeMethod(root, "checkMapAToInvalid", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QVERIFY(result.toBool()); + + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + QVERIFY(QMetaObject::invokeMethod(root, "checkMapAFromInvalid", + Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y), Q_ARG(QVariant, width), Q_ARG(QVariant, height))); + QVERIFY(result.toBool()); + + delete canvas; +} + +void tst_QQuickItem::mapCoordinatesRect_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("width"); + QTest::addColumn("height"); + + for (int i=-20; i<=20; i+=5) + QTest::newRow(QTest::toString(i)) << i << i << i << i; +} + void tst_QQuickItem::transforms_data() { QTest::addColumn("qml");