# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1791289500 -7200
# Node ID 1ee4886b0f2dc2b95469c87047c7a79222df5c40
# Parent  94d3f2c6fcfe6d9a967a873ac74460e26b10b193
simplifying ViewportController

diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2D/MagnifyingGlassTracker.cpp
--- 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);
     }
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2D/PanSceneTracker.cpp
--- 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_);
     }
   }
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp
--- 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)
       {
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp
--- 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();
     }
   }
 
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp
--- 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)
       {
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2DViewport/ViewportController.cpp
--- 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)
   {
diff -r 94d3f2c6fcfe -r 1ee4886b0f2d OrthancStone/Sources/Scene2DViewport/ViewportController.h
--- 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);