Mercurial > hg > orthanc-stone

changeset 1457:15173a383a00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 21:12:02 +0200
parents 86f89ab3563e
children 828a9b4ee1b7
files Framework/StoneInitialization.h Samples/Common/RtViewerApp.cpp Samples/Common/RtViewerApp.h Samples/Common/RtViewerView.cpp Samples/Common/RtViewerView.h Samples/Common/SampleHelpers.h Samples/Sdl/CMakeLists.txt Samples/Sdl/RtViewer/RtViewerSdl.cpp Samples/Sdl/SdlHelpers.h Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h Samples/WebAssembly/RtViewer/OSBOLETE.cpp Samples/WebAssembly/RtViewer/RtViewerWasm.cpp Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h
diffstat 15 files changed, 206 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/StoneInitialization.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Framework/StoneInitialization.h	Thu Jun 11 21:12:02 2020 +0200
@@ -35,7 +35,7 @@
 {
   void StoneInitialize(void* pluginContext);
 
-  void StoneInitialize()
+  inline void StoneInitialize()
   {
     StoneInitialize(NULL);
   }
--- a/Samples/Common/RtViewerApp.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Common/RtViewerApp.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -24,31 +24,29 @@
 #include "SampleHelpers.h"
 
 // Stone of Orthanc
-#include <Framework/StoneInitialization.h>
-#include <Framework/Scene2D/CairoCompositor.h>
-#include <Framework/Scene2D/ColorTextureSceneLayer.h>
-#include <Framework/Scene2D/OpenGLCompositor.h>
-#include <Framework/Scene2D/PanSceneTracker.h>
-#include <Framework/Scene2D/ZoomSceneTracker.h>
-#include <Framework/Scene2D/RotateSceneTracker.h>
-
-#include <Framework/Scene2DViewport/UndoStack.h>
-#include <Framework/Scene2DViewport/CreateLineMeasureTracker.h>
-#include <Framework/Scene2DViewport/CreateAngleMeasureTracker.h>
-#include <Framework/Scene2DViewport/IFlexiblePointerTracker.h>
-#include <Framework/Scene2DViewport/MeasureTool.h>
-#include <Framework/Scene2DViewport/PredeclaredTypes.h>
-#include <Framework/Volumes/VolumeSceneLayerSource.h>
-
-#include <Framework/Oracle/GetOrthancWebViewerJpegCommand.h>
-#include <Framework/Scene2D/GrayscaleStyleConfigurator.h>
-#include <Framework/Scene2D/LookupTableStyleConfigurator.h>
-#include <Framework/Volumes/DicomVolumeImageMPRSlicer.h>
-#include <Framework/StoneException.h>
+#include "../../Framework/StoneInitialization.h"
+#include "../../Framework/Scene2D/CairoCompositor.h"
+#include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
+#include "../../Framework/Scene2D/OpenGLCompositor.h"
+#include "../../Framework/Scene2D/PanSceneTracker.h"
+#include "../../Framework/Scene2D/ZoomSceneTracker.h"
+#include "../../Framework/Scene2D/RotateSceneTracker.h"
+#include "../../Framework/Scene2DViewport/UndoStack.h"
+#include "../../Framework/Scene2DViewport/CreateLineMeasureTracker.h"
+#include "../../Framework/Scene2DViewport/CreateAngleMeasureTracker.h"
+#include "../../Framework/Scene2DViewport/IFlexiblePointerTracker.h"
+#include "../../Framework/Scene2DViewport/MeasureTool.h"
+#include "../../Framework/Scene2DViewport/PredeclaredTypes.h"
+#include "../../Framework/Volumes/VolumeSceneLayerSource.h"
+#include "../../Framework/Oracle/GetOrthancWebViewerJpegCommand.h"
+#include "../../Framework/Scene2D/GrayscaleStyleConfigurator.h"
+#include "../../Framework/Scene2D/LookupTableStyleConfigurator.h"
+#include "../../Framework/Volumes/DicomVolumeImageMPRSlicer.h"
+#include "../../Framework/StoneException.h"
 
 // Orthanc
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 // System 
 #include <boost/shared_ptr.hpp>
--- a/Samples/Common/RtViewerApp.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Common/RtViewerApp.h	Thu Jun 11 21:12:02 2020 +0200
@@ -18,18 +18,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <Framework/Viewport/IViewport.h>
 
-#include <Framework/Loaders/DicomStructureSetLoader.h>
-#include <Framework/Loaders/OrthancMultiframeVolumeLoader.h>
-#include <Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h>
-#include <Framework/Loaders/ILoadersContext.h>
-#include <Framework/Messages/IMessageEmitter.h>
-#include <Framework/Messages/IObserver.h>
-#include <Framework/Messages/ObserverBase.h>
-#include <Framework/Oracle/OracleCommandExceptionMessage.h>
-#include <Framework/Scene2DViewport/ViewportController.h>
-#include <Framework/Volumes/DicomVolumeImage.h>
+#include "../../Framework/Loaders/DicomStructureSetLoader.h"
+#include "../../Framework/Loaders/ILoadersContext.h"
+#include "../../Framework/Loaders/OrthancMultiframeVolumeLoader.h"
+#include "../../Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
+#include "../../Framework/Messages/IMessageEmitter.h"
+#include "../../Framework/Messages/IObserver.h"
+#include "../../Framework/Messages/ObserverBase.h"
+#include "../../Framework/Oracle/OracleCommandExceptionMessage.h"
+#include "../../Framework/Scene2DViewport/ViewportController.h"
+#include "../../Framework/Viewport/IViewport.h"
+#include "../../Framework/Volumes/DicomVolumeImage.h"
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
@@ -164,4 +164,4 @@
 }
 
 
