diff --git a/GUISupport/QtQuick/QQuickVTKInteractorAdapter.cxx b/GUISupport/QtQuick/QQuickVTKInteractorAdapter.cxx index 9770c514c9731f2fa4dd9bd399c9d9e5bc681e76..989294f814ebca93dce197ad6b6d8595ab36e7c2 100644 --- a/GUISupport/QtQuick/QQuickVTKInteractorAdapter.cxx +++ b/GUISupport/QtQuick/QQuickVTKInteractorAdapter.cxx @@ -36,7 +36,7 @@ bool QQuickVTKInteractorAdapter::ProcessEvent(QEvent* e, vtkRenderWindowInteract } switch (e2->pinchEventType()) { - case QQuickVTKPinchEvent::QQUICKVTK_PAN: + case QQuickVTKPinchEvent::QQUICKVTK_TRANSLATE: { double trans[2] = { e2->translation().x() * this->DevicePixelRatio + QVTKInteractorAdapter::DevicePixelRatioTolerance, diff --git a/GUISupport/QtQuick/QQuickVTKItem.cxx b/GUISupport/QtQuick/QQuickVTKItem.cxx index 14974469b6f7b9e7c1e9b24ce49cabaac3296e0f..c3df297a4384bf580f26f07e494a17969da51d8a 100644 --- a/GUISupport/QtQuick/QQuickVTKItem.cxx +++ b/GUISupport/QtQuick/QQuickVTKItem.cxx @@ -591,11 +591,11 @@ bool QQuickVTKItem::event(QEvent* ev) } //------------------------------------------------------------------------------------------------- -void QQuickVTKItem::pinchHandlerTranslate(const QPointF& position, const QVector2D& delta) +void QQuickVTKItem::pinchHandlerRotate(const QPointF& position, double delta) { Q_D(QQuickVTKItem); - auto c = QSharedPointer<QQuickVTKPinchEvent>::create( - QQuickVTKPinchEvent::QQuickVTKPinch, QQuickVTKPinchEvent::QQUICKVTK_PAN, position, delta); + auto c = QSharedPointer<QQuickVTKPinchEvent>::create(QQuickVTKPinchEvent::QQuickVTKPinch, + QQuickVTKPinchEvent::QQUICKVTK_ROTATE, position, QVector2D(0, 0), 1.0, delta); dispatch_async([d, c](vtkRenderWindow* vtkWindow, vtkUserData) mutable { d->qt2vtkInteractorAdapter.ProcessEvent(c.data(), vtkWindow->GetInteractor()); }); } @@ -611,11 +611,11 @@ void QQuickVTKItem::pinchHandlerScale(const QPointF& position, double delta) } //------------------------------------------------------------------------------------------------- -void QQuickVTKItem::pinchHandlerRotate(const QPointF& position, double delta) +void QQuickVTKItem::pinchHandlerTranslate(const QPointF& position, const QVector2D& delta) { Q_D(QQuickVTKItem); - auto c = QSharedPointer<QQuickVTKPinchEvent>::create(QQuickVTKPinchEvent::QQuickVTKPinch, - QQuickVTKPinchEvent::QQUICKVTK_ROTATE, position, QVector2D(0, 0), 1.0, delta); + auto c = QSharedPointer<QQuickVTKPinchEvent>::create( + QQuickVTKPinchEvent::QQuickVTKPinch, QQuickVTKPinchEvent::QQUICKVTK_TRANSLATE, position, delta); dispatch_async([d, c](vtkRenderWindow* vtkWindow, vtkUserData) mutable { d->qt2vtkInteractorAdapter.ProcessEvent(c.data(), vtkWindow->GetInteractor()); }); } diff --git a/GUISupport/QtQuick/QQuickVTKItem.h b/GUISupport/QtQuick/QQuickVTKItem.h index 47782856488e2e20dad62e4872dbe544810429ae..ddb1025f71882a52537dec3435def75f56405516 100644 --- a/GUISupport/QtQuick/QQuickVTKItem.h +++ b/GUISupport/QtQuick/QQuickVTKItem.h @@ -160,9 +160,9 @@ public Q_SLOTS: * * @endcode */ - Q_INVOKABLE void pinchHandlerTranslate(const QPointF& position, const QVector2D& delta); - Q_INVOKABLE void pinchHandlerScale(const QPointF& position, double delta); Q_INVOKABLE void pinchHandlerRotate(const QPointF& position, double delta); + Q_INVOKABLE void pinchHandlerScale(const QPointF& position, double delta); + Q_INVOKABLE void pinchHandlerTranslate(const QPointF& position, const QVector2D& delta); ///@} protected: diff --git a/GUISupport/QtQuick/QQuickVTKPinchEvent.cxx b/GUISupport/QtQuick/QQuickVTKPinchEvent.cxx index cb04181c73b77b9a18a2896f76ff59800fd1d6c8..39f6735735214b0f7031c0110d0cc2f0319fa7e6 100644 --- a/GUISupport/QtQuick/QQuickVTKPinchEvent.cxx +++ b/GUISupport/QtQuick/QQuickVTKPinchEvent.cxx @@ -28,7 +28,7 @@ QQuickVTKPinchEvent::QQuickVTKPinchEvent(QEvent::Type type, PinchTypes pinchType //------------------------------------------------------------------------------------------------- void QQuickVTKPinchEvent::setPinchEventType(QQuickVTKPinchEvent::PinchTypes typ) { - if (typ < QQUICKVTK_PAN || typ > QQUICKVTK_NONE) + if (typ < QQUICKVTK_TRANSLATE || typ > QQUICKVTK_NONE) { return; } diff --git a/GUISupport/QtQuick/QQuickVTKPinchEvent.h b/GUISupport/QtQuick/QQuickVTKPinchEvent.h index 13cec01ce3d809aa2d1ccfd85d7281f412217978..5abb7ba0211b7302c7d8288bf01bfbc34f383e65 100644 --- a/GUISupport/QtQuick/QQuickVTKPinchEvent.h +++ b/GUISupport/QtQuick/QQuickVTKPinchEvent.h @@ -23,7 +23,7 @@ class VTKGUISUPPORTQTQUICK_EXPORT QQuickVTKPinchEvent : public QEvent public: enum PinchTypes { - QQUICKVTK_PAN, + QQUICKVTK_TRANSLATE, QQUICKVTK_SCALE, QQUICKVTK_ROTATE, QQUICKVTK_NONE