changeset 2391:553fb0ce76f7 refactoring

removed IViewport::GetController()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 03 Nov 2026 15:48:26 +0100
parents ba477e5a4981
children 1e987687a33d
files Applications/Samples/Common/ISingleViewportApplicationCore.h Applications/Samples/Common/RtViewerView.cpp Applications/Samples/Common/RtViewerView.h Applications/Samples/Common/SimpleViewerCore.cpp Applications/Samples/Common/SimpleViewerCore.h Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Applications/Samples/Sdl/SingleViewportSdlApplication.cpp Applications/Samples/Sdl/SingleViewportSdlApplication.h Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp OrthancStone/Sources/Platforms/Sdl/SdlViewport.h OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyViewport.h OrthancStone/Sources/Viewport/IViewport.h
diffstat 15 files changed, 101 insertions(+), 151 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/Common/ISingleViewportApplicationCore.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Common/ISingleViewportApplicationCore.h	Tue Nov 03 15:48:26 2026 +0100
@@ -22,6 +22,7 @@
 
 #pragma once
 
+#include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
 #include "../../../OrthancStone/Sources/StoneApplication.h"
 #include "../../../OrthancStone/Sources/Viewport/IViewport.h"
 #include "../../../OrthancStone/Sources/Viewport/IViewportInteractor.h"
@@ -37,7 +38,8 @@
     }
 
     virtual void CreateComponents(const boost::shared_ptr<StoneApplication::Context>& context,
-                                  const boost::shared_ptr<IViewport>& viewport) = 0;
+                                  const boost::shared_ptr<IViewport>& viewport,
+                                  const boost::shared_ptr<ViewportController>& controller) = 0;
 
     virtual IViewportInteractor* CreateMouseInteractor() = 0;
 