- 
\ No newline at end of file
+ 
--- a/Samples/Common/RtViewerView.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Common/RtViewerView.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -24,31 +24,29 @@
 #include "SampleHelpers.h"
 
 // Stone of Orthanc
-#include <Framework/StoneInitialization.h>
-#include <Framework/Scene2D/CairoCompositor.h>
-#include <Framework/Scene2D/ColorTextureSceneLayer.h>
-#include <Framework/Scene2D/OpenGLCompositor.h>
-#include <Framework/Scene2D/PanSceneTracker.h>
-#include <Framework/Scene2D/ZoomSceneTracker.h>
-#include <Framework/Scene2D/RotateSceneTracker.h>
-
-#include <Framework/Scene2DViewport/UndoStack.h>
-#include <Framework/Scene2DViewport/CreateLineMeasureTracker.h>
-#include <Framework/Scene2DViewport/CreateAngleMeasureTracker.h>
-#include <Framework/Scene2DViewport/IFlexiblePointerTracker.h>
-#include <Framework/Scene2DViewport/MeasureTool.h>
-#include <Framework/Scene2DViewport/PredeclaredTypes.h>
-#include <Framework/Volumes/VolumeSceneLayerSource.h>
-
-#include <Framework/Oracle/GetOrthancWebViewerJpegCommand.h>
-#include <Framework/Scene2D/GrayscaleStyleConfigurator.h>
-#include <Framework/Scene2D/LookupTableStyleConfigurator.h>
-#include <Framework/Volumes/DicomVolumeImageMPRSlicer.h>
-#include <Framework/StoneException.h>
+#include "../../Framework/Oracle/GetOrthancWebViewerJpegCommand.h"
+#include "../../Framework/Scene2D/CairoCompositor.h"
+#include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
+#include "../../Framework/Scene2D/GrayscaleStyleConfigurator.h"
+#include "../../Framework/Scene2D/LookupTableStyleConfigurator.h"
+#include "../../Framework/Scene2D/OpenGLCompositor.h"
+#include "../../Framework/Scene2D/PanSceneTracker.h"
+#include "../../Framework/Scene2D/RotateSceneTracker.h"
+#include "../../Framework/Scene2D/ZoomSceneTracker.h"
+#include "../../Framework/Scene2DViewport/CreateAngleMeasureTracker.h"
+#include "../../Framework/Scene2DViewport/CreateLineMeasureTracker.h"
+#include "../../Framework/Scene2DViewport/IFlexiblePointerTracker.h"
+#include "../../Framework/Scene2DViewport/MeasureTool.h"
+#include "../../Framework/Scene2DViewport/PredeclaredTypes.h"
+#include "../../Framework/Scene2DViewport/UndoStack.h"
+#include "../../Framework/StoneException.h"
+#include "../../Framework/StoneInitialization.h"
+#include "../../Framework/Volumes/DicomVolumeImageMPRSlicer.h"
+#include "../../Framework/Volumes/VolumeSceneLayerSource.h"
 
 // Orthanc
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 // System 
 #include <boost/shared_ptr.hpp>
