# HG changeset patch # User Sebastien Jodogne # Date 1506339827 -7200 # Node ID 4c5f7cda8624f697fe9567217f2b66f0d6f2f28d # Parent f598ffb81cda00ad31445130681b2c479f01b64b fix diff -r f598ffb81cda -r 4c5f7cda8624 Applications/IBasicApplication.cpp --- 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 +#include +#include namespace OrthancStone { diff -r f598ffb81cda -r 4c5f7cda8624 Applications/Samples/SingleFrameApplication.h --- 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 namespace OrthancStone { diff -r f598ffb81cda -r 4c5f7cda8624 Applications/Samples/SingleVolumeApplication.h --- 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 +#include namespace OrthancStone { diff -r f598ffb81cda -r 4c5f7cda8624 Platforms/Generic/CMakeLists.txt --- 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)