From 53b8e7fa0316be42db01f2293b69b0b74d35f31e Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Mon, 22 Jun 2020 13:27:54 +0100 Subject: [PATCH] Fix comments and grammer --- app/widget/viewer/viewerdisplay.cpp | 6 +++--- app/widget/viewer/viewerdisplay.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index 2ecb54222..c5e5492bb 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -207,7 +207,7 @@ QTransform ViewerDisplayWidget::GenerateWorldTransform() return world; } -QPoint ViewerDisplayWidget::TransformViewerSpaceToGizmoSpace(QPoint pos) +QPoint ViewerDisplayWidget::TransformViewerSpaceToBufferSpace(QPoint pos) { /* * Inversion will only fail is the viewer has been scaled by 0 in any direction @@ -219,7 +219,7 @@ QPoint ViewerDisplayWidget::TransformViewerSpaceToGizmoSpace(QPoint pos) void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton && gizmos_ - && gizmos_->GizmoPress(gizmo_db_, TransformViewerSpaceToGizmoSpace(event->pos()), + && gizmos_->GizmoPress(gizmo_db_, TransformViewerSpaceToBufferSpace(event->pos()), QVector2D(GetTexturePosition(size())), size())) { gizmo_click_ = true; gizmo_drag_time_ = GetGizmoTime(); @@ -268,7 +268,7 @@ void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event) } if (gizmo_click_) { - gizmos_->GizmoMove(TransformViewerSpaceToGizmoSpace(event->pos()), + gizmos_->GizmoMove(TransformViewerSpaceToBufferSpace(event->pos()), QVector2D(GetTexturePosition(size())), gizmo_drag_time_); update(); return; diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h index 09dad2ac7..29bf30706 100644 --- a/app/widget/viewer/viewerdisplay.h +++ b/app/widget/viewer/viewerdisplay.h @@ -99,7 +99,11 @@ public: */ QTransform GenerateWorldTransform(); - QPoint TransformViewerSpaceToGizmoSpace(QPoint pos); + /** + * @brief Transform a point from viewer space to the buffer space. + * Multiplies by the inverted transform matrix to undo the scaling and translation. + */ + QPoint TransformViewerSpaceToBufferSpace(QPoint pos); public slots: /**