# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1597147433 -7200
# Node ID 6e0da8370270c6fa6eb9703f9b2ff3bed57b7fce
# Parent  ae17c8c8838f9832287e4f8ddf9f526374bac9e5
fixing paths

diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Common/RtViewerApp.cpp
--- a/Applications/Samples/Common/RtViewerApp.cpp	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Common/RtViewerApp.cpp	Tue Aug 11 14:03:53 2020 +0200
@@ -24,25 +24,25 @@
 #include "SampleHelpers.h"
 
 // Stone of Orthanc
-#include "../../Sources/StoneInitialization.h"
-#include "../../Sources/Scene2D/CairoCompositor.h"
-#include "../../Sources/Scene2D/ColorTextureSceneLayer.h"
-#include "../../Sources/Scene2D/OpenGLCompositor.h"
-#include "../../Sources/Scene2D/PanSceneTracker.h"
-#include "../../Sources/Scene2D/ZoomSceneTracker.h"
-#include "../../Sources/Scene2D/RotateSceneTracker.h"
-#include "../../Sources/Scene2DViewport/UndoStack.h"
-#include "../../Sources/Scene2DViewport/CreateLineMeasureTracker.h"
-#include "../../Sources/Scene2DViewport/CreateAngleMeasureTracker.h"
-#include "../../Sources/Scene2DViewport/IFlexiblePointerTracker.h"
-#include "../../Sources/Scene2DViewport/MeasureTool.h"
-#include "../../Sources/Scene2DViewport/PredeclaredTypes.h"
-#include "../../Sources/Volumes/VolumeSceneLayerSource.h"
-#include "../../Sources/Oracle/GetOrthancWebViewerJpegCommand.h"
-#include "../../Sources/Scene2D/GrayscaleStyleConfigurator.h"
-#include "../../Sources/Scene2D/LookupTableStyleConfigurator.h"
-#include "../../Sources/Volumes/DicomVolumeImageMPRSlicer.h"
-#include "../../Sources/StoneException.h"
+#include "../../../OrthancStone/Sources/StoneInitialization.h"
+#include "../../../OrthancStone/Sources/Scene2D/CairoCompositor.h"
+#include "../../../OrthancStone/Sources/Scene2D/ColorTextureSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/OpenGLCompositor.h"
+#include "../../../OrthancStone/Sources/Scene2D/PanSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2D/ZoomSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2D/RotateSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/UndoStack.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/CreateLineMeasureTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/IFlexiblePointerTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/MeasureTool.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/PredeclaredTypes.h"
+#include "../../../OrthancStone/Sources/Volumes/VolumeSceneLayerSource.h"
+#include "../../../OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.h"
+#include "../../../OrthancStone/Sources/Scene2D/GrayscaleStyleConfigurator.h"
+#include "../../../OrthancStone/Sources/Scene2D/LookupTableStyleConfigurator.h"
+#include "../../../OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.h"
+#include "../../../OrthancStone/Sources/StoneException.h"
 
 // Orthanc
 #include <Logging.h>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Common/RtViewerApp.h
--- a/Applications/Samples/Common/RtViewerApp.h	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Common/RtViewerApp.h	Tue Aug 11 14:03:53 2020 +0200
@@ -21,17 +21,17 @@
 
 #pragma once
 
-#include "../../Sources/Loaders/DicomStructureSetLoader.h"
-#include "../../Sources/Loaders/ILoadersContext.h"
-#include "../../Sources/Loaders/OrthancMultiframeVolumeLoader.h"
-#include "../../Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
-#include "../../Sources/Messages/IMessageEmitter.h"
-#include "../../Sources/Messages/IObserver.h"
-#include "../../Sources/Messages/ObserverBase.h"
-#include "../../Sources/Oracle/OracleCommandExceptionMessage.h"
-#include "../../Sources/Scene2DViewport/ViewportController.h"
-#include "../../Sources/Viewport/IViewport.h"
-#include "../../Sources/Volumes/DicomVolumeImage.h"
+#include "../../../OrthancStone/Sources/Loaders/DicomStructureSetLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/ILoadersContext.h"
+#include "../../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
+#include "../../../OrthancStone/Sources/Messages/IMessageEmitter.h"
+#include "../../../OrthancStone/Sources/Messages/IObserver.h"
+#include "../../../OrthancStone/Sources/Messages/ObserverBase.h"
+#include "../../../OrthancStone/Sources/Oracle/OracleCommandExceptionMessage.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
+#include "../../../OrthancStone/Sources/Viewport/IViewport.h"
+#include "../../../OrthancStone/Sources/Volumes/DicomVolumeImage.h"
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Common/RtViewerView.cpp
--- a/Applications/Samples/Common/RtViewerView.cpp	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Common/RtViewerView.cpp	Tue Aug 11 14:03:53 2020 +0200
@@ -27,25 +27,25 @@
 #include <EmbeddedResources.h>
 
 // Stone of Orthanc