--- a/Applications/Samples/Common/RtViewerView.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Common/RtViewerView.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -61,6 +61,21 @@
 
 namespace OrthancStone
 {
+  RtViewerView::RtViewerView(boost::weak_ptr<RtViewerApp> app,
+                             const std::string& canvasId,
+                             VolumeProjection projection) :
+    app_(app),
+    currentPlane_(0),
+    projection_(projection),
+    ctLayer_(0),
+    canvasId_(canvasId)
+  {
+    viewport_ = CreateViewport(canvasId);
+    controller_.reset(new ViewportController(viewport_));
+    FLOATING_INFOTEXT_LAYER_ZINDEX = 6;
+    FIXED_INFOTEXT_LAYER_ZINDEX = 7;
+  }
+
   boost::shared_ptr<RtViewerApp> RtViewerView::GetApp()
   {
     return app_.lock();
@@ -83,8 +98,7 @@
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
 
-    ViewportController& controller = *viewport_->GetController();
-    Scene2D& scene = controller.GetScene();
+    Scene2D& scene = controller_->GetScene();
 
     std::stringstream msg;
 
@@ -118,7 +132,7 @@
 
   void RtViewerView::DisplayFloatingCtrlInfoText(const PointerEvent& e)
   {
-    Scene2D& scene = viewport_->GetController()->GetScene();
+    Scene2D& scene = controller_->GetScene();
 
     ScenePoint2D p = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform());
 
@@ -148,7 +162,7 @@
 
   void RtViewerView::HideInfoText()
   {
-    viewport_->GetController()->GetScene().DeleteLayer(FLOATING_INFOTEXT_LAYER_ZINDEX);
+    controller_->GetScene().DeleteLayer(FLOATING_INFOTEXT_LAYER_ZINDEX);
   }
 
   void RtViewerView::OnSceneTransformChanged(
@@ -159,12 +173,12 @@
 
   void RtViewerView::Invalidate()
   {
-    viewport_->GetController()->InvalidateViewport();
+    controller_->InvalidateViewport();
   }
 
   void RtViewerView::FitContent()
   {
-    viewport_->GetController()->FitContent();
+    controller_->FitContent();
   }
 
   void RtViewerView::Scroll(int delta)
@@ -225,15 +239,15 @@
     {
       if (ctVolumeLayerSource_.get() != NULL)
       {
-        ctVolumeLayerSource_->Update(viewport_->GetController()->GetScene(), planes_[currentPlane_]);
+        ctVolumeLayerSource_->Update(controller_->GetScene(), planes_[currentPlane_]);
       }
       if (doseVolumeLayerSource_.get() != NULL)
       {
-        doseVolumeLayerSource_->Update(viewport_->GetController()->GetScene(), planes_[currentPlane_]);
+        doseVolumeLayerSource_->Update(controller_->GetScene(), planes_[currentPlane_]);
       }
       if (structLayerSource_.get() != NULL)
       {
-        structLayerSource_->Update(viewport_->GetController()->GetScene(), planes_[currentPlane_]);
+        structLayerSource_->Update(controller_->GetScene(), planes_[currentPlane_]);
       }
     }
     lock->Invalidate();
@@ -250,12 +264,11 @@
      **/
     lock->RefreshCanvasSize();
     
-    ViewportController& controller = *viewport_->GetController();
     ICompositor& compositor = lock->GetCompositor();
 
     // False means we do NOT let a hi-DPI aware desktop managedr treat this as a legacy application that requires
     // scaling.
-    controller.FitContent(compositor.GetCanvasWidth(), compositor.GetCanvasHeight());
+    controller_->FitContent(compositor.GetCanvasWidth(), compositor.GetCanvasHeight());
 
     std::string ttf;
     Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT);
@@ -276,8 +289,7 @@
   void RtViewerView::RegisterMessages()
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = *viewport_->GetController();
-    Register<ViewportController::SceneTransformChanged>(controller, &RtViewerView::OnSceneTransformChanged);
+    Register<ViewportController::SceneTransformChanged>(*controller_, &RtViewerView::OnSceneTransformChanged);
   }
 
   void RtViewerView::CreateLayers(boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> ctLoader,
@@ -312,8 +324,7 @@
                                        ILayerStyleConfigurator* style)
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = *viewport_->GetController();
-    Scene2D& scene = controller.GetScene();
+    Scene2D& scene = controller_->GetScene();
     int depth = scene.GetMaxDepth() + 1;
 
     ctVolumeLayerSource_.reset(new VolumeSceneLayerSource(scene, depth, volume));
@@ -330,8 +341,7 @@
                                          ILayerStyleConfigurator* style)
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = *viewport_->GetController();
-    Scene2D& scene = controller.GetScene();
+    Scene2D& scene = controller_->GetScene();
     int depth = scene.GetMaxDepth() + 1;
 
     doseVolumeLayerSource_.reset(new VolumeSceneLayerSource(scene, depth, volume));
@@ -345,8 +355,7 @@
   void RtViewerView::SetStructureSet(const boost::shared_ptr<DicomStructureSetLoader>& volume)
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = *viewport_->GetController();
-    Scene2D& scene = controller.GetScene();
+    Scene2D& scene = controller_->GetScene();
     int depth = scene.GetMaxDepth() + 1;
 
     structLayerSource_.reset(new VolumeSceneLayerSource(scene, depth, volume));
--- a/Applications/Samples/Common/RtViewerView.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Common/RtViewerView.h	Tue Nov 03 15:48:26 2026 +0100
@@ -45,17 +45,7 @@
   public:
     RtViewerView(boost::weak_ptr<RtViewerApp> app, 
                  const std::string& canvasId, 
-                 VolumeProjection projection) 
-      : app_(app)
-      , currentPlane_(0)
-      , projection_(projection)
-      , ctLayer_(0)
-      , canvasId_(canvasId)
-    {
-      viewport_ = CreateViewport(canvasId);
-      FLOATING_INFOTEXT_LAYER_ZINDEX = 6;
-      FIXED_INFOTEXT_LAYER_ZINDEX = 7;
-    }
+                 VolumeProjection projection);
 
     ~RtViewerView()
     {
@@ -106,6 +96,11 @@
       return viewport_;
     }
 
