Skip to content
Snippets Groups Projects
Commit 287f60fe authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri :speech_balloon:
Browse files

Replace pinch event pan to translate to match QML

The pinch handler fires a `onTranslationChanged` event, so sticking to
that naming convention in QQuickVTKPinchEvent.
parent 3e78d1f8
No related branches found
No related tags found
No related merge requests found
......@@ -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,
......
......@@ -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()); });
}
......
......@@ -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:
......
......@@ -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;
}
......
......@@ -23,7 +23,7 @@ class VTKGUISUPPORTQTQUICK_EXPORT QQuickVTKPinchEvent : public QEvent
public:
enum PinchTypes
{
QQUICKVTK_PAN,
QQUICKVTK_TRANSLATE,
QQUICKVTK_SCALE,
QQUICKVTK_ROTATE,
QQUICKVTK_NONE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment