2015-08-11 16:14:02 +00:00
|
|
|
/****************************************************************************
|
|
|
|
**
|
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
|
|
|
**
|
|
|
|
** This file is part of the manual tests of the Qt Toolkit.
|
|
|
|
**
|
2017-11-15 15:29:18 +00:00
|
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
|
|
** Commercial License Usage
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
|
|
**
|
|
|
|
** GNU General Public License Usage
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
2015-08-11 16:14:02 +00:00
|
|
|
**
|
|
|
|
** $QT_END_LICENSE$
|
|
|
|
**
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
import QtQuick 2.8
|
|
|
|
import Qt.labs.handlers 1.0
|
2017-03-31 21:42:04 +00:00
|
|
|
import "content"
|
2015-08-11 16:14:02 +00:00
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
width: 1024; height: 600
|
2016-10-18 09:49:13 +00:00
|
|
|
color: "#eee"
|
Let pinchhandler operate on QQuickItem properties
This requires coordinate system mapping that varies with the
transformOrigin.
The properties exposed from PinchHandler (rotation, scale and translation)
are currently relative to the point when the pinch became active.
(Therefore, rotation, will reset back to 0 when a new pinch is activated).
Its still unclear how the properties that limits the transform should
influence. With this patch, they are like this:
* {min,max}imumRotation applies to the actual rotation of the item.
* {min,max}imumScale applies to the actual scale of the item.
* {min,max}imum{X,Y} applies to the actual position of the item. (This has
some unfortunate side-effects when the item is scaled or rotated, since
the items actual position will change as it rotates)
In addition, the behavior described above means that the limits won't
have any effect if there is no target item.
Change-Id: I279fb03667cd75324e8337039ae2594658265d13
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-12-13 10:38:23 +00:00
|
|
|
|
|
|
|
function getTransformationDetails(item, pinchhandler) {
|
|
|
|
return "\n\npinch.scale:" + pinchhandler.scale.toFixed(2)
|
|
|
|
+ "\npinch.rotation:" + pinchhandler.rotation.toFixed(2)
|
|
|
|
+ "\npinch.translation:" + "(" + pinchhandler.translation.x.toFixed(2) + "," + pinchhandler.translation.y.toFixed(2) + ")"
|
|
|
|
+ "\nrect.scale: " + item.scale.toFixed(2)
|
|
|
|
+ "\nrect.rotation: " + item.rotation.toFixed(2)
|
|
|
|
+ "\nrect.position: " + "(" + item.x.toFixed(2) + "," + item.y.toFixed(2) + ")"
|
|
|
|
}
|
|
|
|
|
2017-11-09 10:56:18 +00:00
|
|
|
function activePincher() {
|
|
|
|
if (grandparentPinch.active)
|
|
|
|
return grandparentPinch
|
|
|
|
else if (parentPinch.active)
|
|
|
|
return parentPinch
|
|
|
|
else if (pinch2.active)
|
|
|
|
return pinch2
|
|
|
|
return pinch3 // always return a pinch handler, even when its inactive. The indicator will be invisble anyway.
|
|
|
|
}
|
|
|
|
|
2015-08-11 16:14:02 +00:00
|
|
|
Rectangle {
|
2017-11-09 10:56:18 +00:00
|
|
|
width: parent.width - 100; height: parent.height - 100; x: 50; y: 50
|
|
|
|
color: "beige"
|
|
|
|
border.width: grandparentPinch.active ? 2 : 0
|
|
|
|
border.color: border.width > 0 ? "red" : "transparent"
|
|
|
|
antialiasing: true
|
|
|
|
|
|
|
|
PinchHandler {
|
|
|
|
id: grandparentPinch
|
|
|
|
objectName: "grandparent pinch"
|
|
|
|
minimumScale: 0.5
|
|
|
|
maximumScale: 3
|
|
|
|
minimumPointCount: 3
|
|
|
|
}
|
|
|
|
|
|
|
|
Text {
|
|
|
|
text: "Pinch with 3 fingers to scale, rotate and translate"
|
|
|
|
+ getTransformationDetails(parent, grandparentPinch)
|
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
|
2016-10-18 09:49:13 +00:00
|
|
|
Rectangle {
|
2017-11-09 10:56:18 +00:00
|
|
|
width: parent.width - 100; height: parent.height - 100; x: 50; y: 50
|
|
|
|
color: "#ffe0e0e0"
|
2016-10-18 09:49:13 +00:00
|
|
|
antialiasing: true
|
|
|
|
|
|
|
|
PinchHandler {
|
2017-11-09 10:56:18 +00:00
|
|
|
id: parentPinch
|
|
|
|
objectName: "parent pinch"
|
2016-10-18 09:49:13 +00:00
|
|
|
minimumScale: 0.5
|
|
|
|
maximumScale: 3
|
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
|
2016-10-18 09:49:13 +00:00
|
|
|
Text {
|
2017-11-09 10:56:18 +00:00
|
|
|
text: "Pinch with 2 fingers to scale, rotate and translate"
|
|
|
|
+ getTransformationDetails(parent, parentPinch)
|
2017-03-09 14:11:22 +00:00
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
|
2017-11-09 10:56:18 +00:00
|
|
|
Rectangle {
|
|
|
|
id: rect2
|
|
|
|
width: 400
|
|
|
|
height: 300
|
|
|
|
color: "lightsteelblue"
|
|
|
|
antialiasing: true
|
|
|
|
x: 100
|
|
|
|
y: 200
|
|
|
|
rotation: 30
|
|
|
|
transformOrigin: Item.TopRight
|
|
|
|
border.width: (lsbDragHandler.active || pinch2.active) ? 2 : 0
|
|
|
|
border.color: border.width > 0 ? "red" : "transparent"
|
|
|
|
|
|
|
|
Text {
|
|
|
|
anchors.centerIn: parent
|
|
|
|
text: "Pinch with 2 fingers to scale, rotate and translate\nDrag with 1 finger"
|
|
|
|
+ getTransformationDetails(rect2, pinch2) + "\nz " + rect2.z
|
|
|
|
}
|
|
|
|
DragHandler {
|
|
|
|
id: lsbDragHandler
|
|
|
|
objectName: "lightsteelblue drag"
|
2017-03-31 21:42:04 +00:00
|
|
|
}
|
2017-11-09 10:56:18 +00:00
|
|
|
PinchHandler {
|
|
|
|
id: pinch2
|
|
|
|
objectName: "lightsteelblue pinch"
|
|
|
|
minimumRotation: -45
|
|
|
|
maximumRotation: 45
|
|
|
|
minimumScale: 0.5
|
|
|
|
maximumScale: 3
|
|
|
|
minimumX: 0
|
|
|
|
maximumX: 600
|
|
|
|
// acceptedModifiers: Qt.ControlModifier
|
|
|
|
}
|
|
|
|
TapHandler { gesturePolicy: TapHandler.DragThreshold; onTapped: rect2.z = rect3.z + 1 }
|
2016-10-18 09:49:13 +00:00
|
|
|
}
|
2017-03-31 21:42:04 +00:00
|
|
|
|
2017-11-09 10:56:18 +00:00
|
|
|
Rectangle {
|
|
|
|
id: rect3
|
|
|
|
x: 500
|
|
|
|
width: 400
|
|
|
|
height: 300
|
|
|
|
color: "wheat"
|
|
|
|
antialiasing: true
|
|
|
|
border.width: (wheatDragHandler.active || pinch3.active) ? 2 : 0
|
|
|
|
border.color: border.width > 0 ? "red" : "transparent"
|
|
|
|
|
|
|
|
Text {
|
|
|
|
anchors.centerIn: parent
|
|
|
|
text: "Pinch with 3 fingers to scale, rotate and translate\nDrag with 1 finger"
|
|
|
|
+ getTransformationDetails(rect3, pinch3) + "\nz " + rect3.z
|
|
|
|
}
|
|
|
|
DragHandler {
|
|
|
|
id: wheatDragHandler
|
|
|
|
objectName: "wheat drag"
|
|
|
|
}
|
|
|
|
PinchHandler {
|
|
|
|
id: pinch3
|
|
|
|
objectName: "wheat 3-finger pinch"
|
|
|
|
minimumPointCount: 3
|
|
|
|
minimumScale: 0.1
|
|
|
|
maximumScale: 10
|
|
|
|
onActiveChanged: {
|
|
|
|
if (!active)
|
2018-05-09 18:32:16 +00:00
|
|
|
anim.restart(centroid.velocity)
|
2017-11-09 10:56:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
TapHandler { gesturePolicy: TapHandler.DragThreshold; onTapped: rect3.z = rect2.z + 1 }
|
|
|
|
MomentumAnimation { id: anim; target: rect3 }
|
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
}
|
2016-10-18 09:49:13 +00:00
|
|
|
}
|
Fix rotation in PinchHandler
If we want to allow rotation with more than 2 fingers, its not
straightforward to calculate the rotation angle, because we cannot anymore
calculate the angle between the two touchpoints.
The approach chosen was to calculate the angle between the centroid and
the touchpoints, and take the average between the angles.
Then, for the next event we calculated the new average of the angles.
However, this is not really reliable in some scenarios, suppose we have
these three angles:
0 120 240, avg = 360/3 = 120
next, touch points rotate clockwise with 2 degrees, and we get these
angles:
358 118 238, avg = 714/3 = 238
So, just by rotating all fingers by 2 degrees, we got a jump by 118
degrees "in average".
Instead we need to track the angles of *all* touch points, and when the
next touch event is received we calculate how much the angle has changed
per touch point. We then take the average of those angles as the effective
"rotation" of the PinchHandler
Change-Id: I2bfdf80b886751177efe81bcc7b698af0d2938e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-09-02 15:07:57 +00:00
|
|
|
Rectangle {
|
|
|
|
id: centroidIndicator
|
2017-11-09 10:56:18 +00:00
|
|
|
property QtObject pincher: activePincher()
|
2018-05-09 18:32:16 +00:00
|
|
|
x: pincher.centroid.scenePosition.x - radius
|
|
|
|
y: pincher.centroid.scenePosition.y - radius
|
Fix rotation in PinchHandler
If we want to allow rotation with more than 2 fingers, its not
straightforward to calculate the rotation angle, because we cannot anymore
calculate the angle between the two touchpoints.
The approach chosen was to calculate the angle between the centroid and
the touchpoints, and take the average between the angles.
Then, for the next event we calculated the new average of the angles.
However, this is not really reliable in some scenarios, suppose we have
these three angles:
0 120 240, avg = 360/3 = 120
next, touch points rotate clockwise with 2 degrees, and we get these
angles:
358 118 238, avg = 714/3 = 238
So, just by rotating all fingers by 2 degrees, we got a jump by 118
degrees "in average".
Instead we need to track the angles of *all* touch points, and when the
next touch event is received we calculate how much the angle has changed
per touch point. We then take the average of those angles as the effective
"rotation" of the PinchHandler
Change-Id: I2bfdf80b886751177efe81bcc7b698af0d2938e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-09-02 15:07:57 +00:00
|
|
|
z: 1
|
|
|
|
visible: pincher.active
|
|
|
|
radius: width / 2
|
|
|
|
width: 10
|
|
|
|
height: width
|
|
|
|
color: "red"
|
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
}
|