+    const boost::shared_ptr<ViewportController>& GetController() const
+    {
+      return controller_;
+    }
+
     int GetCtLayerIndex() const
     {
       return ctLayer_;
@@ -142,6 +137,7 @@
     int FLOATING_INFOTEXT_LAYER_ZINDEX;
     int FIXED_INFOTEXT_LAYER_ZINDEX;
     boost::shared_ptr<IViewport> viewport_;
+    boost::shared_ptr<ViewportController> controller_;
 
     int ctLayer_;
     std::string canvasId_;
--- a/Applications/Samples/Common/SimpleViewerCore.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Common/SimpleViewerCore.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -122,19 +122,16 @@
 
 
   void SimpleViewerCore::CreateComponents(const boost::shared_ptr<StoneApplication::Context>& context,
-                                          const boost::shared_ptr<IViewport>& viewport)
+                                          const boost::shared_ptr<IViewport>& viewport,
+                                          const boost::shared_ptr<ViewportController>& controller)
   {
     if (!context ||
-        !viewport)
+        !viewport ||
+        !controller)
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
     }
 
-    if (!viewport->GetController())
-    {
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
-    }
-
     if (context_ ||
         controller_ ||
         annotations_)
@@ -143,7 +140,7 @@
     }
 
     context_ = context;
-    controller_ = viewport->GetController();
+    controller_ = controller;
 
     dicomLoader_ = DicomResourcesLoader::Create(*context);
 
--- a/Applications/Samples/Common/SimpleViewerCore.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Common/SimpleViewerCore.h	Tue Nov 03 15:48:26 2026 +0100
@@ -65,7 +65,8 @@
 
   protected:
     virtual void CreateComponents(const boost::shared_ptr<StoneApplication::Context>& context,
-                                  const boost::shared_ptr<IViewport>& viewport) ORTHANC_OVERRIDE;
+                                  const boost::shared_ptr<IViewport>& viewport,
+                                  const boost::shared_ptr<ViewportController>& controller) ORTHANC_OVERRIDE;
 
     virtual IViewportInteractor* CreateMouseInteractor() ORTHANC_OVERRIDE;
 
--- a/Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -84,10 +84,10 @@
 #endif
   }
 
-  boost::shared_ptr<IViewport> RtViewerView::CreateViewport(const std::string& canvasId)
+  IViewport* RtViewerView::CreateViewport(const std::string& canvasId)
   {
     // False means we do NOT let Windows treat this as a legacy application that needs to be scaled
-    return SdlOpenGLViewport::Create(canvasId, 1024, 1024, false);
+    return new SdlOpenGLViewport(canvasId, 1024, 1024, false);
   }
 
   void RtViewerView::CleanupViewportEvents()
@@ -174,8 +174,7 @@
                                    unsigned int canvasHeight)
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = *viewport_->GetController();
-    const Scene2D& scene = controller.GetScene();
+    const Scene2D& scene = controller_->GetScene();
 
     std::string ttf;
     Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT);
@@ -319,7 +318,7 @@
             case SDLK_s:
             {
               std::unique_ptr<IViewport::ILock> lock(view->GetViewport()->Lock());
-              lock->GetCompositor().FitContent(view->GetViewport()->GetController()->GetScene());
+              lock->GetCompositor().FitContent(view->GetController()->GetScene());
               lock->Invalidate();
             }
             break;
