Mercurial > hg > orthanc-stone
changeset 116:4c5f7cda8624 wasm
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 25 Sep 2017 13:43:47 +0200 |
| parents | f598ffb81cda |
| children | 42c05a3baee3 |
| files | Applications/IBasicApplication.cpp Applications/Samples/SingleFrameApplication.h Applications/Samples/SingleVolumeApplication.h Platforms/Generic/CMakeLists.txt |
| diffstat | 4 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/IBasicApplication.cpp Wed Sep 20 17:02:58 2017 +0200 +++ b/Applications/IBasicApplication.cpp Mon Sep 25 13:43:47 2017 +0200 @@ -24,9 +24,9 @@ #include "../Framework/Toolbox/MessagingToolbox.h" #include "Sdl/SdlEngine.h" -#include "../../Resources/Orthanc/Core/Logging.h" -#include "../../Resources/Orthanc/Core/HttpClient.h" -#include "../../Resources/Orthanc/Plugins/Samples/Common/OrthancHttpConnection.h" +#include <Core/Logging.h> +#include <Core/HttpClient.h> +#include <Plugins/Samples/Common/OrthancHttpConnection.h> namespace OrthancStone {
--- a/Applications/Samples/SingleFrameApplication.h Wed Sep 20 17:02:58 2017 +0200 +++ b/Applications/Samples/SingleFrameApplication.h Mon Sep 25 13:43:47 2017 +0200 @@ -25,7 +25,8 @@ #include "../../Framework/Layers/OrthancFrameLayerSource.h" #include "../../Framework/Widgets/LayerWidget.h" -#include "../../Resources/Orthanc/Core/Logging.h" + +#include <Core/Logging.h> namespace OrthancStone {
--- a/Applications/Samples/SingleVolumeApplication.h Wed Sep 20 17:02:58 2017 +0200 +++ b/Applications/Samples/SingleVolumeApplication.h Mon Sep 25 13:43:47 2017 +0200 @@ -25,11 +25,11 @@ #include "../../Framework/dev.h" //#include "SampleInteractor.h" #include "../../Framework/Widgets/LayerWidget.h" - -#include "../../Resources/Orthanc/Core/Toolbox.h" #include "../../Framework/Layers/LineMeasureTracker.h" #include "../../Framework/Layers/CircleMeasureTracker.h" -#include "../../Resources/Orthanc/Core/Logging.h" + +#include <Core/Toolbox.h> +#include <Core/Logging.h> namespace OrthancStone {
--- a/Platforms/Generic/CMakeLists.txt Wed Sep 20 17:02:58 2017 +0200 +++ b/Platforms/Generic/CMakeLists.txt Mon Sep 25 13:43:47 2017 +0200 @@ -32,12 +32,13 @@ target_link_libraries(${Target} OrthancStone) endmacro() -# TODO - Re-enable this stuff! + +# TODO - Re-enable all these samples! -#BuildSample(OrthancStoneEmpty 1) -#BuildSample(OrthancStoneTestPattern 2) -#BuildSample(OrthancStoneSingleFrame 3) -#BuildSample(OrthancStoneSingleVolume 4) +BuildSample(OrthancStoneEmpty 1) +BuildSample(OrthancStoneTestPattern 2) +BuildSample(OrthancStoneSingleFrame 3) +BuildSample(OrthancStoneSingleVolume 4) #BuildSample(OrthancStoneBasicPetCtFusion 5) #BuildSample(OrthancStoneSynchronizedSeries 6) #BuildSample(OrthancStoneLayoutPetCtFusion 7)