# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1558507132 -7200
# Node ID c0fcb2757b0a486a5b9cb999fa718427f67c4087
# Parent  c3bbb130abc42b33c25c36b81406e28fb5d5bf50
enforce relative includes

diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Deprecated/Toolbox/BaseWebService.cpp
--- a/Framework/Deprecated/Toolbox/BaseWebService.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Deprecated/Toolbox/BaseWebService.cpp	Wed May 22 08:38:52 2019 +0200
@@ -21,9 +21,11 @@
 
 #include "BaseWebService.h"
 
+#include "../../Messages/IObservable.h"
+#include "../../../Platforms/Generic/IOracleCommand.h"
+
 #include <Core/OrthancException.h>
-#include "Framework/Messages/IObservable.h"
-#include "Platforms/Generic/IOracleCommand.h"
+
 #include <boost/shared_ptr.hpp>
 
 namespace Deprecated
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Deprecated/Toolbox/OrthancSlicesLoader.h
--- a/Framework/Deprecated/Toolbox/OrthancSlicesLoader.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Deprecated/Toolbox/OrthancSlicesLoader.h	Wed May 22 08:38:52 2019 +0200
@@ -23,9 +23,9 @@
 
 #include "../../Messages/IObservable.h"
 #include "../../StoneEnumerations.h"
+#include "../../Toolbox/SlicesSorter.h"
 #include "IWebService.h"
 #include "OrthancApiClient.h"
-#include "../../Toolbox/SlicesSorter.h"
 #include "Slice.h"
 
 #include <Core/Images/Image.h>
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Deprecated/dev.h
--- a/Framework/Deprecated/dev.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Deprecated/dev.h	Wed May 22 08:38:52 2019 +0200
@@ -27,8 +27,8 @@
 #include "Toolbox/DownloadStack.h"
 #include "Toolbox/GeometryToolbox.h"
 #include "Toolbox/OrthancSlicesLoader.h"
+#include "Volumes/ISlicedVolume.h"
 #include "Volumes/ImageBuffer3D.h"
-#include "Volumes/ISlicedVolume.h"
 #include "Widgets/SliceViewerWidget.h"
 
 #include <Core/Logging.h>
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/Internals/FixedPointAligner.cpp
--- a/Framework/Scene2D/Internals/FixedPointAligner.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/Internals/FixedPointAligner.cpp	Wed May 22 08:38:52 2019 +0200
@@ -18,7 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <Framework/Scene2DViewport/ViewportController.h>
+#include "../../Scene2DViewport/ViewportController.h"
 #include "FixedPointAligner.h"
 
 namespace OrthancStone
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/Internals/FixedPointAligner.h
--- a/Framework/Scene2D/Internals/FixedPointAligner.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/Internals/FixedPointAligner.h	Wed May 22 08:38:52 2019 +0200
@@ -20,15 +20,15 @@
 
 #pragma once
 