@@ -350,17 +349,17 @@
               {
               case SDL_MOUSEBUTTONDOWN:
                 interactor.SetWindowingLayer(view->GetCtLayerIndex());
-                view->GetViewport()->GetController()->HandleMousePress(interactor, p,
-                                                                       lock->GetCompositor().GetCanvasWidth(),
-                                                                       lock->GetCompositor().GetCanvasHeight());
+                view->GetController()->HandleMousePress(interactor, p,
+                                                        lock->GetCompositor().GetCanvasWidth(),
+                                                        lock->GetCompositor().GetCanvasHeight());
                 break;
 
               case SDL_MOUSEMOTION:
-                view->GetViewport()->GetController()->HandleMouseMove(p);
+                view->GetController()->HandleMouseMove(p);
                 break;
 
               case SDL_MOUSEBUTTONUP:
-                view->GetViewport()->GetController()->HandleMouseRelease(p);
+                view->GetController()->HandleMouseRelease(p);
                 break;
 
               default:
@@ -395,7 +394,7 @@
                 boost::dynamic_pointer_cast<SdlViewport>(views[i]->GetViewport());
               if (sdlViewport->IsRefreshEvent(sdlEvent))
               {
-                sdlViewport->Paint();
+                sdlViewport->Paint(views[i]->GetController()->GetScene());
               }
             }
           }
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -73,10 +73,11 @@
 
   protected:
     virtual void CreateComponents(const boost::shared_ptr<StoneApplication::Context>& context,
-                                  const boost::shared_ptr<IViewport>& viewport) ORTHANC_OVERRIDE
+                                  const boost::shared_ptr<IViewport>& viewport,
+                                  const boost::shared_ptr<ViewportController>& controller) ORTHANC_OVERRIDE
     {
       toto_.reset(new Toto);
-      SimpleViewerCore::CreateComponents(context, viewport);
+      SimpleViewerCore::CreateComponents(context, viewport, controller);
     }
 
 
