comparison Applications/Samples/SingleFrameApplication.h @ 79:4e21f6b3aa0d wasm

cleaning up
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 May 2017 21:23:29 +0200
parents 93b917b02fee
children bd48431ac285
comparison
equal deleted inserted replaced
78:93b917b02fee 79:4e21f6b3aa0d
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "SampleApplicationBase.h" 24 #include "SampleApplicationBase.h"
25 25
26 #define OLD 0 26 #include "../../Framework/Layers/OrthancFrameLayerSource.h"
27 27 #include "../../Framework/Widgets/LayerWidget.h"
28 #if OLD == 1
29 # include "../../Framework/Layers/SingleFrameRendererFactory.h"
30 # include "../../Framework/Widgets/LayeredSceneWidget.h"
31 #else
32 # include "../../Framework/Layers/OrthancFrameLayerSource.h"
33 # include "../../Framework/Widgets/LayerWidget.h"
34 #endif
35
36 #include "../../Resources/Orthanc/Core/Logging.h" 28 #include "../../Resources/Orthanc/Core/Logging.h"
37 29
38 namespace OrthancStone 30 namespace OrthancStone
39 { 31 {
40 namespace Samples 32 namespace Samples
88 } 80 }
89 81
90 std::string instance = parameters["instance"].as<std::string>(); 82 std::string instance = parameters["instance"].as<std::string>();
91 int frame = parameters["frame"].as<unsigned int>(); 83 int frame = parameters["frame"].as<unsigned int>();
92 84
93 #if OLD == 1
94 std::auto_ptr<SingleFrameRendererFactory> renderer;
95 renderer.reset
96 (new SingleFrameRendererFactory(context.GetWebService().GetConnection(), instance, frame));
97
98 std::auto_ptr<LayeredSceneWidget> widget(new LayeredSceneWidget);
99 widget->SetSlice(renderer->GetSliceGeometry());
100 widget->AddLayer(renderer.release());
101
102 if (parameters["smooth"].as<bool>())
103 {
104 RenderStyle s;
105 s.interpolation_ = ImageInterpolation_Linear;
106 widget->SetLayerStyle(0, s);
107 }
108
109 context.SetCentralWidget(widget.release());
110
111 #else
112 std::auto_ptr<LayerWidget> widget(new LayerWidget); 85 std::auto_ptr<LayerWidget> widget(new LayerWidget);
113 86
114 #if 1 87 #if 0
115 std::auto_ptr<OrthancFrameLayerSource> layer 88 std::auto_ptr<OrthancFrameLayerSource> layer
116 (new OrthancFrameLayerSource(context.GetWebService(), instance, frame)); 89 (new OrthancFrameLayerSource(context.GetWebService(), instance, frame));
117 layer->SetObserver(*this); 90 layer->SetObserver(*this);
118 widget->AddLayer(layer.release()); 91 widget->AddLayer(layer.release());
119 92
143 widget->SetLayerStyle(1, s); 116 widget->SetLayerStyle(1, s);
144 #endif 117 #endif
145 118
146 widget_ = widget.get(); 119 widget_ = widget.get();
147 context.SetCentralWidget(widget.release()); 120 context.SetCentralWidget(widget.release());
148 #endif
149 } 121 }
150 }; 122 };
151 } 123 }
152 } 124 }