-#include <Framework/Scene2DViewport/PointerTypes.h>
-#include <Framework/Scene2D/ScenePoint2D.h>
+#include "../../Scene2DViewport/PointerTypes.h"
+#include "../../Scene2D/ScenePoint2D.h"
 
 namespace OrthancStone
 {
   namespace Internals
   {
     // During a mouse event that modifies the view of a scene, keeps
-    // one point (the pivot) at the same position on the canvas
+    // one point (the pivot) at a fixed position on the canvas
     class FixedPointAligner : public boost::noncopyable
     {
     private:
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/PanSceneTracker.cpp
--- a/Framework/Scene2D/PanSceneTracker.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/PanSceneTracker.cpp	Wed May 22 08:38:52 2019 +0200
@@ -20,7 +20,7 @@
 
 
 #include "PanSceneTracker.h"
-#include <Framework/Scene2DViewport/ViewportController.h>
+#include "../Scene2DViewport/ViewportController.h"
 
 namespace OrthancStone
 {
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/RotateSceneTracker.cpp
--- a/Framework/Scene2D/RotateSceneTracker.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/RotateSceneTracker.cpp	Wed May 22 08:38:52 2019 +0200
@@ -19,7 +19,7 @@
  **/
 
 #include "RotateSceneTracker.h"
-#include <Framework/Scene2DViewport/ViewportController.h>
+#include "../Scene2DViewport/ViewportController.h"
 
 namespace OrthancStone
 {
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/Scene2D.h
--- a/Framework/Scene2D/Scene2D.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/Scene2D.h	Wed May 22 08:38:52 2019 +0200
@@ -23,8 +23,8 @@
 
 #include "ISceneLayer.h"
 #include "../Toolbox/AffineTransform2D.h"
-#include <Framework/Messages/IObservable.h>
-#include <Framework/Messages/IMessage.h>
+#include "../Messages/IObservable.h"
+#include "../Messages/IMessage.h"
 
 #include <map>
 
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2D/ZoomSceneTracker.cpp
--- a/Framework/Scene2D/ZoomSceneTracker.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2D/ZoomSceneTracker.cpp	Wed May 22 08:38:52 2019 +0200
@@ -20,7 +20,7 @@
 
 
 #include "ZoomSceneTracker.h"
-#include <Framework/Scene2DViewport/ViewportController.h>
+#include "../Scene2DViewport/ViewportController.h"
 
 namespace OrthancStone
 {
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/AngleMeasureTool.h
--- a/Framework/Scene2DViewport/AngleMeasureTool.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/AngleMeasureTool.h	Wed May 22 08:38:52 2019 +0200
@@ -21,11 +21,10 @@
 #pragma once
 
 #include "MeasureTools.h"
-
-#include <Framework/Scene2D/Scene2D.h>
-#include <Framework/Scene2D/ScenePoint2D.h>
-#include <Framework/Scene2D/PolylineSceneLayer.h>
-#include <Framework/Scene2D/TextSceneLayer.h>
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/ScenePoint2D.h"
+#include "../Scene2D/PolylineSceneLayer.h"
+#include "../Scene2D/TextSceneLayer.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/CreateSimpleTrackerAdapter.cpp
--- a/Framework/Scene2DViewport/CreateSimpleTrackerAdapter.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/CreateSimpleTrackerAdapter.cpp	Wed May 22 08:38:52 2019 +0200
@@ -19,7 +19,7 @@
  **/
 
 #include "IFlexiblePointerTracker.h"
-#include <Framework/Scene2D/IPointerTracker.h>
+#include "../Scene2D/IPointerTracker.h"
 
 
 namespace OrthancStone
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/IFlexiblePointerTracker.h
--- a/Framework/Scene2DViewport/IFlexiblePointerTracker.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/IFlexiblePointerTracker.h	Wed May 22 08:38:52 2019 +0200
@@ -23,7 +23,7 @@
 
 #include "PointerTypes.h"
 
-#include <Framework/Scene2D/PointerEvent.h>
+#include "../Scene2D/PointerEvent.h"
 
 namespace OrthancStone
 {
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/LineMeasureTool.h
--- a/Framework/Scene2DViewport/LineMeasureTool.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/LineMeasureTool.h	Wed May 22 08:38:52 2019 +0200
@@ -20,13 +20,12 @@
 
 #pragma once
 
+#include "../Scene2D/PolylineSceneLayer.h"
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/ScenePoint2D.h"
+#include "../Scene2D/TextSceneLayer.h"
 #include "MeasureTools.h"
 
-#include <Framework/Scene2D/Scene2D.h>
-#include <Framework/Scene2D/ScenePoint2D.h>
-#include <Framework/Scene2D/PolylineSceneLayer.h>
-#include <Framework/Scene2D/TextSceneLayer.h>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/MeasureCommands.h
--- a/Framework/Scene2DViewport/MeasureCommands.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureCommands.h	Wed May 22 08:38:52 2019 +0200
@@ -19,9 +19,7 @@
  **/
 #pragma once
 
-#include <Framework/Scene2D/Scene2D.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+#include "../Scene2D/Scene2D.h"
 
 // to be moved into Stone
 #include "PointerTypes.h"
@@ -29,6 +27,9 @@
 #include "LineMeasureTool.h"
 #include "AngleMeasureTool.h"
 
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+
 namespace OrthancStone
 {
   class TrackerCommand : public boost::noncopyable
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/MeasureTools.h
--- a/Framework/Scene2DViewport/MeasureTools.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureTools.h	Wed May 22 08:38:52 2019 +0200
@@ -20,13 +20,12 @@
 
 #pragma once
 
-#include <Framework/Scene2DViewport/PointerTypes.h>
-#include <Framework/Scene2DViewport/ViewportController.h>
-
-#include <Framework/Scene2D/Scene2D.h>
-#include <Framework/Scene2D/ScenePoint2D.h>
-#include <Framework/Scene2D/PolylineSceneLayer.h>
-#include <Framework/Scene2D/TextSceneLayer.h>
+#include "../Scene2D/PolylineSceneLayer.h"
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/ScenePoint2D.h"
+#include "../Scene2D/TextSceneLayer.h"
+#include "../Scene2DViewport/PointerTypes.h"
+#include "../Scene2DViewport/ViewportController.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/MeasureToolsToolbox.cpp
--- a/Framework/Scene2DViewport/MeasureToolsToolbox.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureToolsToolbox.cpp	Wed May 22 08:38:52 2019 +0200
@@ -20,7 +20,7 @@
 
 #include "MeasureToolsToolbox.h"
 
-#include <Framework/Scene2D/TextSceneLayer.h>
+#include "../Scene2D/TextSceneLayer.h"
 
 #include <boost/math/constants/constants.hpp>
 
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/MeasureToolsToolbox.h
--- a/Framework/Scene2DViewport/MeasureToolsToolbox.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureToolsToolbox.h	Wed May 22 08:38:52 2019 +0200
@@ -18,8 +18,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include <Framework/Scene2D/PolylineSceneLayer.h>
-#include <Framework/Scene2D/Scene2D.h>
+#include "../Scene2D/PolylineSceneLayer.h"
+#include "../Scene2D/Scene2D.h"
 
 namespace OrthancStone
 {
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/MeasureTrackers.h
--- a/Framework/Scene2DViewport/MeasureTrackers.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureTrackers.h	Wed May 22 08:38:52 2019 +0200
@@ -21,8 +21,8 @@
 #pragma once
 
 #include "IFlexiblePointerTracker.h"
-#include "../../Framework/Scene2D/Scene2D.h"
-#include "../../Framework/Scene2D/PointerEvent.h"
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/PointerEvent.h"
 
 #include "MeasureTools.h"
 #include "MeasureCommands.h"
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/OneGesturePointerTracker.cpp
--- a/Framework/Scene2DViewport/OneGesturePointerTracker.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/OneGesturePointerTracker.cpp	Wed May 22 08:38:52 2019 +0200
@@ -23,7 +23,7 @@
 
 #include <Core/OrthancException.h>
 
-#include <Framework/StoneException.h>
+#include "../StoneException.h"
 
 using namespace Orthanc;
 
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/ViewportController.cpp
--- a/Framework/Scene2DViewport/ViewportController.cpp	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/ViewportController.cpp	Wed May 22 08:38:52 2019 +0200
@@ -21,7 +21,7 @@
 #include "ViewportController.h"
 #include "MeasureCommands.h"
 
-#include <Framework/StoneException.h>
+#include "../StoneException.h"
 
 #include <boost/make_shared.hpp>
 
diff -r c3bbb130abc4 -r c0fcb2757b0a Framework/Scene2DViewport/ViewportController.h
--- a/Framework/Scene2DViewport/ViewportController.h	Tue May 21 16:15:06 2019 +0200
+++ b/Framework/Scene2DViewport/ViewportController.h	Wed May 22 08:38:52 2019 +0200
@@ -22,9 +22,9 @@
 
 #include "PointerTypes.h"
 
-#include <Framework/Scene2D/Scene2D.h>
-#include <Framework/Scene2D/PointerEvent.h>
-#include <Framework/Scene2DViewport/IFlexiblePointerTracker.h>
+#include "../Scene2D/Scene2D.h"
+#include "../Scene2D/PointerEvent.h"
+#include "../Scene2DViewport/IFlexiblePointerTracker.h"
 
 #include <stack>