--- a/Applications/Samples/Sdl/SingleViewportSdlApplication.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Sdl/SingleViewportSdlApplication.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -35,7 +35,7 @@
   void SingleViewportSdlApplication::RunInternal(const boost::shared_ptr<Context>& context)
   {
     assert(core_.get() != NULL);
-    core_->CreateComponents(context, viewport_);
+    core_->CreateComponents(context, viewport_, controller_);
 
     std::unique_ptr<IViewportInteractor> interactor(core_->CreateMouseInteractor());
     if (interactor.get() == NULL)
@@ -119,27 +119,27 @@
             {
             case SDL_MOUSEBUTTONDOWN:
             {
-              viewport_->GetController()->HandleMousePress(*interactor, p, viewportLock->GetCompositor().GetCanvasWidth(),
-                                                           viewportLock->GetCompositor().GetCanvasHeight());
+              controller_->HandleMousePress(*interactor, p, viewportLock->GetCompositor().GetCanvasWidth(),
+                                            viewportLock->GetCompositor().GetCanvasHeight());
               break;
             }
 
             case SDL_MOUSEMOTION:
             {
-              if (viewport_->GetController()->HasActiveTracker())
+              if (controller_->HasActiveTracker())
               {
-                viewport_->GetController()->HandleMouseMove(p);
+                controller_->HandleMouseMove(p);
               }
               else if (interactor->HasMouseHover())
               {
-                interactor->HandleMouseHover(viewport_->GetController()->GetScene(), p);
+                interactor->HandleMouseHover(controller_->GetScene(), p);
                 viewportLock->Invalidate();
               }
               break;
             }
 
             case SDL_MOUSEBUTTONUP:
-              viewport_->GetController()->HandleMouseRelease(p);
+              controller_->HandleMouseRelease(p);
               break;
 
             default:
@@ -151,7 +151,7 @@
 
       if (paint)
       {
-        viewport_->Paint();
+        viewport_->Paint(controller_->GetScene());
       }
 
       // Small delay to avoid using 100% of CPU
@@ -176,13 +176,15 @@
 
     if (useOpenGL)
     {
-      viewport_ = SdlOpenGLViewport::Create(title, width, height);
+      viewport_.reset(new SdlOpenGLViewport(title, width, height));
     }
     else
     {
-      viewport_ = SdlCairoViewport::Create(title, width, height);
+      viewport_.reset(new SdlCairoViewport(title, width, height));
     }
 
+    controller_.reset(new ViewportController(viewport_));
+
     std::string font;
     Orthanc::EmbeddedResources::GetFileResource(font, Orthanc::EmbeddedResources::UBUNTU_FONT);
 
--- a/Applications/Samples/Sdl/SingleViewportSdlApplication.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/Sdl/SingleViewportSdlApplication.h	Tue Nov 03 15:48:26 2026 +0100
@@ -44,6 +44,7 @@
   private:
     boost::shared_ptr<ISingleViewportApplicationCore>  core_;
     boost::shared_ptr<SdlViewport>                     viewport_;
+    boost::shared_ptr<ViewportController>              controller_;
     std::unique_ptr<ICoreStartup>                      startup_;
 
   protected:
--- a/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -141,7 +141,7 @@
           viewportLock->GetCompositor().SetFont(0, font, 16, Orthanc::Encoding_Latin1);
         }
 
-        core_->CreateComponents(GetContext(), viewport_);
+        core_->CreateComponents(GetContext(), viewport_, viewport_->GetController());
 
         viewport_->AcquireInteractor(core_->CreateMouseInteractor());
 
--- a/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Tue Nov 03 15:48:26 2026 +0100
@@ -34,11 +34,13 @@
 
 namespace OrthancStone
 {
+  // TODO Refactoring - Is it still used?
   class SingleFrameViewerApplication : public ObserverBase<SingleFrameViewerApplication>
   {
   private:
     StoneApplication::Context&               context_;
     boost::shared_ptr<IViewport>             viewport_;
+    boost::shared_ptr<ViewportController>    controller_;
     boost::shared_ptr<DicomResourcesLoader>  dicomLoader_;
     boost::shared_ptr<SeriesFramesLoader>    framesLoader_;
 
@@ -47,6 +49,7 @@
       context_(context),
       viewport_(viewport)
     {
+      controller_.reset(new ViewportController(viewport));
     }
 
     void Handle(const FrameDecodedMessage& message)
@@ -59,11 +62,11 @@
         message.GetInstanceParameters().CreateTexture(message.GetImage()));
       layer->SetLinearInterpolation(true);
 
-      viewport_->GetController()->GetScene().SetLayer(0, layer.release());
+      controller_->GetScene().SetLayer(0, layer.release());
 
       {
         std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-        lock->GetCompositor().FitContent(viewport_->GetController()->GetScene());
+        lock->GetCompositor().FitContent(controller_->GetScene());
         lock->Invalidate();
       }
     }
@@ -138,7 +141,7 @@
     void FitContent()
     {
       std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-      lock->GetCompositor().FitContent(viewport_->GetController()->GetScene());
+      lock->GetCompositor().FitContent(controller_->GetScene());
       lock->Invalidate();
     }
   };
--- a/OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp	Wed Oct 21 14:53:38 2026 +0200
+++ b/OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp	Tue Nov 03 15:48:26 2026 +0100
@@ -65,11 +65,6 @@
     }
   }
   
