Mercurial > hg > orthanc-stone

changeset 2342:1ee4886b0f2d refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplifying ViewportController
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Oct 2026 14:25:00 +0200
parents 94d3f2c6fcfe
children e4d4e5d274fc
files OrthancStone/Sources/Scene2D/MagnifyingGlassTracker.cpp OrthancStone/Sources/Scene2D/PanSceneTracker.cpp OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp OrthancStone/Sources/Scene2DViewport/ViewportController.cpp OrthancStone/Sources/Scene2DViewport/ViewportController.h
diffstat 7 files changed, 9 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2D/MagnifyingGlassTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/MagnifyingGlassTracker.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -52,9 +52,9 @@
     
     if (locker.IsValid())
     {
-      originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
-      originalCanvasToScene_ = locker.GetController().GetCanvasToSceneTransform();
-      pivot_ = event.GetMainPosition().Apply(locker.GetController().GetCanvasToSceneTransform());
+      originalSceneToCanvas_ = locker.GetController().GetScene().GetSceneToCanvasTransform();
+      originalCanvasToScene_ = locker.GetController().GetScene().GetCanvasToSceneTransform();
+      pivot_ = event.GetMainPosition().Apply(locker.GetController().GetScene().GetCanvasToSceneTransform());
 
       Update(locker, event);
     }
--- a/OrthancStone/Sources/Scene2D/PanSceneTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/PanSceneTracker.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -36,8 +36,8 @@
     
     if (locker.IsValid())
     {
-      originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
-      originalCanvasToScene_ = locker.GetController().GetCanvasToSceneTransform();
+      originalSceneToCanvas_ = locker.GetController().GetScene().GetSceneToCanvasTransform();
+      originalCanvasToScene_ = locker.GetController().GetScene().GetCanvasToSceneTransform();
       pivot_ = event.GetMainPosition().Apply(originalCanvasToScene_);
     }
   }
--- a/OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -45,8 +45,8 @@
 
     if (locker.IsValid())
     {
-      originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
-      originalCanvasToScene_ = locker.GetController().GetCanvasToSceneTransform();
+      originalSceneToCanvas_ = locker.GetController().GetScene().GetSceneToCanvasTransform();
+      originalCanvasToScene_ = locker.GetController().GetScene().GetCanvasToSceneTransform();
 
       if (event.GetPositionsCount() == 1)
       {
--- a/OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -39,7 +39,7 @@
     if (locker.IsValid())
     {
       aligner_.reset(new Internals::FixedPointAligner(locker.GetController().GetScene(), click_));
-      originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
+      originalSceneToCanvas_ = locker.GetController().GetScene().GetSceneToCanvasTransform();
     }
   }
 
--- a/OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -38,7 +38,7 @@
     
     if (locker.IsValid())
     {
-      originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
+      originalSceneToCanvas_ = locker.GetController().GetScene().GetSceneToCanvasTransform();
 
       if (canvasHeight > 3)
       {
--- a/OrthancStone/Sources/Scene2DViewport/ViewportController.cpp	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/ViewportController.cpp	Tue Oct 06 14:25:00 2026 +0200
@@ -130,18 +130,6 @@
     }
   }
 
-  AffineTransform2D 
-    ViewportController::GetCanvasToSceneTransform() const
-  {
-    return scene_->GetCanvasToSceneTransform();
-  }
-
-  AffineTransform2D 
-    ViewportController::GetSceneToCanvasTransform() const
-  {
-    return scene_->GetSceneToCanvasTransform();
-  }
-
   void ViewportController::SetSceneToCanvasTransform(
     const AffineTransform2D& transform)
   {
--- a/OrthancStone/Sources/Scene2DViewport/ViewportController.h	Tue Oct 06 14:16:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/ViewportController.h	Tue Oct 06 14:25:00 2026 +0200
@@ -138,12 +138,6 @@
       activeTracker_ = tracker;
     }
 
-    /** Forwarded to the underlying scene */
-    AffineTransform2D GetCanvasToSceneTransform() const;
-
-    /** Forwarded to the underlying scene */
-    AffineTransform2D GetSceneToCanvasTransform() const;
-
     /** Forwarded to the underlying scene, and broadcasted to the observers */
     void SetSceneToCanvasTransform(const AffineTransform2D& transform);