Mercurial > hg > orthanc-stone
changeset 2322:5d0300b3dafa refactoring
cleaning
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 30 Sep 2026 15:46:49 +0200 |
| parents | 715ac1d1225a |
| children | 36c2fcb4bae3 |
| files | Applications/Samples/Common/RtViewerApp.h Applications/Samples/Common/RtViewerView.h OrthancStone/Sources/Oracle/GetOrthancImageCommand.h OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.h OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h OrthancStone/Sources/Platforms/Native/ThreadedOracle.h OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyOracle.h |
| diffstat | 7 files changed, 7 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/Samples/Common/RtViewerApp.h Wed Sep 30 15:35:24 2026 +0200 +++ b/Applications/Samples/Common/RtViewerApp.h Wed Sep 30 15:46:49 2026 +0200 @@ -25,7 +25,6 @@ #include "../../../OrthancStone/Sources/Loaders/DicomStructureSetLoader.h" #include "../../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h" #include "../../../OrthancStone/Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h" -#include "../../../OrthancStone/Sources/Messages/IMessageEmitter.h" #include "../../../OrthancStone/Sources/Messages/IObserver.h" #include "../../../OrthancStone/Sources/Messages/ObserverBase.h" #include "../../../OrthancStone/Sources/Oracle/OracleCommandExceptionMessage.h"
--- a/Applications/Samples/Common/RtViewerView.h Wed Sep 30 15:35:24 2026 +0200 +++ b/Applications/Samples/Common/RtViewerView.h Wed Sep 30 15:46:49 2026 +0200 @@ -25,7 +25,6 @@ #include "../../../OrthancStone/Sources/Loaders/DicomStructureSetLoader.h" #include "../../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h" #include "../../../OrthancStone/Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h" -#include "../../../OrthancStone/Sources/Messages/IMessageEmitter.h" #include "../../../OrthancStone/Sources/Messages/IObserver.h" #include "../../../OrthancStone/Sources/Messages/ObserverBase.h" #include "../../../OrthancStone/Sources/Oracle/OracleCommandExceptionMessage.h"
--- a/OrthancStone/Sources/Oracle/GetOrthancImageCommand.h Wed Sep 30 15:35:24 2026 +0200 +++ b/OrthancStone/Sources/Oracle/GetOrthancImageCommand.h Wed Sep 30 15:46:49 2026 +0200 @@ -23,10 +23,9 @@ #pragma once -#include "../Messages/IMessageEmitter.h" +#include "../Messages/IMessage.h" #include "OracleCommandBase.h" - -#include "OracleCallback.h" // TODO Refactoring +#include "OracleCallback.h" #include <Images/ImageAccessor.h>
--- a/OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.h Wed Sep 30 15:35:24 2026 +0200 +++ b/OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.h Wed Sep 30 15:46:49 2026 +0200 @@ -23,11 +23,9 @@ #pragma once -#include "../Messages/IMessageEmitter.h" +#include "OracleCallback.h" #include "OracleCommandBase.h" -#include "OracleCallback.h" // TODO Refactoring - #include <Images/ImageAccessor.h> #include <map>
--- a/OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h Wed Sep 30 15:35:24 2026 +0200 +++ b/OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h Wed Sep 30 15:46:49 2026 +0200 @@ -34,10 +34,11 @@ #endif #include "../Loaders/DicomSource.h" -#include "../Messages/IMessageEmitter.h" -#include "../Messages/IObserver.h" +#include "../Messages/IMessage.h" #include "OracleCommandBase.h" +#include <DicomParsing/ParsedDicomFile.h> + #include <map> namespace Orthanc
--- a/OrthancStone/Sources/Platforms/Native/ThreadedOracle.h Wed Sep 30 15:35:24 2026 +0200 +++ b/OrthancStone/Sources/Platforms/Native/ThreadedOracle.h Wed Sep 30 15:46:49 2026 +0200 @@ -42,8 +42,6 @@ # include "../../Toolbox/ParsedDicomCache.h" #endif -#include "../../Messages/IMessageEmitter.h" -#include "../../Oracle/IOracle.h" #include "../../Oracle/OracleCallback.h" #include "../../StoneApplication.h" #include "RunnableThread.h"
--- a/OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyOracle.h Wed Sep 30 15:35:24 2026 +0200 +++ b/OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyOracle.h Wed Sep 30 15:46:49 2026 +0200 @@ -33,12 +33,7 @@ # error This file can only compiled for WebAssembly #endif -#include "../../Oracle/OracleCallback.h" // TODO Refactoring - -#include "../../Messages/IMessageEmitter.h" -#include "../../Messages/IObservable.h" -#include "../../Oracle/IEnvironment.h" -#include "../../Oracle/IOracle.h" +#include "../../Oracle/OracleCallback.h" #include "../../StoneApplication.h" #if ORTHANC_ENABLE_DCMTK == 1
