Mercurial > hg > orthanc-stone

changeset 389:3e6e10a5a6c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Nov 2018 17:28:32 +0100
parents 20f149669c1f
children 0cb925325470
files Applications/Commands/BaseCommands.yml Applications/Samples/SingleVolumeApplication.h Framework/Toolbox/Slice.h Platforms/Wasm/Defaults.cpp Platforms/Wasm/Defaults.h
diffstat 5 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Commands/BaseCommands.yml	Fri Nov 09 17:26:39 2018 +0100
+++ b/Applications/Commands/BaseCommands.yml	Fri Nov 09 17:28:32 2018 +0100
@@ -3,8 +3,8 @@
   toolName: string
   comment: Selects the current application tool
 DownloadDicom:
-  target: LayerWidget
-  comment: Downloads the slice currently displayed in the LayerWidget
+  target: SliceViewerWidget
+  comment: Downloads the slice currently displayed in the SliceViewerWidget
 Export:
   target: IWidget
   comment: Export the content of the widget
\ No newline at end of file
--- a/Applications/Samples/SingleVolumeApplication.h	Fri Nov 09 17:26:39 2018 +0100
+++ b/Applications/Samples/SingleVolumeApplication.h	Fri Nov 09 17:28:32 2018 +0100
@@ -44,7 +44,7 @@
       class Interactor : public VolumeImageInteractor
       {
       private:
-        LayerWidget&  widget_;
+        SliceViewerWidget&  widget_;
         size_t        layer_;
         
       protected:
@@ -70,14 +70,14 @@
                                double y,
                                IStatusBar* statusBar)
         {
-          const LayerWidget& w = dynamic_cast<const LayerWidget&>(widget);
+          const SliceViewerWidget& w = dynamic_cast<const SliceViewerWidget&>(widget);
           Vector p = w.GetSlice().MapSliceToWorldCoordinates(x, y);
           printf("%f %f %f\n", p[0], p[1], p[2]);
         }
       
       public:
         Interactor(OrthancVolumeImage& volume,
-                   LayerWidget& widget,
+                   SliceViewerWidget& widget,
                    VolumeProjection projection,
                    size_t layer) :
           VolumeImageInteractor(volume, widget, projection),
@@ -171,7 +171,7 @@
           throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
         }
 
-        std::auto_ptr<LayerWidget> widget(new LayerWidget);
+        std::auto_ptr<SliceViewerWidget> widget(new SliceViewerWidget);
 
 #if 1
         std::auto_ptr<OrthancVolumeImage> volume(new OrthancVolumeImage(context.GetWebService(), true));
--- a/Framework/Toolbox/Slice.h	Fri Nov 09 17:26:39 2018 +0100
+++ b/Framework/Toolbox/Slice.h	Fri Nov 09 17:28:32 2018 +0100
@@ -75,7 +75,7 @@
     }
 
     // TODO Is this constructor the best way to go to tackle missing
-    // layers within LayerWidget?
+    // layers within SliceViewerWidget?
     Slice(const CoordinateSystem3D& plane,
           double thickness) :
       type_(Type_Standalone),
--- a/Platforms/Wasm/Defaults.cpp	Fri Nov 09 17:26:39 2018 +0100
+++ b/Platforms/Wasm/Defaults.cpp	Fri Nov 09 17:28:32 2018 +0100
@@ -4,7 +4,6 @@
 #include <Framework/dev.h>
 #include "Framework/Widgets/TestCairoWidget.h"
 #include <Framework/Viewport/WidgetViewport.h>
-#include <Framework/Widgets/LayerWidget.h>
 #include <algorithm>
 #include "Applications/Wasm/StartupParametersBuilder.h"
 #include "Platforms/Wasm/WasmPlatformApplicationAdapter.h"
--- a/Platforms/Wasm/Defaults.h	Fri Nov 09 17:26:39 2018 +0100
+++ b/Platforms/Wasm/Defaults.h	Fri Nov 09 17:28:32 2018 +0100
@@ -4,7 +4,6 @@
 
 #include <Framework/dev.h>
 #include <Framework/Viewport/WidgetViewport.h>
-#include <Framework/Widgets/LayerWidget.h>
 #include <Framework/Widgets/LayoutWidget.h>
 #include <Applications/IStoneApplication.h>
 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>