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 QtQuick module of the Qt Toolkit.
|
|
|
|
**
|
|
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
|
|
** 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 Lesser General Public License Usage
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
|
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
|
|
**
|
|
|
|
** GNU General Public License Usage
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
** General Public License version 2.0 or (at your option) the GNU General
|
|
|
|
** Public license version 3 or any later version approved by the KDE Free
|
|
|
|
** Qt Foundation. The licenses are as published by the Free Software
|
|
|
|
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
|
|
** 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-2.0.html and
|
|
|
|
** https://www.gnu.org/licenses/gpl-3.0.html.
|
|
|
|
**
|
|
|
|
** $QT_END_LICENSE$
|
|
|
|
**
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
#include "qquickpinchhandler_p.h"
|
|
|
|
#include <QtQuick/qquickwindow.h>
|
|
|
|
#include <private/qsgadaptationlayer_p.h>
|
|
|
|
#include <private/qquickitem_p.h>
|
|
|
|
#include <private/qguiapplication_p.h>
|
|
|
|
#include <private/qquickwindow_p.h>
|
|
|
|
#include <QEvent>
|
|
|
|
#include <QMouseEvent>
|
|
|
|
#include <QDebug>
|
|
|
|
#include <qpa/qplatformnativeinterface.h>
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
|
|
|
Q_LOGGING_CATEGORY(lcPinchHandler, "qt.quick.handler.pinch")
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\qmltype PinchHandler
|
|
|
|
\instantiates QQuickPinchHandler
|
|
|
|
\inqmlmodule QtQuick
|
|
|
|
\ingroup qtquick-handlers
|
|
|
|
\brief Handler for pinch gestures
|
|
|
|
|
|
|
|
PinchHandler is a handler that is used to interactively rotate and zoom an Item.
|
|
|
|
*/
|
|
|
|
|
|
|
|
QQuickPinchHandler::QQuickPinchHandler(QObject *parent)
|
|
|
|
: QQuickMultiPointerHandler(parent, 2)
|
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
|
|
|
, m_activeScale(1)
|
|
|
|
, m_activeRotation(0)
|
|
|
|
, m_activeTranslation(0,0)
|
2015-08-11 16:14:02 +00:00
|
|
|
, m_minimumScale(-qInf())
|
|
|
|
, m_maximumScale(qInf())
|
|
|
|
, m_minimumRotation(-qInf())
|
|
|
|
, m_maximumRotation(qInf())
|
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
|
|
|
, m_minimumX(-qInf())
|
|
|
|
, m_maximumX(qInf())
|
|
|
|
, m_minimumY(-qInf())
|
|
|
|
, m_maximumY(qInf())
|
2015-08-11 16:14:02 +00:00
|
|
|
, m_pinchOrigin(PinchCenter)
|
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
|
|
|
, m_startScale(1)
|
|
|
|
, m_startRotation(0)
|
2015-08-11 16:14:02 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
QQuickPinchHandler::~QQuickPinchHandler()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::setMinimumScale(qreal minimumScale)
|
|
|
|
{
|
|
|
|
if (m_minimumScale == minimumScale)
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_minimumScale = minimumScale;
|
|
|
|
emit minimumScaleChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::setMaximumScale(qreal maximumScale)
|
|
|
|
{
|
|
|
|
if (m_maximumScale == maximumScale)
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_maximumScale = maximumScale;
|
|
|
|
emit maximumScaleChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::setMinimumRotation(qreal minimumRotation)
|
|
|
|
{
|
|
|
|
if (m_minimumRotation == minimumRotation)
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_minimumRotation = minimumRotation;
|
|
|
|
emit minimumRotationChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::setMaximumRotation(qreal maximumRotation)
|
|
|
|
{
|
|
|
|
if (m_maximumRotation == maximumRotation)
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_maximumRotation = maximumRotation;
|
|
|
|
emit maximumRotationChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::setPinchOrigin(QQuickPinchHandler::PinchOrigin pinchOrigin)
|
|
|
|
{
|
|
|
|
if (m_pinchOrigin == pinchOrigin)
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_pinchOrigin = pinchOrigin;
|
|
|
|
emit pinchOriginChanged();
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::minimumX
|
|
|
|
|
|
|
|
The minimum acceptable x coordinate of the centroid
|
|
|
|
*/
|
|
|
|
void QQuickPinchHandler::setMinimumX(qreal minX)
|
|
|
|
{
|
|
|
|
if (m_minimumX == minX)
|
|
|
|
return;
|
|
|
|
m_minimumX = minX;
|
|
|
|
emit minimumXChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::maximumX
|
|
|
|
|
|
|
|
The maximum acceptable x coordinate of the centroid
|
|
|
|
*/
|
|
|
|
void QQuickPinchHandler::setMaximumX(qreal maxX)
|
|
|
|
{
|
|
|
|
if (m_maximumX == maxX)
|
|
|
|
return;
|
|
|
|
m_maximumX = maxX;
|
|
|
|
emit maximumXChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::minimumY
|
|
|
|
|
|
|
|
The minimum acceptable y coordinate of the centroid
|
|
|
|
*/
|
|
|
|
void QQuickPinchHandler::setMinimumY(qreal minY)
|
|
|
|
{
|
|
|
|
if (m_minimumY == minY)
|
|
|
|
return;
|
|
|
|
m_minimumY = minY;
|
|
|
|
emit minimumYChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::maximumY
|
|
|
|
|
|
|
|
The maximum acceptable y coordinate of the centroid
|
|
|
|
*/
|
|
|
|
void QQuickPinchHandler::setMaximumY(qreal maxY)
|
|
|
|
{
|
|
|
|
if (m_maximumY == maxY)
|
|
|
|
return;
|
|
|
|
m_maximumY = maxY;
|
|
|
|
emit maximumYChanged();
|
|
|
|
}
|
|
|
|
|
2015-08-11 16:14:02 +00:00
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::minimumTouchPoints
|
|
|
|
|
|
|
|
The pinch begins when this number of fingers are pressed.
|
|
|
|
Until then, PinchHandler tracks the positions of any pressed fingers,
|
|
|
|
but if it's an insufficient number, it does not scale or rotate
|
|
|
|
its \l target, and the \l active property will remain false.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\qmlproperty QQuickPinchHandler::active
|
|
|
|
*/
|
|
|
|
|
|
|
|
void QQuickPinchHandler::onActiveChanged()
|
|
|
|
{
|
|
|
|
if (active()) {
|
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
|
|
|
if (const QQuickItem *t = target()) {
|
|
|
|
m_startScale = t->scale(); // TODO incompatible with independent x/y scaling
|
|
|
|
m_startRotation = t->rotation();
|
|
|
|
m_startCentroid = touchPointCentroid();
|
|
|
|
m_startAngles = angles(m_startCentroid);
|
|
|
|
m_startDistance = averageTouchPointDistance(m_startCentroid);
|
|
|
|
QVector3D xformOrigin(t->transformOriginPoint());
|
|
|
|
m_startMatrix = QMatrix4x4();
|
|
|
|
m_startMatrix.translate(t->x(), t->y());
|
|
|
|
m_startMatrix.translate(xformOrigin);
|
|
|
|
m_startMatrix.scale(m_startScale);
|
|
|
|
m_startMatrix.rotate(m_startRotation, 0, 0, -1);
|
|
|
|
m_startMatrix.translate(-xformOrigin);
|
|
|
|
m_activeRotation = 0;
|
|
|
|
m_activeTranslation = QPointF(0,0);
|
|
|
|
qCInfo(lcPinchHandler) << "activated with starting scale" << m_startScale << "rotation" << m_startRotation;
|
|
|
|
grabPoints(m_currentPoints);
|
|
|
|
}
|
2016-10-18 09:49:13 +00:00
|
|
|
} else {
|
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
|
|
|
qCInfo(lcPinchHandler) << "deactivated with scale" << m_activeScale << "rotation" << m_activeRotation;
|
2015-08-11 16:14:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
|
|
|
{
|
|
|
|
Q_UNUSED(event)
|
2016-12-08 18:19:04 +00:00
|
|
|
// TODO wait for the drag threshold before setting active
|
|
|
|
// but the old behavior was that whenever we "want" all the points, we're active
|
|
|
|
// so that behavior is retained here temporarily
|
|
|
|
setActive(m_currentPoints.count() > 0 && m_currentPoints.at(0)->state() != QQuickEventPoint::Released);
|
2015-08-11 16:14:02 +00:00
|
|
|
|
|
|
|
if (Q_UNLIKELY(lcPinchHandler().isDebugEnabled())) {
|
|
|
|
for (QQuickEventPoint *point : qAsConst(m_currentPoints))
|
|
|
|
qCDebug(lcPinchHandler) << point->state() << point->sceneGrabPos() << "->" << point->scenePos();
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO check m_pinchOrigin: right now it acts like it's set to PinchCenter
|
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
|
|
|
m_centroid = touchPointCentroid();
|
2016-10-18 09:49:13 +00:00
|
|
|
QRectF bounds(m_minimumX, m_minimumY, m_maximumX, m_maximumY);
|
|
|
|
// avoid mapping the minima and maxima, as they might have unmappable values
|
|
|
|
// such as -inf/+inf. Because of this we perform the bounding to min/max in local coords.
|
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
|
|
|
QPointF centroidParentPos;
|
2016-10-18 09:49:13 +00:00
|
|
|
if (target() && target()->parentItem()) {
|
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
|
|
|
centroidParentPos = target()->parentItem()->mapFromScene(m_centroid);
|
|
|
|
centroidParentPos = QPointF(qBound(bounds.left(), centroidParentPos.x(), bounds.right()),
|
|
|
|
qBound(bounds.top(), centroidParentPos.y(), bounds.bottom()));
|
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
|
|
|
// 1. scale
|
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
|
|
|
const qreal dist = averageTouchPointDistance(m_centroid);
|
|
|
|
m_activeScale = dist / m_startDistance;
|
|
|
|
m_activeScale = qBound(m_minimumScale/m_startScale, m_activeScale, m_maximumScale/m_startScale);
|
|
|
|
const qreal scale = m_startScale * m_activeScale;
|
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
|
|
|
|
|
|
|
// 2. rotate
|
|
|
|
QVector<PointData> newAngles = angles(m_centroid);
|
|
|
|
const qreal angleDelta = averageAngleDelta(m_startAngles, newAngles);
|
|
|
|
m_activeRotation += angleDelta;
|
|
|
|
const qreal totalRotation = m_startRotation + m_activeRotation;
|
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
|
|
|
const qreal rotation = qBound(m_minimumRotation, totalRotation, m_maximumRotation);
|
|
|
|
m_activeRotation += (rotation - totalRotation); //adjust for the potential bounding above
|
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
|
|
|
m_startAngles = std::move(newAngles);
|
|
|
|
|
2016-10-18 09:49:13 +00:00
|
|
|
if (target() && target()->parentItem()) {
|
|
|
|
// 3. Drag/translate
|
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
|
|
|
const QPointF centroidStartParentPos = target()->parentItem()->mapFromScene(m_startCentroid);
|
|
|
|
m_activeTranslation = centroidParentPos - centroidStartParentPos;
|
2016-10-18 09:49:13 +00:00
|
|
|
|
|
|
|
// apply rotation + scaling around the centroid - then apply translation.
|
|
|
|
QMatrix4x4 mat;
|
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
|
|
|
|
|
|
|
const QVector3D centroidParentVector(centroidParentPos);
|
|
|
|
mat.translate(centroidParentVector);
|
|
|
|
mat.rotate(m_activeRotation, 0, 0, 1);
|
|
|
|
mat.scale(m_activeScale);
|
|
|
|
mat.translate(-centroidParentVector);
|
|
|
|
mat.translate(QVector3D(m_activeTranslation));
|
|
|
|
|
|
|
|
mat = mat * m_startMatrix;
|
|
|
|
|
|
|
|
QPointF xformOriginPoint = target()->transformOriginPoint();
|
|
|
|
QPointF pos = mat * xformOriginPoint;
|
|
|
|
pos -= xformOriginPoint;
|
|
|
|
|
|
|
|
target()->setPosition(pos);
|
|
|
|
target()->setRotation(rotation);
|
|
|
|
target()->setScale(scale);
|
|
|
|
|
2016-10-18 09:49:13 +00:00
|
|
|
|
|
|
|
// TODO some translation inadvertently happens; try to hold the chosen pinch origin in place
|
|
|
|
|
|
|
|
qCDebug(lcPinchHandler) << "centroid" << m_startCentroid << "->" << m_centroid
|
|
|
|
<< ", distance" << m_startDistance << "->" << dist
|
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
|
|
|
<< ", startScale" << m_startScale << "->" << scale
|
2016-10-18 09:49:13 +00:00
|
|
|
<< ", activeRotation" << m_activeRotation
|
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
|
|
|
<< ", rotation" << rotation;
|
2016-10-18 09:49:13 +00:00
|
|
|
}
|
2015-08-11 16:14:02 +00:00
|
|
|
|
2016-11-22 16:34:53 +00:00
|
|
|
acceptPoints(m_currentPoints);
|
2015-08-11 16:14:02 +00:00
|
|
|
emit updated();
|
|
|
|
}
|
|
|
|
|
|
|
|
QT_END_NAMESPACE
|