-  void SdlViewport::PostConstructor()
-  {
-    controller_ = boost::make_shared<ViewportController>(shared_from_this());
-  }
-    
   void SdlViewport::SendRefreshEvent()
   {
     SDL_Event event;
@@ -108,20 +103,6 @@
 
 
 #if ORTHANC_ENABLE_OPENGL == 1
-  boost::shared_ptr<SdlOpenGLViewport> SdlOpenGLViewport::Create(const std::string& title,
-                                                                 unsigned int width,
-                                                                 unsigned int height,
-                                                                 bool allowDpiScaling)
-  {
-    boost::shared_ptr<SdlOpenGLViewport> that =
-      boost::shared_ptr<SdlOpenGLViewport>(new SdlOpenGLViewport(title, width, height, allowDpiScaling));
-    that->SdlViewport::PostConstructor();
-    return that;
-  }
-#endif
-
-
-#if ORTHANC_ENABLE_OPENGL == 1
   uint32_t SdlOpenGLViewport::GetSdlWindowId()
   {
     const SdlWindow& sdlWindowWrapper = context_.GetWindow();
@@ -143,10 +124,10 @@
 
 
 #if ORTHANC_ENABLE_OPENGL == 1
-  void SdlOpenGLViewport::Paint()
+  void SdlOpenGLViewport::Paint(const Scene2D& scene)
   {
     SdlLock lock(*this);
-    lock.GetCompositor().Refresh(GetController()->GetScene());
+    lock.GetCompositor().Refresh(scene);
   }
 #endif
 
@@ -192,11 +173,11 @@
     return sdlWindowId;
   }
 
-  void SdlCairoViewport::Paint()
+  void SdlCairoViewport::Paint(const Scene2D& scene)
   {
     SdlLock lock(*this);
 
-    lock.GetCompositor().Refresh(GetController()->GetScene());
+    lock.GetCompositor().Refresh(scene);
     CreateSdlSurfaceFromCompositor(dynamic_cast<CairoCompositor&>(lock.GetCompositor()));
     
     if (sdlSurface_ != NULL)
@@ -249,16 +230,4 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
     }
   }
-
-
-  boost::shared_ptr<SdlCairoViewport> SdlCairoViewport::Create(const std::string& title,
-                                                               unsigned int width,
-                                                               unsigned int height,
-                                                               bool allowDpiScaling)
-  {
-    boost::shared_ptr<SdlCairoViewport> that =
-      boost::shared_ptr<SdlCairoViewport>(new SdlCairoViewport(title, width, height, allowDpiScaling));
-    that->SdlViewport::PostConstructor();
-    return that;
-  }
 }
--- a/OrthancStone/Sources/Platforms/Sdl/SdlViewport.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/OrthancStone/Sources/Platforms/Sdl/SdlViewport.h	Tue Nov 03 15:48:26 2026 +0100
@@ -44,25 +44,17 @@
 
 #include <SDL_events.h>
 