-#include "../../Sources/Oracle/GetOrthancWebViewerJpegCommand.h"
-#include "../../Sources/Scene2D/CairoCompositor.h"
-#include "../../Sources/Scene2D/ColorTextureSceneLayer.h"
-#include "../../Sources/Scene2D/GrayscaleStyleConfigurator.h"
-#include "../../Sources/Scene2D/LookupTableStyleConfigurator.h"
-#include "../../Sources/Scene2D/OpenGLCompositor.h"
-#include "../../Sources/Scene2D/PanSceneTracker.h"
-#include "../../Sources/Scene2D/RotateSceneTracker.h"
-#include "../../Sources/Scene2D/ZoomSceneTracker.h"
-#include "../../Sources/Scene2DViewport/CreateAngleMeasureTracker.h"
-#include "../../Sources/Scene2DViewport/CreateLineMeasureTracker.h"
-#include "../../Sources/Scene2DViewport/IFlexiblePointerTracker.h"
-#include "../../Sources/Scene2DViewport/MeasureTool.h"
-#include "../../Sources/Scene2DViewport/PredeclaredTypes.h"
-#include "../../Sources/Scene2DViewport/UndoStack.h"
-#include "../../Sources/StoneException.h"
-#include "../../Sources/StoneInitialization.h"
-#include "../../Sources/Volumes/DicomVolumeImageMPRSlicer.h"
-#include "../../Sources/Volumes/VolumeSceneLayerSource.h"
+#include "../../../OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.h"
+#include "../../../OrthancStone/Sources/Scene2D/CairoCompositor.h"
+#include "../../../OrthancStone/Sources/Scene2D/ColorTextureSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/GrayscaleStyleConfigurator.h"
+#include "../../../OrthancStone/Sources/Scene2D/LookupTableStyleConfigurator.h"
+#include "../../../OrthancStone/Sources/Scene2D/OpenGLCompositor.h"
+#include "../../../OrthancStone/Sources/Scene2D/PanSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2D/RotateSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2D/ZoomSceneTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/CreateLineMeasureTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/IFlexiblePointerTracker.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/MeasureTool.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/PredeclaredTypes.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/UndoStack.h"
+#include "../../../OrthancStone/Sources/StoneException.h"
+#include "../../../OrthancStone/Sources/StoneInitialization.h"
+#include "../../../OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.h"
+#include "../../../OrthancStone/Sources/Volumes/VolumeSceneLayerSource.h"
 
 // Orthanc
 #include <Compatibility.h>  // For std::unique_ptr<>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Common/RtViewerView.h
--- a/Applications/Samples/Common/RtViewerView.h	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Common/RtViewerView.h	Tue Aug 11 14:03:53 2020 +0200
@@ -21,18 +21,18 @@
 
 #pragma once
 
-#include "../../Sources/Loaders/DicomStructureSetLoader.h"
-#include "../../Sources/Loaders/ILoadersContext.h"
-#include "../../Sources/Loaders/OrthancMultiframeVolumeLoader.h"
-#include "../../Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
-#include "../../Sources/Messages/IMessageEmitter.h"
-#include "../../Sources/Messages/IObserver.h"
-#include "../../Sources/Messages/ObserverBase.h"
-#include "../../Sources/Oracle/OracleCommandExceptionMessage.h"
-#include "../../Sources/Scene2DViewport/ViewportController.h"
-#include "../../Sources/Viewport/IViewport.h"
-#include "../../Sources/Volumes/DicomVolumeImage.h"
-#include "../../Sources/Volumes/VolumeSceneLayerSource.h"
+#include "../../../OrthancStone/Sources/Loaders/DicomStructureSetLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/ILoadersContext.h"
+#include "../../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
+#include "../../../OrthancStone/Sources/Messages/IMessageEmitter.h"
+#include "../../../OrthancStone/Sources/Messages/IObserver.h"
+#include "../../../OrthancStone/Sources/Messages/ObserverBase.h"
+#include "../../../OrthancStone/Sources/Oracle/OracleCommandExceptionMessage.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
+#include "../../../OrthancStone/Sources/Viewport/IViewport.h"
+#include "../../../OrthancStone/Sources/Volumes/DicomVolumeImage.h"
+#include "../../../OrthancStone/Sources/Volumes/VolumeSceneLayerSource.h"
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Sdl/CMakeLists.txt
--- a/Applications/Samples/Sdl/CMakeLists.txt	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Sdl/CMakeLists.txt	Tue Aug 11 14:03:53 2020 +0200
@@ -2,7 +2,7 @@
 
 project(OrthancStone)
 
-include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/OrthancStoneParameters.cmake)
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneParameters.cmake)
 
 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
   set(ORTHANC_BOOST_COMPONENTS program_options)
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp
--- a/Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp	Tue Aug 11 14:03:53 2020 +0200
@@ -25,11 +25,11 @@
 #include <EmbeddedResources.h>
 
 // Stone of Orthanc includes
-#include "../../../Sources/Loaders/GenericLoadersContext.h"
-#include "../../../Sources/OpenGL/OpenGLIncludes.h"
-#include "../../../Sources/OpenGL/SdlOpenGLContext.h"
-#include "../../../Sources/StoneException.h"
-#include "../../../Sources/StoneInitialization.h"
+#include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h"
+#include "../../../../OrthancStone/Sources/OpenGL/OpenGLIncludes.h"
+#include "../../../../OrthancStone/Sources/OpenGL/SdlOpenGLContext.h"
+#include "../../../../OrthancStone/Sources/StoneException.h"
+#include "../../../../OrthancStone/Sources/StoneInitialization.h"
 
 // Orthanc (a.o. for screenshot capture)
 #include <Compatibility.h>  // For std::unique_ptr<>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Sdl/SdlHelpers.h
--- a/Applications/Samples/Sdl/SdlHelpers.h	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Sdl/SdlHelpers.h	Tue Aug 11 14:03:53 2020 +0200
@@ -25,7 +25,7 @@
 # error This file cannot be used if ORTHANC_ENABLE_SDL != 1
 #endif
 
-#include "../../Sources/Viewport/SdlViewport.h"
+#include "../../../OrthancStone/Sources/Viewport/SdlViewport.h"
 
 #include <boost/shared_ptr.hpp>
 
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Tue Aug 11 14:03:53 2020 +0200
@@ -23,11 +23,11 @@
 #include "../SdlHelpers.h"
 #include "../../Common/SampleHelpers.h"
 
-#include "../../../Sources/Loaders/GenericLoadersContext.h"
-#include "../../../Sources/StoneException.h"
-#include "../../../Sources/StoneEnumerations.h"
-#include "../../../Sources/StoneInitialization.h"
-#include "../../../Sources/Viewport/SdlViewport.h"
+#include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h"
+#include "../../../../OrthancStone/Sources/StoneException.h"
+#include "../../../../OrthancStone/Sources/StoneEnumerations.h"
+#include "../../../../OrthancStone/Sources/StoneInitialization.h"
+#include "../../../../OrthancStone/Sources/Viewport/SdlViewport.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <OrthancException.h>
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Tue Aug 11 14:03:53 2020 +0200
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include "../../../Sources/Viewport/IViewport.h"
-#include "../../../Sources/Loaders/DicomResourcesLoader.h"
-#include "../../../Sources/Loaders/ILoadersContext.h"
-#include "../../../Sources/Loaders/SeriesFramesLoader.h"
-#include "../../../Sources/Loaders/SeriesThumbnailsLoader.h"
+#include "../../../../OrthancStone/Sources/Viewport/IViewport.h"
+#include "../../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h"
+#include "../../../../OrthancStone/Sources/Loaders/ILoadersContext.h"
+#include "../../../../OrthancStone/Sources/Loaders/SeriesFramesLoader.h"
+#include "../../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/WebAssembly/CMakeLists.txt
--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Tue Aug 11 14:03:53 2020 +0200
@@ -29,7 +29,7 @@
 # ---------------------------------------------------------------
 set(ALLOW_DOWNLOADS ON)
 
-include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/OrthancStoneParameters.cmake)
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneParameters.cmake)
 
 SET(ENABLE_DCMTK OFF)  # Not necessary
 SET(ENABLE_GOOGLE_TEST OFF)
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/WebAssembly/docker-build.sh
--- a/Applications/Samples/WebAssembly/docker-build.sh	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/WebAssembly/docker-build.sh	Tue Aug 11 14:03:53 2020 +0200
@@ -22,6 +22,6 @@
     --user $(id -u):$(id -g) \
     -v ${ROOT_DIR}:/source:ro \
     -v ${ROOT_DIR}/wasm-binaries:/target:rw ${IMAGE} \
-    bash /source/OrthancStone/Samples/WebAssembly/docker-internal.sh $1
+    bash /source/Applications/Samples/WebAssembly/docker-internal.sh $1
 
 ls -lR ${ROOT_DIR}/wasm-binaries/
diff -r ae17c8c8838f -r 6e0da8370270 Applications/Samples/WebAssembly/docker-internal.sh
--- a/Applications/Samples/WebAssembly/docker-internal.sh	Tue Aug 11 13:47:24 2020 +0200
+++ b/Applications/Samples/WebAssembly/docker-internal.sh	Tue Aug 11 14:03:53 2020 +0200
@@ -19,7 +19,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-cmake /tmp/source-writeable/OrthancStone/Samples/WebAssembly \
+cmake /tmp/source-writeable/Applications/Samples/WebAssembly \
       -DCMAKE_BUILD_TYPE=$1 \
       -DCMAKE_INSTALL_PREFIX=/target \
       -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \