Mercurial > hg > orthanc-stone

changeset 2341:94d3f2c6fcfe refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring FixedPointAligner
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Oct 2026 14:16:31 +0200
parents ed5785f0f7c0
children 1ee4886b0f2d
files OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp
diffstat 4 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp	Tue Oct 06 10:12:07 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp	Tue Oct 06 14:16:31 2026 +0200
@@ -23,26 +23,24 @@
 
 #include "FixedPointAligner.h"
 
-#include <OrthancException.h>
-
 namespace OrthancStone
 {
   namespace Internals
   {
-    FixedPointAligner::FixedPointAligner(const ViewportController& controller,
+    FixedPointAligner::FixedPointAligner(const Scene2D& scene,
                                          const ScenePoint2D& p) :
       canvas_(p)
     {
-      pivot_ = canvas_.Apply(controller.GetCanvasToSceneTransform());
+      pivot_ = canvas_.Apply(scene.GetCanvasToSceneTransform());
     }
 
-    void FixedPointAligner::Apply(ViewportController& controller)
+    void FixedPointAligner::Apply(Scene2D& scene)
     {
-      ScenePoint2D p = canvas_.Apply(controller.GetCanvasToSceneTransform());
+      const ScenePoint2D p = canvas_.Apply(scene.GetCanvasToSceneTransform());
 
-      controller.SetSceneToCanvasTransform(
+      scene.SetSceneToCanvasTransform(
         AffineTransform2D::Combine(
-          controller.GetSceneToCanvasTransform(),
+          scene.GetSceneToCanvasTransform(),
           AffineTransform2D::CreateOffset(p.GetX() - pivot_.GetX(),
                                           p.GetY() - pivot_.GetY())));
     }
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Tue Oct 06 10:12:07 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Tue Oct 06 14:16:31 2026 +0200
@@ -22,7 +22,8 @@
 
 #pragma once
 
-#include "../../Scene2DViewport/ViewportController.h"
+#include "../../Scene2D/Scene2D.h"
+#include "../../Scene2D/ScenePoint2D.h"
 
 namespace OrthancStone
 {
@@ -37,10 +38,10 @@
       ScenePoint2D  canvas_;
 
     public:
-      FixedPointAligner(const ViewportController& controller,
+      FixedPointAligner(const Scene2D& scene,
                         const ScenePoint2D& p);
 
-      void Apply(ViewportController& controller);
+      void Apply(Scene2D& scene);
     };
   }
 }
--- a/OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp	Tue Oct 06 10:12:07 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
@@ -38,7 +38,7 @@
     
     if (locker.IsValid())
     {
-      aligner_.reset(new Internals::FixedPointAligner(locker.GetController(), click_));
+      aligner_.reset(new Internals::FixedPointAligner(locker.GetController().GetScene(), click_));
       originalSceneToCanvas_ = locker.GetController().GetSceneToCanvasTransform();
     }
   }
@@ -72,7 +72,7 @@
             AffineTransform2D::Combine(
               AffineTransform2D::CreateRotation(a - referenceAngle_),
               originalSceneToCanvas_));
-          aligner_->Apply(locker.GetController());
+          aligner_->Apply(locker.GetController().GetScene());
           locker.Invalidate();
         }
       }
--- a/OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp	Tue Oct 06 10:12:07 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/ZoomSceneTracker.cpp	Tue Oct 06 14:16:31 2026 +0200
@@ -43,7 +43,7 @@
       if (canvasHeight > 3)
       {
         normalization_ = 1.0 / static_cast<double>(canvasHeight - 1);
-        aligner_.reset(new Internals::FixedPointAligner(locker.GetController(), event.GetMainPosition()));
+        aligner_.reset(new Internals::FixedPointAligner(locker.GetController().GetScene(), event.GetMainPosition()));
       }
     }
   }
@@ -87,7 +87,7 @@
           AffineTransform2D::Combine(
             AffineTransform2D::CreateScaling(zoom, zoom),
             originalSceneToCanvas_));
-        aligner_->Apply(locker.GetController());
+        aligner_->Apply(locker.GetController().GetScene());
         locker.Invalidate();
       }
     }