-// TODO: required for UndoStack injection
-// I don't like it either :)
-#include <boost/weak_ptr.hpp>
-
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
 namespace OrthancStone
 {
-  class UndoStack;
-
-  class SdlViewport : public IViewport,
-                      public boost::enable_shared_from_this<SdlViewport>
+  class SdlViewport : public IViewport
   {
   private:
-    boost::recursive_mutex                 mutex_;
-    uint32_t                               refreshEvent_;
-    boost::shared_ptr<ViewportController>  controller_;
-    std::unique_ptr<ICompositor>           compositor_;
+    boost::recursive_mutex        mutex_;
+    uint32_t                      refreshEvent_;
+    std::unique_ptr<ICompositor>  compositor_;
 
     void SendRefreshEvent();
 
@@ -106,12 +98,10 @@
     void AcquireCompositor(ICompositor* compositor /* takes ownership */);
 
     virtual void RefreshCanvasSize() = 0;
-    
+
   protected:
     SdlViewport();
 
-    void PostConstructor();
-
   public:
     bool IsRefreshEvent(const SDL_Event& event) const
     {
@@ -131,12 +121,7 @@
     virtual void ToggleMaximize() = 0;
 
     // Must be invoked from the main SDL thread
-    virtual void Paint() = 0;
-
-    virtual const boost::shared_ptr<ViewportController>& GetController() const ORTHANC_OVERRIDE
-    {
-      return controller_;
-    }
+    virtual void Paint(const Scene2D& scene) = 0;
   };
 
 
@@ -146,26 +131,20 @@
   private:
     SdlOpenGLContext  context_;
 
+  protected:
+    virtual void RefreshCanvasSize() ORTHANC_OVERRIDE;
+
+  public:
     SdlOpenGLViewport(const std::string& title,
                       unsigned int       width,
                       unsigned int       height,
                       bool               allowDpiScaling = true);
 
-  protected:
-    virtual void RefreshCanvasSize() ORTHANC_OVERRIDE;
-    
-  public:
-    static boost::shared_ptr<SdlOpenGLViewport> Create(const std::string& title,
-                                                       unsigned int width,
-                                                       unsigned int height,
-                                                       bool allowDpiScaling = true);
-
-
     virtual ~SdlOpenGLViewport();
 
     virtual uint32_t GetSdlWindowId() ORTHANC_OVERRIDE;
 
-    virtual void Paint() ORTHANC_OVERRIDE;
+    virtual void Paint(const Scene2D& scene) ORTHANC_OVERRIDE;
 
     virtual void ToggleMaximize() ORTHANC_OVERRIDE;
   };
@@ -180,25 +159,20 @@
 
     void CreateSdlSurfaceFromCompositor(const CairoCompositor& compositor);
 
-    SdlCairoViewport(const std::string& title,
-                     unsigned int width,
-                     unsigned int height,
-                     bool allowDpiScaling);
-
   protected:
     virtual void RefreshCanvasSize() ORTHANC_OVERRIDE;
     
   public:
-    static boost::shared_ptr<SdlCairoViewport> Create(const std::string& title,
-                                                      unsigned int width,
-                                                      unsigned int height,
-                                                      bool allowDpiScaling = true);
+    SdlCairoViewport(const std::string& title,
+                     unsigned int width,
+                     unsigned int height,
+                     bool allowDpiScaling = true);
 
     virtual ~SdlCairoViewport();
 
     virtual uint32_t GetSdlWindowId() ORTHANC_OVERRIDE;
 
-    virtual void Paint() ORTHANC_OVERRIDE;
+    virtual void Paint(const Scene2D& scene) ORTHANC_OVERRIDE;
 
     virtual void ToggleMaximize() ORTHANC_OVERRIDE;
   };
--- a/OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyViewport.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyViewport.h	Tue Nov 03 15:48:26 2026 +0100
@@ -35,6 +35,7 @@
 
 #include "../../Viewport/IViewport.h"
 #include "../../Viewport/IViewportInteractor.h"
+#include "../../Scene2DViewport/ViewportController.h"
 
 #include <Compatibility.h>
 
@@ -50,7 +51,6 @@
 {
   class WebAssemblyViewport : public IViewport,
                               public boost::enable_shared_from_this<WebAssemblyViewport>
-
   {
   private:
     class WasmLock;
@@ -180,7 +180,7 @@
 
     void FitForPrint();
 
-    virtual const boost::shared_ptr<ViewportController>& GetController() const ORTHANC_OVERRIDE
+    const boost::shared_ptr<ViewportController>& GetController() const
     {
       return controller_;
     }
--- a/OrthancStone/Sources/Viewport/IViewport.h	Wed Oct 21 14:53:38 2026 +0200
+++ b/OrthancStone/Sources/Viewport/IViewport.h	Tue Nov 03 15:48:26 2026 +0100
@@ -26,8 +26,6 @@
 
 namespace OrthancStone
 {
-  class ViewportController;
-  
   /**
    * Class that combines a Scene2D with a canvas where to draw the
    * scene. A call to "Refresh()" will update the content of the
@@ -37,7 +35,7 @@
    * the content of the scene. 
    *
    * NB: The lock must be a "recursive_mutex", as the viewport
-   * controller can lock it a second time (TODO - Why so?).
+   * controller can lock it a second time (TODO Refactoring - Why so?).
    **/  
   class IViewport : public boost::noncopyable
   {
@@ -76,7 +74,5 @@
     }
 
     virtual ILock* Lock() = 0;
-
-    virtual const boost::shared_ptr<ViewportController>& GetController() const = 0;  // TODO Refactoring - Remove this
   };
 }