# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1566397497 -7200
# Node ID 966c96b694f69f5a18dec29a15e262eb159e89cf
# Parent  a7351ad549603819a519c201c25618d390351642# Parent  01d55c979698ed378deffc795b311b77db2367df
Merge

diff -r a7351ad54960 -r 966c96b694f6 Framework/Loaders/DicomStructureSetLoader.cpp
--- a/Framework/Loaders/DicomStructureSetLoader.cpp	Wed Aug 21 16:16:30 2019 +0200
+++ b/Framework/Loaders/DicomStructureSetLoader.cpp	Wed Aug 21 16:24:57 2019 +0200
@@ -226,8 +226,8 @@
 
   DicomStructureSetLoader::DicomStructureSetLoader(IOracle& oracle,
                                                    IObservable& oracleObservable) :
+    LoaderStateMachine(oracle, oracleObservable),
     IObservable(oracleObservable.GetBroker()),
-    LoaderStateMachine(oracle, oracleObservable),
     revision_(0),
     countProcessedInstances_(0),
     countReferencedInstances_(0),
diff -r a7351ad54960 -r 966c96b694f6 Resources/CMake/OrthancStoneConfiguration.cmake
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Aug 21 16:16:30 2019 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Aug 21 16:24:57 2019 +0200
@@ -245,9 +245,8 @@
 #####################################################################
 
 set(APPLICATIONS_SOURCES
-    ${ORTHANC_STONE_ROOT}/Applications/IStoneApplication.h
-    ${ORTHANC_STONE_ROOT}/Applications/StoneApplicationContext.cpp
-    )
+  ${ORTHANC_STONE_ROOT}/Applications/IStoneApplication.h
+  )
 
 if (NOT ORTHANC_SANDBOXED)
   set(PLATFORM_SOURCES
@@ -257,12 +256,12 @@
     ${ORTHANC_STONE_ROOT}/Platforms/Generic/WebServiceDeleteCommand.cpp
     ${ORTHANC_STONE_ROOT}/Platforms/Generic/DelayedCallCommand.cpp
     ${ORTHANC_STONE_ROOT}/Platforms/Generic/Oracle.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Generic/OracleWebService.cpp
     ${ORTHANC_STONE_ROOT}/Platforms/Generic/OracleDelayedCallExecutor.h
     )
 
   if (ENABLE_STONE_DEPRECATED)
     list(APPEND PLATFORM_SOURCES
+      ${ORTHANC_STONE_ROOT}/Platforms/Generic/OracleWebService.cpp
       ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/CairoFont.cpp
       )
   endif()
@@ -329,6 +328,7 @@
 
 if (ENABLE_STONE_DEPRECATED)
   list(APPEND ORTHANC_STONE_SOURCES
+    ${ORTHANC_STONE_ROOT}/Applications/StoneApplicationContext.cpp
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/CircleMeasureTracker.cpp
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/ColorFrameRenderer.cpp
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp
@@ -373,6 +373,22 @@
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/WorldSceneWidget.cpp
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/ZoomMouseTracker.cpp
     ${ORTHANC_STONE_ROOT}/Framework/Deprecated/dev.h
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyAlphaLayer.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyDicomLayer.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayer.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerCropTracker.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMaskTracker.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMoveTracker.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerResizeTracker.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerRotateTracker.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyMaskLayer.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyScene.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneCommand.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneReader.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneWriter.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyTextLayer.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWidget.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWindowingTracker.cpp
     )
 endif()
 
@@ -426,22 +442,6 @@
   ${ORTHANC_STONE_ROOT}/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Oracle/OracleCommandWithPayload.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Oracle/OrthancRestApiCommand.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyAlphaLayer.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyDicomLayer.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayer.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerCropTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMaskTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMoveTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerResizeTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerRotateTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyMaskLayer.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyScene.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneCommand.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneReader.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneWriter.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyTextLayer.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWidget.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWindowingTracker.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Scene2D/CairoCompositor.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Scene2D/ColorTextureSceneLayer.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Scene2D/FloatTextureSceneLayer.cpp