@@ -345,4 +343,4 @@
 
     structLayerSource_.reset(new OrthancStone::VolumeSceneLayerSource(viewport_, depth, volume));
   }
-}
\ No newline at end of file
+}
--- a/Samples/Common/RtViewerView.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Common/RtViewerView.h	Thu Jun 11 21:12:02 2020 +0200
@@ -18,20 +18,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <Framework/Viewport/IViewport.h>
 
-#include <Framework/Loaders/DicomStructureSetLoader.h>
-#include <Framework/Loaders/OrthancMultiframeVolumeLoader.h>
-#include <Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h>
-#include <Framework/Loaders/ILoadersContext.h>
-#include <Framework/Messages/IMessageEmitter.h>
-#include <Framework/Messages/IObserver.h>
-#include <Framework/Messages/ObserverBase.h>
-#include <Framework/Oracle/OracleCommandExceptionMessage.h>
-#include <Framework/Scene2DViewport/ViewportController.h>
-
-#include <Framework/Volumes/DicomVolumeImage.h>
-#include <Framework/Volumes/VolumeSceneLayerSource.h>
+#include "../../Framework/Loaders/DicomStructureSetLoader.h"
+#include "../../Framework/Loaders/ILoadersContext.h"
+#include "../../Framework/Loaders/OrthancMultiframeVolumeLoader.h"
+#include "../../Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
+#include "../../Framework/Messages/IMessageEmitter.h"
+#include "../../Framework/Messages/IObserver.h"
+#include "../../Framework/Messages/ObserverBase.h"
+#include "../../Framework/Oracle/OracleCommandExceptionMessage.h"
+#include "../../Framework/Scene2DViewport/ViewportController.h"
+#include "../../Framework/Viewport/IViewport.h"
+#include "../../Framework/Volumes/DicomVolumeImage.h"
+#include "../../Framework/Volumes/VolumeSceneLayerSource.h"
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
@@ -132,4 +131,4 @@
     int FIXED_INFOTEXT_LAYER_ZINDEX;
     boost::shared_ptr<IViewport> viewport_;
   };
-}
\ No newline at end of file
+}
--- a/Samples/Common/SampleHelpers.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Common/SampleHelpers.h	Thu Jun 11 21:12:02 2020 +0200
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Logging.h>
+#include <Logging.h>
 
 #include <boost/algorithm/string.hpp>
 
--- a/Samples/Sdl/CMakeLists.txt	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Sdl/CMakeLists.txt	Thu Jun 11 21:12:02 2020 +0200
@@ -35,9 +35,6 @@
 include(${STONE_ROOT}/Resources/CMake/BoostExtendedConfiguration.cmake)
 include(${STONE_ROOT}/Resources/CMake/Utilities.cmake)
 
-include_directories(${STONE_ROOT})
-include_directories(../Common)
-
 add_definitions(
   -DORTHANC_ENABLE_LOGGING=1
   -DORTHANC_ENABLE_LOGGING_PLUGIN=0
--- a/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -18,21 +18,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include "RtViewerApp.h"
-#include "RtViewerView.h"
+#include "../../Common/RtViewerApp.h"
+#include "../../Common/RtViewerView.h"
 #include "../SdlHelpers.h"
 
 // Stone of Orthanc includes
-#include <Framework/Loaders/GenericLoadersContext.h>
-#include <Framework/OpenGL/OpenGLIncludes.h>
-#include <Framework/OpenGL/SdlOpenGLContext.h>
-#include <Framework/StoneException.h>
-#include <Framework/StoneInitialization.h>
+#include "../../../Framework/Loaders/GenericLoadersContext.h"
+#include "../../../Framework/OpenGL/OpenGLIncludes.h"
+#include "../../../Framework/OpenGL/SdlOpenGLContext.h"
+#include "../../../Framework/StoneException.h"
+#include "../../../Framework/StoneInitialization.h"
 
 // Orthanc (a.o. for screenshot capture)
-#include <Core/Images/Image.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Images/PngWriter.h>
+#include <Images/Image.h>
+#include <Images/ImageProcessing.h>
+#include <Images/PngWriter.h>
 
 
 #include <boost/program_options.hpp>
--- a/Samples/Sdl/SdlHelpers.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Sdl/SdlHelpers.h	Thu Jun 11 21:12:02 2020 +0200
@@ -1,10 +1,31 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
 #pragma once
 
 #if ORTHANC_ENABLE_SDL != 1
 # error This file cannot be used if ORTHANC_ENABLE_SDL != 1
 #endif
 
-#include <Framework/Viewport/SdlViewport.h>
+#include "../../Framework/Viewport/SdlViewport.h"
 
 #include <boost/shared_ptr.hpp>
 
--- a/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -3,13 +3,13 @@
 #include "../SdlHelpers.h"
 #include "../../Common/SampleHelpers.h"
 
-#include <Framework/Loaders/GenericLoadersContext.h>
-#include <Framework/StoneException.h>
-#include <Framework/StoneEnumerations.h>
-#include <Framework/StoneInitialization.h>
-#include <Framework/Viewport/SdlViewport.h>
+#include "../../../Framework/Loaders/GenericLoadersContext.h"
+#include "../../../Framework/StoneException.h"
+#include "../../../Framework/StoneEnumerations.h"
+#include "../../../Framework/StoneInitialization.h"
+#include "../../../Framework/Viewport/SdlViewport.h"
 
-#include <Core/OrthancException.h>
+#include <OrthancException.h>
 
 #include <boost/program_options.hpp>
 #include <SDL.h>
--- a/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Thu Jun 11 21:12:02 2020 +0200
@@ -1,10 +1,31 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
 #pragma once
 
-#include <Framework/Viewport/IViewport.h>
-#include <Framework/Loaders/DicomResourcesLoader.h>
-#include <Framework/Loaders/ILoadersContext.h>
-#include <Framework/Loaders/SeriesFramesLoader.h>
-#include <Framework/Loaders/SeriesThumbnailsLoader.h>
+#include "../../../Framework/Viewport/IViewport.h"
+#include "../../../Framework/Loaders/DicomResourcesLoader.h"
+#include "../../../Framework/Loaders/ILoadersContext.h"
+#include "../../../Framework/Loaders/SeriesFramesLoader.h"
+#include "../../../Framework/Loaders/SeriesThumbnailsLoader.h"
 
 #include <boost/make_shared.hpp>
 
--- a/Samples/WebAssembly/RtViewer/OSBOLETE.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/WebAssembly/RtViewer/OSBOLETE.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -18,19 +18,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <Framework/Viewport/WebAssemblyViewport.h>
-#include <Framework/Scene2D/OpenGLCompositor.h>
-#include <Framework/Scene2D/PanSceneTracker.h>
-#include <Framework/Scene2D/RotateSceneTracker.h>
-#include <Framework/Scene2D/ZoomSceneTracker.h>
-#include <Framework/Scene2DViewport/UndoStack.h>
-#include <Framework/Scene2DViewport/ViewportController.h>
-#include <Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h>
-#include <Framework/Oracle/SleepOracleCommand.h>
-#include <Framework/Oracle/WebAssemblyOracle.h>
-#include <Framework/Scene2D/GrayscaleStyleConfigurator.h>
-#include <Framework/StoneInitialization.h>
-#include <Framework/Volumes/VolumeSceneLayerSource.h>
+#include "../../../Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
+#include "../../../Framework/Oracle/SleepOracleCommand.h"
+#include "../../../Framework/Oracle/WebAssemblyOracle.h"
+#include "../../../Framework/Scene2D/GrayscaleStyleConfigurator.h"
+#include "../../../Framework/Scene2D/OpenGLCompositor.h"
+#include "../../../Framework/Scene2D/PanSceneTracker.h"
+#include "../../../Framework/Scene2D/RotateSceneTracker.h"
+#include "../../../Framework/Scene2D/ZoomSceneTracker.h"
+#include "../../../Framework/Scene2DViewport/UndoStack.h"
+#include "../../../Framework/Scene2DViewport/ViewportController.h"
+#include "../../../Framework/StoneInitialization.h"
+#include "../../../Framework/Viewport/WebAssemblyViewport.h"
+#include "../../../Framework/Volumes/VolumeSceneLayerSource.h"
 
 #include <Core/OrthancException.h>
 
--- a/Samples/WebAssembly/RtViewer/RtViewerWasm.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/WebAssembly/RtViewer/RtViewerWasm.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -23,16 +23,14 @@
 #include "SampleHelpers.h"
 
 // Stone of Orthanc includes
-#include <Framework/Loaders/WebAssemblyLoadersContext.h>
-//#include <Framework/OpenGL/WebAssemblyOpenGLContext.h>
-#include <Framework/Viewport/WebGLViewport.h>
-#include <Framework/StoneException.h>
-#include <Framework/StoneInitialization.h>
-
-#include <Framework/Loaders/WebAssemblyLoadersContext.h>
-
-#include <Framework/StoneException.h>
-#include <Framework/StoneInitialization.h>
+#include "../../../Framework/Loaders/WebAssemblyLoadersContext.h"
+#include "../../../Framework/Loaders/WebAssemblyLoadersContext.h"
+#include "../../../Framework/StoneException.h"
+#include "../../../Framework/StoneException.h"
+#include "../../../Framework/StoneInitialization.h"
+#include "../../../Framework/StoneInitialization.h"
+#include "../../../Framework/Viewport/WebGLViewport.h"
+//#include "../../../Framework/OpenGL/WebAssemblyOpenGLContext.h"
 
 #include <Core/Toolbox.h>
 
--- a/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Thu Jun 11 21:12:02 2020 +0200
@@ -1,11 +1,31 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
 #include "SingleFrameViewerApplication.h"
 
-#include <Framework/Loaders/WebAssemblyLoadersContext.h>
+#include "../../../Framework/Loaders/WebAssemblyLoadersContext.h"
+#include "../../../Framework/StoneException.h"
+#include "../../../Framework/StoneInitialization.h"
 
-#include <Framework/StoneException.h>
-#include <Framework/StoneInitialization.h>
-
-#include <Core/Toolbox.h>
+#include <Toolbox.h>
 
 #include <emscripten.h>
 #include <emscripten/html5.h>
--- a/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Thu Jun 11 20:54:16 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Thu Jun 11 21:12:02 2020 +0200
@@ -1,10 +1,31 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
 #pragma once
 
-#include <Framework/Viewport/IViewport.h>
-#include <Framework/Loaders/DicomResourcesLoader.h>
-#include <Framework/Loaders/ILoadersContext.h>
-#include <Framework/Loaders/SeriesFramesLoader.h>
-#include <Framework/Loaders/SeriesThumbnailsLoader.h>
+#include "../../../Framework/Loaders/DicomResourcesLoader.h"
+#include "../../../Framework/Loaders/ILoadersContext.h"
+#include "../../../Framework/Loaders/SeriesFramesLoader.h"
+#include "../../../Framework/Loaders/SeriesThumbnailsLoader.h"
+#include "../../../Framework/Viewport/IViewport.h"
 
 #include <boost/make_shared.hpp>