# HG changeset patch # User Sebastien Jodogne # Date 1495653809 -7200 # Node ID 4e21f6b3aa0d7b92c7a9306c885c94b3d80f6533 # Parent 93b917b02fee6e2898f065c57e7c7ac98e0ad718 cleaning up diff -r 93b917b02fee -r 4e21f6b3aa0d Applications/Samples/SingleFrameApplication.h --- a/Applications/Samples/SingleFrameApplication.h Wed May 24 21:20:06 2017 +0200 +++ b/Applications/Samples/SingleFrameApplication.h Wed May 24 21:23:29 2017 +0200 @@ -23,16 +23,8 @@ #include "SampleApplicationBase.h" -#define OLD 0 - -#if OLD == 1 -# include "../../Framework/Layers/SingleFrameRendererFactory.h" -# include "../../Framework/Widgets/LayeredSceneWidget.h" -#else -# include "../../Framework/Layers/OrthancFrameLayerSource.h" -# include "../../Framework/Widgets/LayerWidget.h" -#endif - +#include "../../Framework/Layers/OrthancFrameLayerSource.h" +#include "../../Framework/Widgets/LayerWidget.h" #include "../../Resources/Orthanc/Core/Logging.h" namespace OrthancStone @@ -90,28 +82,9 @@ std::string instance = parameters["instance"].as(); int frame = parameters["frame"].as(); -#if OLD == 1 - std::auto_ptr renderer; - renderer.reset - (new SingleFrameRendererFactory(context.GetWebService().GetConnection(), instance, frame)); - - std::auto_ptr widget(new LayeredSceneWidget); - widget->SetSlice(renderer->GetSliceGeometry()); - widget->AddLayer(renderer.release()); - - if (parameters["smooth"].as()) - { - RenderStyle s; - s.interpolation_ = ImageInterpolation_Linear; - widget->SetLayerStyle(0, s); - } - - context.SetCentralWidget(widget.release()); - -#else std::auto_ptr widget(new LayerWidget); -#if 1 +#if 0 std::auto_ptr layer (new OrthancFrameLayerSource(context.GetWebService(), instance, frame)); layer->SetObserver(*this); @@ -145,7 +118,6 @@ widget_ = widget.get(); context.SetCentralWidget(widget.release()); -#endif } }; }