# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1791450696 -7200
# Node ID 1fb8828effa1a6ac5c73fcfcbb6c78388de0e2f2
# Parent  cb7b6eb39ebbac71fdf1525d35b1c96965e01dfc
cont

diff -r cb7b6eb39ebb -r 1fb8828effa1 Applications/Samples/Common/RtViewerApp.cpp
--- a/Applications/Samples/Common/RtViewerApp.cpp	Thu Oct 08 10:47:46 2026 +0200
+++ b/Applications/Samples/Common/RtViewerApp.cpp	Thu Oct 08 11:11:36 2026 +0200
@@ -38,7 +38,6 @@
 #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"
diff -r cb7b6eb39ebb -r 1fb8828effa1 Applications/Samples/Common/RtViewerView.cpp
--- a/Applications/Samples/Common/RtViewerView.cpp	Thu Oct 08 10:47:46 2026 +0200
+++ b/Applications/Samples/Common/RtViewerView.cpp	Thu Oct 08 11:11:36 2026 +0200
@@ -41,7 +41,6 @@
 #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"
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake
--- a/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Oct 08 11:11:36 2026 +0200
@@ -323,7 +323,6 @@
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/BaseFlexiblePointerTracker.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateAngleMeasureCommand.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateAngleMeasureTracker.cpp
-  ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateCircleMeasureTracker.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateLineMeasureCommand.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateLineMeasureTracker.cpp
   ${ORTHANC_STONE_ROOT}/Scene2DViewport/CreateMeasureTracker.cpp
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.h
--- a/OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.h	Thu Oct 08 11:11:36 2026 +0200
@@ -22,16 +22,12 @@
 
 #pragma once
 
-#include "MeasureTool.h"
-
 #include "../Scene2DViewport/LayerHolder.h"
-#include "../Scene2D/Scene2D.h"
 #include "../Scene2D/ScenePoint2D.h"
 #include "../Scene2D/PolylineSceneLayer.h"
 #include "../Scene2D/TextSceneLayer.h"
+#include "MeasureTool.h"
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
 #include <vector>
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.h
--- a/OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.h	Thu Oct 08 11:11:36 2026 +0200
@@ -22,10 +22,10 @@
 
 #pragma once
 
+#include "CreateAngleMeasureCommand.h"
 #include "MeasureTrackers.h"
 #include "MeasureCommands.h"
 
