Mercurial > hg > orthanc-stone

changeset 2388:153403085188 refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build of web viewer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 11 Oct 2026 11:21:37 +0200
parents 560be8bec5d7
children fc70ff98a5c7
files Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp
diffstat 1 files changed, 26 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sun Oct 11 10:45:16 2026 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sun Oct 11 11:21:37 2026 +0200
@@ -2775,8 +2775,8 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().DeleteLayer(LAYER_TEXTURE);
-      //lock->GetCompositor().Refresh(lock->GetController().GetScene());
+      viewport_->GetController()->GetScene().DeleteLayer(LAYER_TEXTURE);
+      //lock->GetCompositor().Refresh(viewport_->GetController()->GetScene());
       lock->Invalidate();
     }
   }
@@ -2982,7 +2982,7 @@
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
 
-      OrthancStone::Scene2D& scene = lock->GetController().GetScene();
+      OrthancStone::Scene2D& scene = viewport_->GetController()->GetScene();
 
       bool hasPreviousSize = false;
       unsigned int previousWidth, previousHeight;
@@ -3213,13 +3213,13 @@
   {
     std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
 
-    if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE))
-    {
-      if (lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() ==
+    if (viewport_->GetController()->GetScene().HasLayer(LAYER_TEXTURE))
+    {
+      if (viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE).GetType() ==
           OrthancStone::ISceneLayer::Type_FloatTexture)
       {
         dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
-          lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)).
+          viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE)).
           SetCustomWindowing(windowingTracker_.GetWindowing().GetCenter(), windowingTracker_.GetWindowing().GetWidth());
       }
         
@@ -3344,7 +3344,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      stoneAnnotations_->Render(lock->GetController().GetScene());
+      stoneAnnotations_->Render(viewport_->GetController()->GetScene());
       lock->Invalidate();
     }
 
@@ -3463,7 +3463,7 @@
 
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->viewport_->Lock());
-      viewport->Register<OrthancStone::ViewportController::SceneTransformChanged>(lock->GetController(), &ViewerViewport::Handle);
+      viewport->Register<OrthancStone::ViewportController::SceneTransformChanged>(*viewport->viewport_->GetController(), &ViewerViewport::Handle);
     }
 
     return viewport;    
@@ -3571,11 +3571,11 @@
 
     if (fitContent)
     {
-      lock->GetCompositor().FitContent(lock->GetController().GetScene());
+      lock->GetCompositor().FitContent(viewport_->GetController()->GetScene());
     }
 
     stoneAnnotations_->ClearHover();
-    stoneAnnotations_->Render(lock->GetController().GetScene());
+    stoneAnnotations_->Render(viewport_->GetController()->GetScene());
     
     lock->Invalidate();
   }
@@ -3764,14 +3764,14 @@
 
       if (layer->GetChainsCount() == 0)
       {
-        lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
+        viewport_->GetController()->GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
       }
       else
       {
-        lock->GetController().GetScene().SetLayer(LAYER_REFERENCE_LINES, layer.release());
+        viewport_->GetController()->GetScene().SetLayer(LAYER_REFERENCE_LINES, layer.release());
       }
       
-      //lock->GetCompositor().Refresh(lock->GetController().GetScene());
+      //lock->GetCompositor().Refresh(viewport_->GetController()->GetScene());
       lock->Invalidate();
     }
   }
@@ -3781,7 +3781,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
+      viewport_->GetController()->GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
       lock->Invalidate();
     }
   }
@@ -3794,8 +3794,8 @@
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
 
-      if (!lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) ||
-          lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() !=
+      if (!viewport_->GetController()->GetScene().HasLayer(LAYER_TEXTURE) ||
+          viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE).GetType() !=
           OrthancStone::ISceneLayer::Type_FloatTexture)
       {
         return;
@@ -3803,7 +3803,7 @@
 
       const Orthanc::ImageAccessor& texture =
         dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
-          lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)).GetTexture();
+          viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE)).GetTexture();
       if (texture.GetFormat() != Orthanc::PixelFormat_Float32)
       {
         throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
@@ -3821,7 +3821,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().FlipViewportX(
+      viewport_->GetController()->GetScene().FlipViewportX(
         lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
       lock->Invalidate();
     }    
@@ -3831,7 +3831,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().FlipViewportY(
+      viewport_->GetController()->GetScene().FlipViewportY(
         lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
       lock->Invalidate();
     }
@@ -3841,7 +3841,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().RotateViewport(
+      viewport_->GetController()->GetScene().RotateViewport(
         -PI / 2.0, lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
       lock->Invalidate();
     }    
@@ -3851,7 +3851,7 @@
   {
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-      lock->GetController().GetScene().RotateViewport(
+      viewport_->GetController()->GetScene().RotateViewport(
         PI / 2.0, lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
       lock->Invalidate();
     }
@@ -3864,13 +3864,13 @@
     {
       std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
 
-      if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) &&
-          lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() ==
+      if (viewport_->GetController()->GetScene().HasLayer(LAYER_TEXTURE) &&
+          viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE).GetType() ==
           OrthancStone::ISceneLayer::Type_FloatTexture)
       {
         OrthancStone::FloatTextureSceneLayer& layer = 
           dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
-            lock->GetController().GetScene().GetLayer(LAYER_TEXTURE));
+            viewport_->GetController()->GetScene().GetLayer(LAYER_TEXTURE));
 
         // NB: Using "IsInverted()" instead of "inverted_" is for
         // compatibility with MONOCHROME1 images
@@ -4177,7 +4177,7 @@
 
         {
           std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
-          stoneAnnotations_->Render(lock->GetController().GetScene());
+          stoneAnnotations_->Render(viewport_->GetController()->GetScene());
           lock->Invalidate();
         }
       }