diff OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp @ 1972:9c0adcc8feec

refactoring to simplify OneGesturePointerTracker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 28 Oct 2022 16:21:28 +0200
parents 7053b8a0aaec
children 07964689cb0b
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp	Fri Oct 28 13:38:19 2022 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp	Fri Oct 28 16:21:28 2022 +0200
@@ -46,14 +46,15 @@
     command_.reset(new EditLineMeasureCommand(measureTool, viewport));
   }
 
-  void EditLineMeasureTracker::PointerMove(const PointerEvent& e)
+  void EditLineMeasureTracker::PointerMove(const PointerEvent& e,
+                                           const Scene2D& scene)
   {
     std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
     ViewportController& controller = lock->GetController();
-    const Scene2D& scene = controller.GetScene();
+    const Scene2D& scene2 = controller.GetScene();
 
     ScenePoint2D scenePos = e.GetMainPosition().Apply(
-      scene.GetCanvasToSceneTransform());
+      scene2.GetCanvasToSceneTransform());
 
     ScenePoint2D delta = scenePos - GetOriginalClickPosition();
 
@@ -91,12 +92,14 @@
     }
   }
 
-  void EditLineMeasureTracker::PointerUp(const PointerEvent& e)
+  void EditLineMeasureTracker::PointerUp(const PointerEvent& e,
+                                         const Scene2D& scene)
   {
     alive_ = false;
   }
 
-  void EditLineMeasureTracker::PointerDown(const PointerEvent& e)
+  void EditLineMeasureTracker::PointerDown(const PointerEvent& e,
+                                           const Scene2D& scene)
   {
     LOG(WARNING) << "Additional touches (fingers, pen, mouse buttons...) "
       "are ignored when the edit line tracker is active";