-#include <vector>
 
 namespace OrthancStone
 {
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/CreateCircleMeasureTracker.cpp
--- a/OrthancStone/Sources/Scene2DViewport/CreateCircleMeasureTracker.cpp	Thu Oct 08 10:47:46 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-namespace OrthancStone
-{
-}
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/CreateCircleMeasureTracker.h
--- a/OrthancStone/Sources/Scene2DViewport/CreateCircleMeasureTracker.h	Thu Oct 08 10:47:46 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-#pragma once
-
-namespace OrthancStone
-{
-}
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/CreateLineMeasureTracker.h
--- a/OrthancStone/Sources/Scene2DViewport/CreateLineMeasureTracker.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/CreateLineMeasureTracker.h	Thu Oct 08 11:11:36 2026 +0200
@@ -22,6 +22,7 @@
 
 #pragma once
 
+#include "CreateLineMeasureCommand.h"
 #include "MeasureTrackers.h"
 
 #include <boost/shared_ptr.hpp>
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/IFlexiblePointerTracker.h
--- a/OrthancStone/Sources/Scene2DViewport/IFlexiblePointerTracker.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/IFlexiblePointerTracker.h	Thu Oct 08 11:11:36 2026 +0200
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "PredeclaredTypes.h"
-
 #include "../Scene2D/PointerEvent.h"
 #include "../Scene2D/Scene2D.h"
 #include "../Toolbox/Windowing.h"
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/LayerHolder.h
--- a/OrthancStone/Sources/Scene2DViewport/LayerHolder.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/LayerHolder.h	Thu Oct 08 11:11:36 2026 +0200
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "PredeclaredTypes.h"
-
 #include "../Viewport/IViewport.h"
 
 #include <boost/noncopyable.hpp>
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/LineMeasureTool.h
--- a/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.h	Thu Oct 08 11:11:36 2026 +0200
@@ -26,6 +26,7 @@
 #include "../Scene2D/Scene2D.h"
 #include "../Scene2D/ScenePoint2D.h"
 #include "../Scene2D/TextSceneLayer.h"
+#include "LayerHolder.h"
 #include "MeasureTool.h"
 
 #include <boost/shared_ptr.hpp>
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/MeasureCommands.h
--- a/OrthancStone/Sources/Scene2DViewport/MeasureCommands.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/MeasureCommands.h	Thu Oct 08 11:11:36 2026 +0200
@@ -24,7 +24,6 @@
 #include "../Viewport/IViewport.h"
 
 // to be moved into Stone
-#include "PredeclaredTypes.h"
 #include "MeasureTool.h"
 #include "LineMeasureTool.h"
 #include "AngleMeasureTool.h"
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/MeasureTool.h
--- a/OrthancStone/Sources/Scene2DViewport/MeasureTool.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/MeasureTool.h	Thu Oct 08 11:11:36 2026 +0200
@@ -23,13 +23,9 @@
 #pragma once
 
 #include "../Messages/ObserverBase.h"
-#include "../Scene2D/PolylineSceneLayer.h"
-#include "../Scene2D/Scene2D.h"
 #include "../Scene2D/ScenePoint2D.h"
 #include "../Scene2D/TextSceneLayer.h"
-#include "../Scene2DViewport/PredeclaredTypes.h"
-#include "../Scene2DViewport/ViewportController.h"
-#include "../Viewport/IViewport.h"
+#include "ViewportController.h"
 
 #include <boost/weak_ptr.hpp>
 
@@ -38,8 +34,6 @@
 
 namespace OrthancStone
 {
-  class IFlexiblePointerTracker;
-
   class MeasureTool : public ObserverBase<MeasureTool>
   {
   public:
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.cpp
--- a/OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.cpp	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.cpp	Thu Oct 08 11:11:36 2026 +0200
@@ -21,7 +21,6 @@
  **/
 
 #include "MeasureToolsToolbox.h"
-#include "PredeclaredTypes.h"
 #include "LayerHolder.h"
 #include "ViewportController.h"
 
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.h
--- a/OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/MeasureToolsToolbox.h	Thu Oct 08 11:11:36 2026 +0200
@@ -23,10 +23,12 @@
 
 #pragma once
 
-#include "PredeclaredTypes.h"
+#include "LayerHolder.h"
 #include "../Scene2D/PolylineSceneLayer.h"
 #include "../Scene2D/Scene2D.h"
 
+#include <boost/shared_ptr.hpp>
+
 namespace OrthancStone
 {
 
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/PredeclaredTypes.h
--- a/OrthancStone/Sources/Scene2DViewport/PredeclaredTypes.h	Thu Oct 08 10:47:46 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-#pragma once
-
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-namespace OrthancStone
-
-{
-  class Scene2D;
-  class MeasureTool;
-  class LineMeasureTool;
-  class AngleMeasureTool;
-  class IPointerTracker;
-  class IFlexiblePointerTracker;
-  class CreateMeasureCommand;
-  class CreateLineMeasureCommand;
-  class CreateAngleMeasureCommand;
-  class MeasureCommand;
-  class ViewportController;
-  class LayerHolder;
-  class IViewport;
-}
diff -r cb7b6eb39ebb -r 1fb8828effa1 OrthancStone/Sources/Scene2DViewport/ViewportController.h
--- a/OrthancStone/Sources/Scene2DViewport/ViewportController.h	Thu Oct 08 10:47:46 2026 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/ViewportController.h	Thu Oct 08 11:11:36 2026 +0200
@@ -22,11 +22,10 @@
 
 #pragma once
 
-#include "PredeclaredTypes.h"
-
 #include "../Messages/IObservable.h"
 #include "../Scene2D/Scene2D.h"
 #include "../Scene2DViewport/IFlexiblePointerTracker.h"
+#include "../Viewport/IViewport.h"
 #include "../Viewport/IViewportInteractor.h"
 
 #include <Compatibility.h>
@@ -36,6 +35,8 @@
 
 namespace OrthancStone
 {
+  class MeasureCommand;
+  class MeasureTool;
   class UndoStack;
 
   const double ARC_RADIUS_CANVAS_COORD = 30.0;