Mercurial > hg > orthanc-stone
changeset 1455:30deba7bc8e2
simplifying include_directories
line wrap: on
line diff
--- a/Framework/Deprecated/Layers/CircleMeasureTracker.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/CircleMeasureTracker.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "../Viewport/IStatusBar.h" #include "../../Toolbox/CoordinateSystem3D.h" -#include <Core/Images/Font.h> +#include <Images/Font.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/ColorFrameRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/ColorFrameRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "ColorFrameRenderer.h" -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "FrameRenderer.h" #include "../Toolbox/DicomFrameConverter.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/lexical_cast.hpp>
--- a/Framework/Deprecated/Layers/FrameRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/FrameRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "GrayscaleFrameRenderer.h" #include "ColorFrameRenderer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "GrayscaleFrameRenderer.h" -#include <Core/Images/Image.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/IVolumeSlicer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/IVolumeSlicer.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "../Toolbox/Slice.h" #include "../../Messages/IObservable.h" #include "../../Messages/IMessage.h" -#include "Core/Images/Image.h" +#include "Images/Image.h" #include <boost/shared_ptr.hpp> namespace Deprecated
--- a/Framework/Deprecated/Layers/RenderStyle.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/RenderStyle.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../../Volumes/ImageBuffer3D.h" #include "../Toolbox/DicomFrameConverter.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/SeriesFrameRendererFactory.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/SeriesFrameRendererFactory.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -26,8 +26,8 @@ #include <OrthancException.h> #include <Logging.h> #include <Toolbox.h> -#include <Plugins/Samples/Common/OrthancPluginException.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> +#include <OrthancPluginException.h> +#include <DicomDatasetReader.h> namespace Deprecated
--- a/Framework/Deprecated/Layers/SingleFrameRendererFactory.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/SingleFrameRendererFactory.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -26,8 +26,8 @@ #include "../Toolbox/DicomFrameConverter.h" #include <OrthancException.h> -#include <Plugins/Samples/Common/FullOrthancDataset.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> +#include <FullOrthancDataset.h> +#include <DicomDatasetReader.h> namespace Deprecated {
--- a/Framework/Deprecated/Layers/SingleFrameRendererFactory.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Layers/SingleFrameRendererFactory.h Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #pragma once #include "ILayerRendererFactory.h" -#include <Plugins/Samples/Common/IOrthancConnection.h> +#include <IOrthancConnection.h> namespace Deprecated {
--- a/Framework/Deprecated/Messages/LockingEmitter.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Messages/LockingEmitter.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -20,7 +20,7 @@ #include "LockingEmitter.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Messages/LockingEmitter.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Messages/LockingEmitter.h Thu Jun 11 20:54:01 2020 +0200 @@ -20,14 +20,12 @@ #pragma once -#include <Core/Enumerations.h> -#include <Core/OrthancException.h> +#include <Enumerations.h> +#include <OrthancException.h> #include "../../Messages/IMessageEmitter.h" #include "../../Messages/IObservable.h" -#include <Core/Enumerations.h> // For ORTHANC_OVERRIDE - #include <boost/thread/shared_mutex.hpp> namespace Deprecated
--- a/Framework/Deprecated/Radiography/RadiographyAlphaLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyAlphaLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,12 +22,12 @@ #include "RadiographyAlphaLayer.h" #include "RadiographyScene.h" +#include "../Toolbox/ImageGeometry.h" -#include <Core/Compatibility.h> -#include <Core/Images/Image.h> -#include <Core/OrthancException.h> +#include <Compatibility.h> +#include <Images/Image.h> +#include <OrthancException.h> -#include "../Toolbox/ImageGeometry.h" namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyAlphaLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyAlphaLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "RadiographyLayer.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyDicomLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyDicomLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,12 +23,12 @@ #include "RadiographyScene.h" #include "../Deprecated/Toolbox/DicomFrameConverter.h" +#include "../Toolbox/ImageGeometry.h" -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> -#include "../Toolbox/ImageGeometry.h" +#include <OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <DicomDatasetReader.h> static OrthancPlugins::DicomTag ConvertTag(const Orthanc::DicomTag& tag) {
--- a/Framework/Deprecated/Radiography/RadiographyDicomLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyDicomLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Deprecated/Toolbox/DicomFrameConverter.h" #include "RadiographyLayer.h" -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <FullOrthancDataset.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "RadiographyLayer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Deprecated/Radiography/RadiographyLayerCropTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayerCropTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "RadiographySceneCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyLayerMaskTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayerMaskTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "RadiographySceneCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyLayerMoveTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayerMoveTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "RadiographySceneCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyLayerResizeTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayerResizeTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "RadiographySceneCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Deprecated/Radiography/RadiographyLayerRotateTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyLayerRotateTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "RadiographySceneCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/math/constants/constants.hpp> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Deprecated/Radiography/RadiographyMaskLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyMaskLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,11 +23,12 @@ #include "RadiographyDicomLayer.h" #include "RadiographyScene.h" -#include "Core/Images/Image.h" -#include "Core/Images/ImageProcessing.h" -#include <Core/OrthancException.h> #include "../Toolbox/ImageGeometry.h" +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> + namespace OrthancStone { const unsigned char IN_MASK_VALUE = 0x77;
--- a/Framework/Deprecated/Radiography/RadiographyMaskLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyMaskLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,9 +23,9 @@ #include "RadiographyLayer.h" -#include <Core/Compatibility.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <Compatibility.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyScene.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyScene.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -30,15 +30,15 @@ #include "../Scene2D/FloatTextureSceneLayer.h" #include "../Scene2D/TextSceneLayer.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/PamReader.h> -#include <Core/Images/PamWriter.h> -#include <Core/Images/PngWriter.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/PamReader.h> +#include <Images/PamWriter.h> +#include <Images/PngWriter.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <DicomDatasetReader.h> +#include <FullOrthancDataset.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Deprecated/Radiography/RadiographyScene.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyScene.h Thu Jun 11 20:54:01 2020 +0200 @@ -26,10 +26,11 @@ #include "../Deprecated/Toolbox/DicomFrameConverter.h" #include "../Deprecated/Toolbox/OrthancApiClient.h" #include "../StoneEnumerations.h" -#include "Core/Images/Image.h" -#include "Core/Images/ImageProcessing.h" +#include "../Scene2D/Scene2D.h" -#include "../Scene2D/Scene2D.h" +#include <Images/Image.h> +#include <Images/ImageProcessing.h> + namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographySceneReader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographySceneReader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,10 +23,10 @@ #include "../Deprecated/Toolbox/DicomFrameConverter.h" -#include <Core/Images/FontRegistry.h> -#include <Core/Images/PngReader.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Images/FontRegistry.h> +#include <Images/PngReader.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographySceneReader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographySceneReader.h Thu Jun 11 20:54:01 2020 +0200 @@ -29,7 +29,7 @@ #include "../Deprecated/Toolbox/OrthancApiClient.h" #include <json/value.h> -#include <Core/Images/FontRegistry.h> +#include <Images/FontRegistry.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographySceneWriter.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographySceneWriter.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "RadiographySceneWriter.h" -#include <Core/OrthancException.h> -#include <Core/Images/PngWriter.h> -#include <Core/Toolbox.h> +#include <OrthancException.h> +#include <Images/PngWriter.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Deprecated/Radiography/RadiographyTextLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyTextLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -20,10 +20,11 @@ #include "RadiographyTextLayer.h" -#include "Core/OrthancException.h" #include "RadiographyScene.h" #include "../Toolbox/TextRenderer.h" +#include <OrthancException.h> + namespace OrthancStone { std::map<std::string, Orthanc::EmbeddedResources::FileResourceId> RadiographyTextLayer::fonts_;
--- a/Framework/Deprecated/Radiography/RadiographyWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "RadiographyWidget.h" -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> #include "RadiographyMaskLayer.h"
--- a/Framework/Deprecated/Radiography/RadiographyWindowingTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Radiography/RadiographyWindowingTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "RadiographyWindowingTracker.h" #include "RadiographyWidget.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Deprecated/SmartLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/SmartLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,12 +22,13 @@ #include "SmartLoader.h" #include "../StoneException.h" -#include "Core/Images/Image.h" -#include "Core/Logging.h" #include "Layers/DicomSeriesVolumeSlicer.h" #include "Layers/FrameRenderer.h" #include "Widgets/SliceViewerWidget.h" +#include <Images/Image.h> +#include <Logging.h> + namespace Deprecated { enum CachedSliceStatus
--- a/Framework/Deprecated/Toolbox/BaseWebService.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/BaseWebService.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,11 +24,11 @@ #include "../../Messages/IObservable.h" #include "../../../Platforms/Generic/IOracleCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/shared_ptr.hpp> #include <algorithm> -#include <Core/Logging.h> +#include <Logging.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,10 +23,10 @@ #include "../../Toolbox/LinearAlgebra.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/DicomFrameConverter.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/DicomFrameConverter.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,10 +21,10 @@ #pragma once -#include <Plugins/Samples/Common/IDicomDataset.h> -#include <Core/Compatibility.h> -#include <Core/DicomFormat/DicomMap.h> -#include <Core/Images/ImageAccessor.h> +#include <IDicomDataset.h> +#include <Compatibility.h> +#include <DicomFormat/DicomMap.h> +#include <Images/ImageAccessor.h> #include <memory>
--- a/Framework/Deprecated/Toolbox/DownloadStack.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/DownloadStack.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "DownloadStack.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <cassert>
--- a/Framework/Deprecated/Toolbox/IDelayedCallExecutor.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/IDelayedCallExecutor.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,8 +25,8 @@ #include "../../Messages/IObserver.h" #include "../../Messages/ICallable.h" -#include <Core/IDynamicObject.h> -#include <Core/Logging.h> +#include <IDynamicObject.h> +#include <Logging.h> #include <string> #include <map>
--- a/Framework/Deprecated/Toolbox/ISeriesLoader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/ISeriesLoader.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "ParallelSlices.h" #include <Images/ImageAccessor.h> -#include <Plugins/Samples/Common/IDicomDataset.h> +#include <IDicomDataset.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/IWebService.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/IWebService.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "IWebService.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated
--- a/Framework/Deprecated/Toolbox/IWebService.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/IWebService.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "../../Messages/IObserver.h" #include "../../Messages/ICallable.h" -#include <Core/Enumerations.h> -#include <Core/IDynamicObject.h> -#include <Core/Logging.h> +#include <Enumerations.h> +#include <IDynamicObject.h> +#include <Logging.h> #include <string> #include <map>
--- a/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -20,13 +20,13 @@ #include "MessagingToolbox.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/JpegReader.h> -#include <Core/Images/PngReader.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Core/Logging.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/JpegReader.h> +#include <Images/PngReader.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <Logging.h> #include <boost/lexical_cast.hpp>
--- a/Framework/Deprecated/Toolbox/MessagingToolbox.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/MessagingToolbox.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,10 +23,10 @@ #include "../../StoneEnumerations.h" -#include <Core/DicomFormat/DicomMap.h> -#include <Core/Images/ImageAccessor.h> -#include <Plugins/Samples/Common/IDicomDataset.h> -#include <Plugins/Samples/Common/IOrthancConnection.h> +#include <DicomFormat/DicomMap.h> +#include <Images/ImageAccessor.h> +#include <IDicomDataset.h> +#include <IOrthancConnection.h> #include <json/value.h>
--- a/Framework/Deprecated/Toolbox/OrthancApiClient.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/OrthancApiClient.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "../Toolbox/MessagingToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,17 +23,17 @@ #include "../Toolbox/MessagingToolbox.h" -#include <Core/Compression/GzipCompressor.h> -#include <Core/Endianness.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/JpegReader.h> -#include <Core/Images/PngReader.h> -#include <Core/Images/PamReader.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <Compression/GzipCompressor.h> +#include <Endianness.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/JpegReader.h> +#include <Images/PngReader.h> +#include <Images/PamReader.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <FullOrthancDataset.h> #include <boost/lexical_cast.hpp>
--- a/Framework/Deprecated/Toolbox/OrthancSlicesLoader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/OrthancSlicesLoader.h Thu Jun 11 20:54:01 2020 +0200 @@ -29,7 +29,7 @@ #include "OrthancApiClient.h" #include "Slice.h" -#include <Core/Images/Image.h> +#include <Images/Image.h> namespace Deprecated
--- a/Framework/Deprecated/Toolbox/ParallelSlices.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/ParallelSlices.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "../../Toolbox/GeometryToolbox.h" #include "../../Volumes/ImageBuffer3D.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/ParallelSlicesCursor.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/ParallelSlicesCursor.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "ParallelSlicesCursor.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/ParallelSlicesCursor.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/ParallelSlicesCursor.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "ParallelSlices.h" #include "../../StoneEnumerations.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/Slice.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/Slice.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "../../StoneEnumerations.h" #include "../../Toolbox/GeometryToolbox.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> #include <boost/lexical_cast.hpp>
--- a/Framework/Deprecated/Toolbox/Slice.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/Slice.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "../../Toolbox/CoordinateSystem3D.h" #include "DicomFrameConverter.h" -#include <Core/DicomFormat/DicomImageInformation.h> -#include <Core/IDynamicObject.h> +#include <DicomFormat/DicomImageInformation.h> +#include <IDynamicObject.h> namespace Deprecated {
--- a/Framework/Deprecated/Toolbox/ViewportGeometry.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Toolbox/ViewportGeometry.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "ViewportGeometry.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Deprecated/Viewport/CairoFont.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Viewport/CairoFont.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "CairoFont.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Viewport/IViewport.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Viewport/IViewport.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,10 @@ #include "IStatusBar.h" #include "../../StoneEnumerations.h" #include "../../Messages/IObservable.h" +#include "../Viewport/IMouseTracker.h" // only to get the "Touch" definition -#include <Core/Images/ImageAccessor.h> -#include "../Viewport/IMouseTracker.h" // only to get the "Touch" definition +#include <Images/ImageAccessor.h> + namespace Deprecated {
--- a/Framework/Deprecated/Viewport/WidgetViewport.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Viewport/WidgetViewport.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "WidgetViewport.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Viewport/WidgetViewport.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Viewport/WidgetViewport.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "IViewport.h" #include "../Widgets/IWidget.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> #include <memory>
--- a/Framework/Deprecated/Volumes/StructureSetLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Volumes/StructureSetLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/MessagingToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Volumes/StructureSetLoader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Volumes/StructureSetLoader.h Thu Jun 11 20:54:01 2020 +0200 @@ -26,7 +26,7 @@ #include "../Toolbox/OrthancApiClient.h" #include "IVolumeLoader.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace Deprecated {
--- a/Framework/Deprecated/Widgets/CairoWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/CairoWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "CairoWidget.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Widgets/EmptyWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/EmptyWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "EmptyWidget.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Widgets/LayoutWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/LayoutWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "LayoutWidget.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Deprecated/Widgets/PanMouseTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/PanMouseTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "PanMouseTracker.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/Widgets/PanZoomMouseTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/PanZoomMouseTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "PanZoomMouseTracker.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <math.h> namespace Deprecated
--- a/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,8 +25,8 @@ #include "../../Toolbox/GeometryToolbox.h" #include "../Layers/FrameRenderer.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/math/constants/constants.hpp>
--- a/Framework/Deprecated/Widgets/TestWorldSceneWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/TestWorldSceneWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "TestWorldSceneWidget.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <math.h> #include <stdio.h>
--- a/Framework/Deprecated/Widgets/WidgetBase.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/WidgetBase.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "WidgetBase.h" -#include <Core/OrthancException.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Logging.h> +#include <OrthancException.h> +#include <Images/ImageProcessing.h> +#include <Logging.h> namespace Deprecated {
--- a/Framework/Deprecated/Widgets/WorldSceneWidget.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/WorldSceneWidget.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,8 +25,8 @@ #include "ZoomMouseTracker.h" #include "PanZoomMouseTracker.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <math.h> #include <memory>
--- a/Framework/Deprecated/Widgets/ZoomMouseTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/Widgets/ZoomMouseTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "ZoomMouseTracker.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace Deprecated {
--- a/Framework/Deprecated/dev.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Deprecated/dev.h Thu Jun 11 20:54:01 2020 +0200 @@ -31,9 +31,9 @@ #include "Volumes/ImageBuffer3D.h" #include "Widgets/SliceViewerWidget.h" -#include <Core/Logging.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Fonts/FontRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/FontRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/DynamicBitmap.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <ft2build.h>
--- a/Framework/Fonts/Glyph.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/Glyph.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "Glyph.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Fonts/Glyph.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/Glyph.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #pragma once -#include <Core/Compatibility.h> -#include <Core/IDynamicObject.h> +#include <Compatibility.h> +#include <IDynamicObject.h> #include <memory>
--- a/Framework/Fonts/GlyphAlphabet.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphAlphabet.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "GlyphAlphabet.h" -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone
--- a/Framework/Fonts/GlyphAlphabet.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphAlphabet.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "FontRenderer.h" -#include <Core/Enumerations.h> +#include <Enumerations.h> #include <map>
--- a/Framework/Fonts/GlyphBitmapAlphabet.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphBitmapAlphabet.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "TextBoundingBox.h" #include "../Toolbox/DynamicBitmap.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> namespace OrthancStone {
--- a/Framework/Fonts/GlyphBitmapAlphabet.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphBitmapAlphabet.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "GlyphAlphabet.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> namespace OrthancStone {
--- a/Framework/Fonts/GlyphTextureAlphabet.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphTextureAlphabet.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "TextBoundingBox.h" #include "../Toolbox/DynamicBitmap.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> #if defined(__EMSCRIPTEN__) /*
--- a/Framework/Fonts/GlyphTextureAlphabet.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/GlyphTextureAlphabet.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "GlyphBitmapAlphabet.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> namespace OrthancStone {
--- a/Framework/Fonts/OpenGLTextCoordinates.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Fonts/OpenGLTextCoordinates.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OpenGLTextCoordinates.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Loaders/BasicFetchingItemsSorter.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/BasicFetchingItemsSorter.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "BasicFetchingItemsSorter.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Loaders/BasicFetchingStrategy.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/BasicFetchingStrategy.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "BasicFetchingStrategy.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Loaders/BasicFetchingStrategy.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/BasicFetchingStrategy.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "IFetchingItemsSorter.h" #include "IFetchingStrategy.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> #include <memory>
--- a/Framework/Loaders/DicomResourcesLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomResourcesLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -27,7 +27,7 @@ #if ORTHANC_ENABLE_DCMTK == 1 # include "../Oracle/ParseDicomFromFileCommand.h" -# include <Core/DicomParsing/ParsedDicomFile.h> +# include <DicomParsing/ParsedDicomFile.h> #endif #include <boost/filesystem/path.hpp>
--- a/Framework/Loaders/DicomResourcesLoader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomResourcesLoader.h Thu Jun 11 20:54:01 2020 +0200 @@ -27,7 +27,7 @@ #if ORTHANC_ENABLE_DCMTK == 1 # include "../Oracle/ParseDicomFromFileCommand.h" -# include <Core/DicomParsing/ParsedDicomDir.h> +# include <DicomParsing/ParsedDicomDir.h> #endif #include "../Oracle/HttpCommand.h"
--- a/Framework/Loaders/DicomSource.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomSource.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Oracle/HttpCommand.h" #include "../Oracle/OrthancRestApiCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/algorithm/string/predicate.hpp>
--- a/Framework/Loaders/DicomSource.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomSource.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Oracle/IOracleCommand.h" -#include <Core/WebServiceParameters.h> +#include <WebServiceParameters.h> namespace OrthancStone {
--- a/Framework/Loaders/DicomStructureSetLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomStructureSetLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "../StoneException.h" #include "../Toolbox/GeometryToolbox.h" -#include <Core/Toolbox.h> +#include <Toolbox.h> #include <algorithm>
--- a/Framework/Loaders/DicomVolumeLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/DicomVolumeLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "DicomVolumeLoader.h" -#include <Core/Images/ImageProcessing.h> +#include <Images/ImageProcessing.h> namespace OrthancStone {
--- a/Framework/Loaders/LoadedDicomResources.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/LoadedDicomResources.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "LoadedDicomResources.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <cassert>
--- a/Framework/Loaders/LoadedDicomResources.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/LoadedDicomResources.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include <Core/DicomFormat/DicomMap.h> +#include <DicomFormat/DicomMap.h> namespace OrthancStone
--- a/Framework/Loaders/LoaderCache.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/LoaderCache.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -37,8 +37,8 @@ #include "../Volumes/DicomVolumeImage.h" #include "../Volumes/DicomVolumeImageMPRSlicer.h" -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Loaders/LoaderStateMachine.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/LoaderStateMachine.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Loaders/ILoadersContext.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Loaders/LoaderStateMachine.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/LoaderStateMachine.h Thu Jun 11 20:54:01 2020 +0200 @@ -29,7 +29,7 @@ #include "../Oracle/OracleCommandExceptionMessage.h" #include "../Oracle/OrthancRestApiCommand.h" -#include <Core/IDynamicObject.h> +#include <IDynamicObject.h> #include <list>
--- a/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "OrthancMultiframeVolumeLoader.h" -#include <Core/Endianness.h> -#include <Core/Toolbox.h> +#include <Endianness.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -28,8 +28,8 @@ #include "../Toolbox/GeometryToolbox.h" #include "../Volumes/DicomVolumeImageMPRSlicer.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Loaders/SeriesFramesLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/SeriesFramesLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,13 +25,13 @@ #include "../Oracle/ParseDicomFromWadoCommand.h" #if ORTHANC_ENABLE_DCMTK == 1 -# include <Core/DicomParsing/Internals/DicomImageDecoder.h> +# include <DicomParsing/Internals/DicomImageDecoder.h> #endif -#include <Core/DicomFormat/DicomInstanceHasher.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/JpegReader.h> +#include <DicomFormat/DicomInstanceHasher.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/JpegReader.h> #include <boost/algorithm/string/predicate.hpp>
--- a/Framework/Loaders/SeriesMetadataLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/SeriesMetadataLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "SeriesMetadataLoader.h" -#include <Core/DicomFormat/DicomInstanceHasher.h> +#include <DicomFormat/DicomInstanceHasher.h> namespace OrthancStone {
--- a/Framework/Loaders/SeriesOrderedFrames.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/SeriesOrderedFrames.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "../Toolbox/SlicesSorter.h" #include "SeriesOrderedFrames.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Loaders/SeriesThumbnailsLoader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Loaders/SeriesThumbnailsLoader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,11 +21,11 @@ #include "SeriesThumbnailsLoader.h" -#include <Core/DicomFormat/DicomMap.h> -#include <Core/DicomFormat/DicomInstanceHasher.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/JpegWriter.h> -#include <Core/OrthancException.h> +#include <DicomFormat/DicomMap.h> +#include <DicomFormat/DicomInstanceHasher.h> +#include <Images/ImageProcessing.h> +#include <Images/JpegWriter.h> +#include <OrthancException.h> #include <boost/algorithm/string/predicate.hpp>
--- a/Framework/Messages/ICallable.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Messages/ICallable.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "IMessage.h" #include "IObserver.h" -#include <Core/Logging.h> +#include <Logging.h> #include <boost/noncopyable.hpp> #include <boost/weak_ptr.hpp>
--- a/Framework/Messages/IObservable.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Messages/IObservable.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../StoneException.h" -#include <Core/Logging.h> +#include <Logging.h> #include <cassert>
--- a/Framework/Messages/ObserverBase.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Messages/ObserverBase.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "IObserver.h" #include "IObservable.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/enable_shared_from_this.hpp>
--- a/Framework/OpenGL/OpenGLProgram.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/OpenGLProgram.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "OpenGLShader.h" #include "IOpenGLContext.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/OpenGL/OpenGLShader.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/OpenGLShader.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OpenGLShader.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/OpenGL/OpenGLTexture.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/OpenGLTexture.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "OpenGLTexture.h" #include "IOpenGLContext.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/OpenGL/OpenGLTexture.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/OpenGLTexture.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "OpenGLIncludes.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> #include <boost/noncopyable.hpp>
--- a/Framework/OpenGL/SdlOpenGLContext.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/SdlOpenGLContext.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -32,7 +32,7 @@ # include <GL/glew.h> #endif -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/OpenGL/SdlOpenGLContext.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/SdlOpenGLContext.h Thu Jun 11 20:54:01 2020 +0200 @@ -28,7 +28,7 @@ #include <SDL_render.h> -#include <Core/Enumerations.h> +#include <Enumerations.h> namespace OrthancStone {
--- a/Framework/OpenGL/WebAssemblyOpenGLContext.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/WebAssemblyOpenGLContext.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../StoneException.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <emscripten/html5.h> #include <emscripten/em_asm.h>
--- a/Framework/OpenGL/WebAssemblyOpenGLContext.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/OpenGL/WebAssemblyOpenGLContext.h Thu Jun 11 20:54:01 2020 +0200 @@ -39,7 +39,7 @@ #include "IOpenGLContext.h" -#include <Core/Enumerations.h> +#include <Enumerations.h> #include <boost/shared_ptr.hpp>
--- a/Framework/Oracle/GenericOracleRunner.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GenericOracleRunner.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -42,11 +42,11 @@ static unsigned int BUCKET_SOP = 1; #endif -#include <Core/Compression/GzipCompressor.h> -#include <Core/HttpClient.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Core/SystemToolbox.h> +#include <Compression/GzipCompressor.h> +#include <HttpClient.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <SystemToolbox.h> #include <boost/filesystem.hpp>
--- a/Framework/Oracle/GenericOracleRunner.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GenericOracleRunner.h Thu Jun 11 20:54:01 2020 +0200 @@ -32,8 +32,8 @@ #include "IOracleCommand.h" #include "../Messages/IMessageEmitter.h" -#include <Core/Enumerations.h> // For ORTHANC_OVERRIDE -#include <Core/WebServiceParameters.h> +#include <Enumerations.h> // For ORTHANC_OVERRIDE +#include <WebServiceParameters.h> namespace OrthancStone {
--- a/Framework/Oracle/GetOrthancImageCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GetOrthancImageCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,11 +21,11 @@ #include "GetOrthancImageCommand.h" -#include <Core/Images/JpegReader.h> -#include <Core/Images/PamReader.h> -#include <Core/Images/PngReader.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Images/JpegReader.h> +#include <Images/PamReader.h> +#include <Images/PngReader.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Oracle/GetOrthancImageCommand.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GetOrthancImageCommand.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Messages/IMessageEmitter.h" #include "OracleCommandBase.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> #include <map>
--- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,11 +23,11 @@ #include "../Toolbox/LinearAlgebra.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/JpegReader.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/JpegReader.h> +#include <OrthancException.h> +#include <Toolbox.h> #ifdef _MSC_VER // 'Json::Reader': Use CharReader and CharReaderBuilder instead
--- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Messages/IMessageEmitter.h" #include "OracleCommandBase.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> #include <map>
--- a/Framework/Oracle/HttpCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/HttpCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "HttpCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #ifdef _MSC_VER // 'Json::Reader': Use CharReader and CharReaderBuilder instead
--- a/Framework/Oracle/HttpCommand.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/HttpCommand.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Messages/IMessage.h" #include "OracleCommandBase.h" -#include <Core/Enumerations.h> +#include <Enumerations.h> #include <map> #include <json/value.h>
--- a/Framework/Oracle/IOracleCommand.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/IOracleCommand.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include <Core/IDynamicObject.h> +#include <IDynamicObject.h> namespace OrthancStone {
--- a/Framework/Oracle/OracleCommandBase.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/OracleCommandBase.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OracleCommandBase.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Oracle/OracleCommandBase.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/OracleCommandBase.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,8 +23,8 @@ #include "IOracleCommand.h" -#include <Core/Compatibility.h> -#include <Core/IDynamicObject.h> +#include <Compatibility.h> +#include <IDynamicObject.h> #include <memory>
--- a/Framework/Oracle/OracleCommandExceptionMessage.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/OracleCommandExceptionMessage.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Messages/IMessage.h" #include "IOracleCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Oracle/OrthancRestApiCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/OrthancRestApiCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OrthancRestApiCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #ifdef _MSC_VER // 'Json::Reader': Use CharReader and CharReaderBuilder instead
--- a/Framework/Oracle/OrthancRestApiCommand.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/OrthancRestApiCommand.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Messages/IMessage.h" #include "OracleCommandBase.h" -#include <Core/Enumerations.h> +#include <Enumerations.h> #include <map> #include <json/value.h>
--- a/Framework/Oracle/ParseDicomFromFileCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/ParseDicomFromFileCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "ParseDicomFromFileCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/filesystem/path.hpp>
--- a/Framework/Oracle/ParseDicomFromWadoCommand.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/ParseDicomFromWadoCommand.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "ParseDicomFromWadoCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Oracle/ParseDicomSuccessMessage.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/ParseDicomSuccessMessage.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "ParseDicomSuccessMessage.h" -#include <Core/DicomParsing/ParsedDicomFile.h> -#include <Core/HttpServer/MultipartStreamReader.h> -#include <Core/OrthancException.h> +#include <DicomParsing/ParsedDicomFile.h> +#include <HttpServer/MultipartStreamReader.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Oracle/ThreadedOracle.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/ThreadedOracle.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,8 +23,8 @@ #include "SleepOracleCommand.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Oracle/ThreadedOracle.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/ThreadedOracle.h Thu Jun 11 20:54:01 2020 +0200 @@ -41,7 +41,7 @@ #include "GenericOracleRunner.h" #include "../Messages/IMessageEmitter.h" -#include <Core/MultiThreading/SharedMessageQueue.h> +#include <MultiThreading/SharedMessageQueue.h> namespace OrthancStone
--- a/Framework/Oracle/WebAssemblyOracle.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/WebAssemblyOracle.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -29,8 +29,8 @@ static unsigned int BUCKET_SOP = 1; #endif -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <OrthancException.h> +#include <Toolbox.h> #include <emscripten.h> #include <emscripten/html5.h>
--- a/Framework/Oracle/WebAssemblyOracle.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Oracle/WebAssemblyOracle.h Thu Jun 11 20:54:01 2020 +0200 @@ -41,7 +41,7 @@ # include "../Toolbox/ParsedDicomCache.h" #endif -#include <Core/WebServiceParameters.h> +#include <WebServiceParameters.h> namespace OrthancStone
--- a/Framework/Scene2D/CairoCompositor.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/CairoCompositor.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -28,7 +28,7 @@ #include "Internals/CairoPolylineRenderer.h" #include "Internals/CairoTextRenderer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/ColorSceneLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/ColorSceneLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "ISceneLayer.h" #include "Color.h" -#include <Core/Enumerations.h> // For ORTHANC_OVERRIDE +#include <Enumerations.h> // For ORTHANC_OVERRIDE namespace OrthancStone {
--- a/Framework/Scene2D/ColorTextureSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/ColorTextureSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "ColorTextureSceneLayer.h" -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> +#include <OrthancException.h> +#include <Images/Image.h> namespace OrthancStone
--- a/Framework/Scene2D/FloatTextureSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/FloatTextureSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,9 +23,9 @@ #include "../Toolbox/ImageToolbox.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "FloatTextureSceneLayer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/InfoPanelSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/InfoPanelSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "InfoPanelSceneLayer.h" -#include <Core/Images/Image.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/InfoPanelSceneLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/InfoPanelSceneLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "ISceneLayer.h" #include "../StoneEnumerations.h" -#include <Core/Compatibility.h> -#include <Core/Images/ImageAccessor.h> +#include <Compatibility.h> +#include <Images/ImageAccessor.h> #include <memory>
--- a/Framework/Scene2D/Internals/CairoBaseRenderer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/CairoBaseRenderer.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "ICairoContextProvider.h" #include "CompositorHelper.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/CairoLookupTableTextureRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/CairoLookupTableTextureRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "CairoColorTextureRenderer.h" #include "../LookupTableTextureSceneLayer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/CairoTextRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/CairoTextRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "CairoTextRenderer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/CompositorHelper.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/CompositorHelper.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "CompositorHelper.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLAdvancedPolylineRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLAdvancedPolylineRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OpenGLAdvancedPolylineRenderer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Scene2D/Internals/OpenGLBasicPolylineRenderer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLBasicPolylineRenderer.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "../PolylineSceneLayer.h" #include "CompositorHelper.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLFloatTextureProgram.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLFloatTextureProgram.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,9 +22,9 @@ #include "OpenGLFloatTextureProgram.h" #include "OpenGLShaderVersionDirective.h" -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> static const char* FRAGMENT_SHADER =
--- a/Framework/Scene2D/Internals/OpenGLFloatTextureRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLFloatTextureRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OpenGLFloatTextureRenderer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "OpenGLLinesProgram.h" #include "OpenGLShaderVersionDirective.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> static const unsigned int COMPONENTS_POSITION = 3;
--- a/Framework/Scene2D/Internals/OpenGLLinesProgram.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLinesProgram.h Thu Jun 11 20:54:01 2020 +0200 @@ -26,7 +26,7 @@ #include "../../Toolbox/AffineTransform2D.h" #include "../PolylineSceneLayer.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../../Toolbox/ImageToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLookupTableTextureRenderer.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "CompositorHelper.h" #include "../LookupTableTextureSceneLayer.h" -#include <Core/Images/Image.h> +#include <Images/Image.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../../Fonts/OpenGLTextCoordinates.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> static const unsigned int COMPONENTS = 2;
--- a/Framework/Scene2D/Internals/OpenGLTextProgram.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextProgram.h Thu Jun 11 20:54:01 2020 +0200 @@ -28,7 +28,7 @@ #include "../../Toolbox/AffineTransform2D.h" #include "../TextSceneLayer.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/Internals/OpenGLTextureProgram.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextureProgram.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "OpenGLTextureProgram.h" #include "OpenGLShaderVersionDirective.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> static const unsigned int COMPONENTS = 2; static const unsigned int COUNT = 6; // 2 triangles in 2D
--- a/Framework/Scene2D/Internals/OpenGLTextureProgram.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextureProgram.h Thu Jun 11 20:54:01 2020 +0200 @@ -26,7 +26,7 @@ #include "../../OpenGL/OpenGLTexture.h" #include "../../Toolbox/AffineTransform2D.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/LookupTableStyleConfigurator.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/LookupTableStyleConfigurator.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "LookupTableStyleConfigurator.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/LookupTableTextureSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/LookupTableTextureSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "LookupTableTextureSceneLayer.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/NullLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/NullLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -22,7 +22,7 @@ #include "ISceneLayer.h" -#include <Core/Enumerations.h> +#include <Enumerations.h> #include <stdint.h>
--- a/Framework/Scene2D/PointerEvent.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/PointerEvent.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "PointerEvent.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/PolylineSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/PolylineSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "PolylineSceneLayer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/Scene2D.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/Scene2D.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "Scene2D.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Scene2D/TextSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/TextSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "TextSceneLayer.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Framework/Scene2D/TextureBaseSceneLayer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/TextureBaseSceneLayer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "TextureBaseSceneLayer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2D/TextureBaseSceneLayer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2D/TextureBaseSceneLayer.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "ISceneLayer.h" #include "../Toolbox/AffineTransform2D.h" -#include <Core/Compatibility.h> -#include <Core/Images/ImageAccessor.h> +#include <Compatibility.h> +#include <Images/ImageAccessor.h> namespace OrthancStone {
--- a/Framework/Scene2DViewport/AngleMeasureTool.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/AngleMeasureTool.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "LayerHolder.h" #include "../StoneException.h" -#include <Core/Logging.h> +#include <Logging.h> #include <boost/math/constants/constants.hpp> #include <boost/make_shared.hpp>
--- a/Framework/Scene2DViewport/CreateAngleMeasureTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/CreateAngleMeasureTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "CreateAngleMeasureTracker.h" #include "CreateAngleMeasureCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2DViewport/CreateLineMeasureTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/CreateLineMeasureTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "CreateLineMeasureTracker.h" #include "CreateLineMeasureCommand.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2DViewport/LineMeasureTool.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/LineMeasureTool.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "LayerHolder.h" #include "../StoneException.h" -#include <Core/Logging.h> +#include <Logging.h> #include <boost/make_shared.hpp>
--- a/Framework/Scene2DViewport/MeasureTool.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/MeasureTool.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -20,9 +20,9 @@ #include "MeasureTool.h" -#include <Core/Logging.h> -#include <Core/Enumerations.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <Enumerations.h> +#include <OrthancException.h> #include <boost/math/constants/constants.hpp>
--- a/Framework/Scene2DViewport/MeasureTrackers.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/MeasureTrackers.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -19,7 +19,7 @@ **/ #include "MeasureTrackers.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Scene2DViewport/OneGesturePointerTracker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/OneGesturePointerTracker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "OneGesturePointerTracker.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include "../StoneException.h"
--- a/Framework/Scene2DViewport/ViewportController.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Scene2DViewport/ViewportController.h Thu Jun 11 20:54:01 2020 +0200 @@ -26,7 +26,7 @@ #include "../Scene2D/Scene2D.h" #include "../Scene2DViewport/IFlexiblePointerTracker.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> #include <boost/enable_shared_from_this.hpp> #include <stack>
--- a/Framework/StoneEnumerations.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/StoneEnumerations.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "StoneEnumerations.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/StoneException.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/StoneException.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "Toolbox/LinearAlgebra.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/lexical_cast.hpp>
--- a/Framework/StoneInitialization.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/StoneInitialization.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -45,11 +45,11 @@ #endif #if ORTHANC_ENABLE_CURL == 1 -# include <Core/HttpClient.h> +# include <HttpClient.h> #endif #if ORTHANC_ENABLE_DCMTK == 1 -# include <Core/DicomParsing/FromDcmtkBridge.h> +# include <DicomParsing/FromDcmtkBridge.h> #endif #if ORTHANC_ENABLE_WASM == 1 @@ -59,25 +59,25 @@ #include "Toolbox/LinearAlgebra.h" -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> #include <locale> namespace OrthancStone { -#if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 - void StoneInitialize(OrthancPluginContext* context) -#else - void StoneInitialize() -#endif + void StoneInitialize(void* pluginContext) { -#if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 - Orthanc::Logging::Initialize(context); -#else - Orthanc::Logging::Initialize(); -#endif + if (pluginContext != NULL) + { + Orthanc::Logging::InitializePluginContext(pluginContext); + } + else + { + Orthanc::Logging::Initialize(); + } #if ORTHANC_ENABLE_SSL == 1 // Must be before curl
--- a/Framework/StoneInitialization.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/StoneInitialization.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,23 +25,20 @@ # error Macro ORTHANC_ENABLE_WASM must be defined #endif -#if !defined(ORTHANC_ENABLE_LOGGING_PLUGIN) -# error Macro ORTHANC_ENABLE_LOGGING_PLUGIN must be defined -#endif - #if ORTHANC_ENABLE_WASM == 1 # include "Viewport/WebGLViewportsRegistry.h" #endif -#include <Core/Logging.h> +#include <Logging.h> namespace OrthancStone { -#if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 - void StoneInitialize(OrthancPluginContext* context); -#else - void StoneInitialize(); -#endif + void StoneInitialize(void* pluginContext); + + void StoneInitialize() + { + StoneInitialize(NULL); + } void StoneFinalize();
--- a/Framework/Toolbox/AffineTransform2D.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/AffineTransform2D.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,8 +23,8 @@ #include "ImageGeometry.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Toolbox/AffineTransform2D.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/AffineTransform2D.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../StoneEnumerations.h" #include "LinearAlgebra.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> namespace OrthancStone {
--- a/Framework/Toolbox/CoordinateSystem3D.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/CoordinateSystem3D.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "LinearAlgebra.h" #include "GeometryToolbox.h" -#include <Core/Logging.h> -#include <Core/Toolbox.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <Toolbox.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Toolbox/CoordinateSystem3D.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/CoordinateSystem3D.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "LinearAlgebra.h" #include "../Scene2D/ScenePoint2D.h" -#include <Plugins/Samples/Common/IDicomDataset.h> +#include <IDicomDataset.h> #include <iosfwd>
--- a/Framework/Toolbox/DicomInstanceParameters.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomInstanceParameters.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -26,11 +26,11 @@ #include "../Toolbox/GeometryToolbox.h" #include "../Toolbox/ImageToolbox.h" -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> namespace OrthancStone
--- a/Framework/Toolbox/DicomInstanceParameters.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomInstanceParameters.h Thu Jun 11 20:54:01 2020 +0200 @@ -25,8 +25,8 @@ #include "../Scene2D/LookupTableTextureSceneLayer.h" #include "../Toolbox/CoordinateSystem3D.h" -#include <Core/IDynamicObject.h> -#include <Core/DicomFormat/DicomImageInformation.h> +#include <IDynamicObject.h> +#include <DicomFormat/DicomImageInformation.h> namespace OrthancStone {
--- a/Framework/Toolbox/DicomStructurePolygon2.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomStructurePolygon2.h Thu Jun 11 20:54:01 2020 +0200 @@ -29,7 +29,7 @@ #include "../Scene2D/Color.h" #include "../StoneException.h" -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <FullOrthancDataset.h> #include <list> #include <string>
--- a/Framework/Toolbox/DicomStructureSet.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomStructureSet.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,10 +24,10 @@ #include "../Toolbox/GeometryToolbox.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <DicomDatasetReader.h> #if defined(_MSC_VER) # pragma warning(push)
--- a/Framework/Toolbox/DicomStructureSet.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomStructureSet.h Thu Jun 11 20:54:01 2020 +0200 @@ -32,12 +32,12 @@ #include "../Scene2D/PolylineSceneLayer.h" #if ORTHANC_ENABLE_DCMTK == 1 -# include <Core/DicomParsing/ParsedDicomFile.h> +# include <DicomParsing/ParsedDicomFile.h> #endif //#define USE_BOOST_UNION_FOR_POLYGONS 1 -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <FullOrthancDataset.h> #include <list>
--- a/Framework/Toolbox/DicomStructureSet2.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomStructureSet2.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,13 +25,13 @@ #include "../Toolbox/LinearAlgebra.h" #include "../StoneException.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> -#include <Core/DicomFormat/DicomTag.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> +#include <DicomFormat/DicomTag.h> -#include <Plugins/Samples/Common/FullOrthancDataset.h> -#include <Plugins/Samples/Common/DicomDatasetReader.h> +#include <FullOrthancDataset.h> +#include <DicomDatasetReader.h> namespace OrthancStone {
--- a/Framework/Toolbox/DicomStructureSet2.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DicomStructureSet2.h Thu Jun 11 20:54:01 2020 +0200 @@ -27,7 +27,7 @@ #include "Extent2D.h" #include "../Scene2D/Color.h" -#include <Plugins/Samples/Common/FullOrthancDataset.h> +#include <FullOrthancDataset.h> #include <list>
--- a/Framework/Toolbox/DynamicBitmap.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DynamicBitmap.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "DynamicBitmap.h" -#include <Core/Images/Image.h> -#include <Core/OrthancException.h> +#include <Images/Image.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Toolbox/DynamicBitmap.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/DynamicBitmap.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #pragma once -#include <Core/Compatibility.h> -#include <Core/IDynamicObject.h> -#include <Core/Images/ImageAccessor.h> +#include <Compatibility.h> +#include <IDynamicObject.h> +#include <Images/ImageAccessor.h> #include <memory>
--- a/Framework/Toolbox/FiniteProjectiveCamera.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/FiniteProjectiveCamera.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,10 +24,10 @@ #include "GeometryToolbox.h" #include "SubpixelReader.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Images/Image.h> -#include <Core/Images/ImageProcessing.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Images/Image.h> +#include <Images/ImageProcessing.h> namespace OrthancStone {
--- a/Framework/Toolbox/GenericToolbox.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/GenericToolbox.h Thu Jun 11 20:54:01 2020 +0200 @@ -20,8 +20,8 @@ #pragma once -#include <Core/Compatibility.h> -#include <Core/OrthancException.h> +#include <Compatibility.h> +#include <OrthancException.h> #include <boost/shared_ptr.hpp>
--- a/Framework/Toolbox/GeometryToolbox.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/GeometryToolbox.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "GeometryToolbox.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <cassert>
--- a/Framework/Toolbox/ImageGeometry.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ImageGeometry.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "Extent2D.h" #include "SubpixelReader.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <Logging.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Toolbox/ImageGeometry.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ImageGeometry.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../StoneEnumerations.h" #include "LinearAlgebra.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> namespace OrthancStone
--- a/Framework/Toolbox/ImageToolbox.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ImageToolbox.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -22,11 +22,11 @@ #include "../StoneException.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/Images/PixelTraits.h> +#include <Images/ImageProcessing.h> +#include <Images/PixelTraits.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/static_assert.hpp> #include <boost/type_traits.hpp>
--- a/Framework/Toolbox/ImageToolbox.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ImageToolbox.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../StoneEnumerations.h" #include "LinearAlgebra.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> namespace OrthancStone {
--- a/Framework/Toolbox/LinearAlgebra.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/LinearAlgebra.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "../StoneException.h" #include "GenericToolbox.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> #include <boost/lexical_cast.hpp> #include <boost/numeric/ublas/lu.hpp>
--- a/Framework/Toolbox/LinearAlgebra.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/LinearAlgebra.h Thu Jun 11 20:54:01 2020 +0200 @@ -28,7 +28,7 @@ # include <boost/serialization/array_wrapper.hpp> #endif -#include <Core/DicomFormat/DicomMap.h> +#include <DicomFormat/DicomMap.h> #include <boost/numeric/ublas/matrix.hpp> #include <boost/numeric/ublas/vector.hpp>
--- a/Framework/Toolbox/ParsedDicomCache.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ParsedDicomCache.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #pragma once -#include <Core/Cache/MemoryObjectCache.h> -#include <Core/DicomParsing/ParsedDicomFile.h> +#include <Cache/MemoryObjectCache.h> +#include <DicomParsing/ParsedDicomFile.h> namespace OrthancStone {
--- a/Framework/Toolbox/ParsedDicomDataset.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ParsedDicomDataset.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #pragma once -#include <Core/DicomParsing/ParsedDicomFile.h> -#include <Plugins/Samples/Common/IDicomDataset.h> +#include <DicomParsing/ParsedDicomFile.h> +#include <IDicomDataset.h> namespace OrthancStone {
--- a/Framework/Toolbox/PixelTestPatterns.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/PixelTestPatterns.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../StoneException.h" -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> #include <string> #include <stdint.h>
--- a/Framework/Toolbox/ShearWarpProjectiveTransform.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/ShearWarpProjectiveTransform.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -26,10 +26,10 @@ #include "FiniteProjectiveCamera.h" #include "GeometryToolbox.h" -#include <Core/Images/PixelTraits.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/OrthancException.h> -#include <Core/Logging.h> +#include <Images/PixelTraits.h> +#include <Images/ImageProcessing.h> +#include <OrthancException.h> +#include <Logging.h> #include <boost/numeric/ublas/matrix_proxy.hpp> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Toolbox/SlicesSorter.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/SlicesSorter.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "GeometryToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Toolbox/SlicesSorter.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/SlicesSorter.h Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "CoordinateSystem3D.h" -#include <Core/IDynamicObject.h> +#include <IDynamicObject.h> namespace OrthancStone {
--- a/Framework/Toolbox/SubpixelReader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/SubpixelReader.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../StoneEnumerations.h" #include "GeometryToolbox.h" -#include <Core/Images/ImageTraits.h> +#include <Images/ImageTraits.h> #include <boost/noncopyable.hpp> #include <cmath>
--- a/Framework/Toolbox/SubvoxelReader.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/SubvoxelReader.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Volumes/ImageBuffer3D.h" #include "GeometryToolbox.h" -#include <Core/Images/ImageTraits.h> +#include <Images/ImageTraits.h> #include <boost/noncopyable.hpp> #include <cmath>
--- a/Framework/Toolbox/TextRenderer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/TextRenderer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -27,11 +27,11 @@ #include "../Scene2D/TextSceneLayer.h" #include "../Fonts/GlyphBitmapAlphabet.h" #include "../Fonts/FontRenderer.h" -#include <Core/Images/PngWriter.h> -#include <Core/Toolbox.h> -#include "Core/Images/Image.h" -#include "Core/Images/ImageProcessing.h" +#include <Images/Image.h> +#include <Images/ImageProcessing.h> +#include <Images/PngWriter.h> +#include <Toolbox.h> namespace OrthancStone {
--- a/Framework/Toolbox/TextRenderer.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/TextRenderer.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include "Core/Images/Image.h" +#include <Images/Image.h> #include <EmbeddedResources.h> namespace OrthancStone
--- a/Framework/Toolbox/UndoRedoStack.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Toolbox/UndoRedoStack.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "UndoRedoStack.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <cassert>
--- a/Framework/Viewport/SdlViewport.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/SdlViewport.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -20,7 +20,7 @@ #include "SdlViewport.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/make_shared.hpp>
--- a/Framework/Viewport/SdlWindow.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/SdlWindow.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,8 +23,8 @@ #if ORTHANC_ENABLE_SDL == 1 -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> #ifdef WIN32 #include <windows.h> // for SetProcessDpiAware
--- a/Framework/Viewport/WebAssemblyCairoViewport.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/WebAssemblyCairoViewport.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Scene2D/CairoCompositor.h" -#include <Core/Images/Image.h> +#include <Images/Image.h> namespace OrthancStone {
--- a/Framework/Viewport/WebAssemblyViewport.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/WebAssemblyViewport.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/GenericToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/make_shared.hpp> #include <boost/enable_shared_from_this.hpp>
--- a/Framework/Viewport/WebAssemblyViewport.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/WebAssemblyViewport.h Thu Jun 11 20:54:01 2020 +0200 @@ -31,7 +31,7 @@ #include "IViewport.h" -#include <Core/Compatibility.h> +#include <Compatibility.h> #include <emscripten.h> #include <emscripten/html5.h>
--- a/Framework/Viewport/WebGLViewportsRegistry.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Viewport/WebGLViewportsRegistry.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/GenericToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <boost/make_shared.hpp>
--- a/Framework/Volumes/DicomVolumeImage.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/DicomVolumeImage.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "DicomVolumeImage.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,9 +25,9 @@ #include "../Toolbox/ImageToolbox.h" -#include <Core/OrthancException.h> -//#include <Core/Images/PngWriter.h> -#include <Core/Images/JpegWriter.h> +#include <OrthancException.h> +//#include <Images/PngWriter.h> +#include <Images/JpegWriter.h> namespace OrthancStone {
--- a/Framework/Volumes/DicomVolumeImageReslicer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/DicomVolumeImageReslicer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "DicomVolumeImageReslicer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Volumes/IVolumeSlicer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/IVolumeSlicer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #include "IVolumeSlicer.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Volumes/ImageBuffer3D.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/ImageBuffer3D.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "ImageBuffer3D.h" -#include <Core/Images/ImageProcessing.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Images/ImageProcessing.h> +#include <Logging.h> +#include <OrthancException.h> #include <string.h>
--- a/Framework/Volumes/ImageBuffer3D.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/ImageBuffer3D.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,8 +24,8 @@ #include "../StoneEnumerations.h" #include "../Toolbox/LinearAlgebra.h" -#include <Core/Compatibility.h> -#include <Core/Images/Image.h> +#include <Compatibility.h> +#include <Images/Image.h> namespace OrthancStone {
--- a/Framework/Volumes/OrientedVolumeBoundingBox.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/OrientedVolumeBoundingBox.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "../Toolbox/GeometryToolbox.h" #include "ImageBuffer3D.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> #include <cassert>
--- a/Framework/Volumes/VolumeImageGeometry.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/VolumeImageGeometry.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/GeometryToolbox.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Volumes/VolumeReslicer.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/VolumeReslicer.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -24,9 +24,9 @@ #include "../Toolbox/GeometryToolbox.h" #include "../Toolbox/SubvoxelReader.h" -#include <Core/Images/ImageTraits.h> -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Images/ImageTraits.h> +#include <Logging.h> +#include <OrthancException.h> #include <boost/math/special_functions/round.hpp>
--- a/Framework/Volumes/VolumeSceneLayerSource.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Volumes/VolumeSceneLayerSource.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -25,7 +25,7 @@ #include "../Viewport/IViewport.h" #include "../StoneException.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace OrthancStone {
--- a/Framework/Wrappers/CairoContext.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Wrappers/CairoContext.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,8 +21,8 @@ #include "CairoContext.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> +#include <Logging.h> +#include <OrthancException.h> namespace OrthancStone
--- a/Framework/Wrappers/CairoContext.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Wrappers/CairoContext.h Thu Jun 11 20:54:01 2020 +0200 @@ -24,7 +24,7 @@ #include "CairoSurface.h" #include "../StoneEnumerations.h" -#include <Core/Images/Font.h> +#include <Images/Font.h> namespace OrthancStone {
--- a/Framework/Wrappers/CairoSurface.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Wrappers/CairoSurface.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -21,9 +21,9 @@ #include "CairoSurface.h" -#include <Core/Logging.h> -#include <Core/OrthancException.h> -#include <Core/Images/ImageProcessing.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Images/ImageProcessing.h> namespace OrthancStone {
--- a/Framework/Wrappers/CairoSurface.h Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/Wrappers/CairoSurface.h Thu Jun 11 20:54:01 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include <Core/Images/ImageAccessor.h> +#include <Images/ImageAccessor.h> #include <boost/noncopyable.hpp> #include <cairo.h>
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Sat Jun 06 11:04:04 2020 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Thu Jun 11 20:54:01 2020 +0200 @@ -31,7 +31,10 @@ endif() include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) -include_directories(${ORTHANC_ROOT}) +include_directories( + ${ORTHANC_ROOT}/Core + ${ORTHANC_ROOT}/Plugins/Samples/Common + ) ##################################################################### @@ -287,12 +290,11 @@ ) endif() -if ( (ENABLE_SDL OR ENABLE_WASM) AND ENABLE_GUIADAPTER ) +if ((ENABLE_SDL OR ENABLE_WASM) AND ENABLE_GUIADAPTER) list(APPEND APPLICATIONS_SOURCES ${ORTHANC_STONE_ROOT}/Deprecated/Applications/Generic/GuiAdapter.cpp ${ORTHANC_STONE_ROOT}/Deprecated/Applications/Generic/GuiAdapter.h ) - include_directories(${ORTHANC_STONE_ROOT}/Deprecated) endif()
--- a/UnitTestsSources/GenericToolboxTests.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/GenericToolboxTests.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -18,16 +18,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ -#include <Framework/Toolbox/GenericToolbox.h> +#include "../Framework/Toolbox/GenericToolbox.h" #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/lexical_cast.hpp> #include <boost/enable_shared_from_this.hpp> -#include "gtest/gtest.h" - -#include "stdint.h" - +#include <gtest/gtest.h> +#include <stdint.h> #include <cmath> TEST(GenericToolbox, TestLegitDoubleString)
--- a/UnitTestsSources/ImageToolboxTests.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/ImageToolboxTests.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -18,18 +18,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ -#include <Framework/Toolbox/ImageToolbox.h> +#include "../Framework/Toolbox/ImageToolbox.h" // #include <boost/chrono.hpp> // #include <boost/lexical_cast.hpp> -#include <Core/Compatibility.h> -#include <Core/Images/Image.h> -#include <Core/Images/PixelTraits.h> +#include <Compatibility.h> +#include <Images/Image.h> +#include <Images/PixelTraits.h> #include "stdint.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include <cmath>
--- a/UnitTestsSources/PixelTestPatternsTests.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/PixelTestPatternsTests.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -18,17 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ -#include <Core/Images/Image.h> -#include <Core/Images/PngWriter.h> -#include <Framework/Toolbox/PixelTestPatterns.h> + +#include "../Framework/Toolbox/PixelTestPatterns.h" + +#include <Images/Image.h> +#include <Images/PngWriter.h> #include <boost/chrono.hpp> #include <boost/lexical_cast.hpp> -#include "gtest/gtest.h" - -#include "stdint.h" - +#include <gtest/gtest.h> +#include <stdint.h> #include <cmath> /* Autogenerated from prout.png */
--- a/UnitTestsSources/TestCommands.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/TestCommands.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -19,10 +19,10 @@ **/ -#include "gtest/gtest.h" +#include <gtest/gtest.h> //#include "../Applications/Commands/BaseCommandFactory.h" -//#include "Core/OrthancException.h" +//#include "OrthancException.h" //class CommandIncrement: public OrthancStone::BaseCommand<CommandIncrement> //{
--- a/UnitTestsSources/TestMessageBroker.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/TestMessageBroker.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -19,10 +19,10 @@ **/ -#include "gtest/gtest.h" +#include <gtest/gtest.h> -#include "Framework/Messages/IObservable.h" -#include "Framework/Messages/ObserverBase.h" +#include "../Framework/Messages/IObservable.h" +#include "../Framework/Messages/ObserverBase.h" int testCounter = 0;
--- a/UnitTestsSources/TestStrategy.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/TestStrategy.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -19,12 +19,12 @@ **/ -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "../Framework/Loaders/BasicFetchingStrategy.h" #include "../Framework/Loaders/BasicFetchingItemsSorter.h" -#include <Core/OrthancException.h> +#include <OrthancException.h> namespace
--- a/UnitTestsSources/TestStructureSet.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/TestStructureSet.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -28,20 +28,19 @@ # pragma warning(disable: 4748) #endif -#include "Framework/Toolbox/DicomStructureSetUtils.h" -#include "Framework/Toolbox/DicomStructureSet2.h" -#include "Framework/Toolbox/DisjointDataSet.h" - -#include "Framework/Loaders/GenericLoadersContext.h" -#include "Framework/Loaders/DicomStructureSetLoader.h" -#include "Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h" +#include "../Framework/Loaders/DicomStructureSetLoader.h" +#include "../Framework/Loaders/GenericLoadersContext.h" +#include "../Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h" +#include "../Framework/Toolbox/DicomStructureSet2.h" +#include "../Framework/Toolbox/DicomStructureSetUtils.h" +#include "../Framework/Toolbox/DisjointDataSet.h" #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/make_shared.hpp> -#include <Core/SystemToolbox.h> - -#include "gtest/gtest.h" +#include <SystemToolbox.h> + +#include <gtest/gtest.h> #include <string> using namespace Orthanc;
--- a/UnitTestsSources/UnitTestsMain.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/UnitTestsSources/UnitTestsMain.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -19,7 +19,7 @@ **/ -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "../Framework/StoneInitialization.h" #include "../Framework/Toolbox/FiniteProjectiveCamera.h" @@ -27,11 +27,11 @@ #include "../Framework/Volumes/ImageBuffer3D.h" #include "../Framework/Loaders/LoaderCache.h" -#include <Core/HttpClient.h> -#include <Core/Images/ImageProcessing.h> -#include <Core/Logging.h> -#include <Core/MultiThreading/SharedMessageQueue.h> -#include <Core/OrthancException.h> +#include <HttpClient.h> +#include <Images/ImageProcessing.h> +#include <Logging.h> +#include <MultiThreading/SharedMessageQueue.h> +#include <OrthancException.h> #include <boost/lexical_cast.hpp> #include <boost/date_time/posix_time/posix_time.hpp>