Mercurial > hg > orthanc-stone
annotate Framework/Radiography/RadiographyScene.cpp @ 1198:4cc997207d8a broker
fix compatibility between SDL and DCMTK
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 28 Nov 2019 17:13:33 +0100 |
parents | bdc6837d5917 |
children | 54cbffabdc45 |
rev | line source |
---|---|
408 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
439 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
408 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "RadiographyScene.h" | |
23 | |
430 | 24 #include "RadiographyAlphaLayer.h" |
25 #include "RadiographyDicomLayer.h" | |
26 #include "RadiographyTextLayer.h" | |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
27 #include "RadiographyMaskLayer.h" |
732
c35e98d22764
move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
28 #include "../Deprecated/Toolbox/DicomFrameConverter.h" |
408 | 29 |
30 #include <Core/Images/Image.h> | |
31 #include <Core/Images/ImageProcessing.h> | |
32 #include <Core/Images/PamReader.h> | |
33 #include <Core/Images/PamWriter.h> | |
34 #include <Core/Images/PngWriter.h> | |
35 #include <Core/OrthancException.h> | |
36 #include <Core/Toolbox.h> | |
37 #include <Plugins/Samples/Common/DicomDatasetReader.h> | |
38 #include <Plugins/Samples/Common/FullOrthancDataset.h> | |
39 | |
412 | 40 #include <boost/math/special_functions/round.hpp> |
41 | |
408 | 42 |
43 namespace OrthancStone | |
44 { | |
45 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene, | |
46 size_t index) : | |
47 scene_(scene), | |
48 index_(index) | |
49 { | |
50 Layers::iterator layer = scene.layers_.find(index); | |
51 if (layer == scene.layers_.end()) | |
52 { | |
53 layer_ = NULL; | |
54 } | |
55 else | |
56 { | |
57 assert(layer->second != NULL); | |
58 layer_ = layer->second; | |
59 } | |
60 } | |
61 | |
426 | 62 |
408 | 63 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene, |
64 double x, | |
65 double y) : | |
66 scene_(scene), | |
67 index_(0) // Dummy initialization | |
68 { | |
69 if (scene.LookupLayer(index_, x, y)) | |
70 { | |
71 Layers::iterator layer = scene.layers_.find(index_); | |
426 | 72 |
408 | 73 if (layer == scene.layers_.end()) |
74 { | |
75 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
76 } | |
77 else | |
78 { | |
79 assert(layer->second != NULL); | |
80 layer_ = layer->second; | |
81 } | |
82 } | |
83 else | |
84 { | |
85 layer_ = NULL; | |
86 } | |
87 } | |
88 | |
89 | |
90 RadiographyScene& RadiographyScene::LayerAccessor::GetScene() const | |
91 { | |
92 if (IsValid()) | |
93 { | |
94 return scene_; | |
95 } | |
96 else | |
97 { | |
98 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
99 } | |
100 } | |
101 | |
102 | |
103 size_t RadiographyScene::LayerAccessor::GetIndex() const | |
104 { | |
105 if (IsValid()) | |
106 { | |
107 return index_; | |
108 } | |
109 else | |
110 { | |
111 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
112 } | |
113 } | |
114 | |
115 | |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
116 RadiographyLayer& RadiographyScene::LayerAccessor::GetLayer() const |
408 | 117 { |
118 if (IsValid()) | |
119 { | |
120 return *layer_; | |
121 } | |
122 else | |
123 { | |
124 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
125 } | |
426 | 126 } |
408 | 127 |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
128 RadiographyLayer& RadiographyScene::RegisterLayer(RadiographyLayer* layer) |
408 | 129 { |
130 if (layer == NULL) | |
131 { | |
132 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
133 } | |
134 | |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
135 std::auto_ptr<RadiographyLayer> raii(layer); |
426 | 136 |
1112
d33ae2b0db9d
less logs + allow changing the size of the RadiographyLayer (to replace a low res image by a high res image)
Alain Mazy <alain@mazy.be>
parents:
928
diff
changeset
|
137 // LOG(INFO) << "Registering layer: " << countLayers_; |
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
138 |
408 | 139 size_t index = countLayers_++; |
140 raii->SetIndex(index); | |
141 layers_[index] = raii.release(); | |
142 | |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
143 BroadcastMessage(GeometryChangedMessage(*this, *layer)); |
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
144 BroadcastMessage(ContentChangedMessage(*this, *layer)); |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
145 Register<RadiographyLayer::LayerEditedMessage>(*layer, &RadiographyScene::OnLayerEdited); |
408 | 146 |
147 return *layer; | |
148 } | |
426 | 149 |
876 | 150 size_t RadiographyScene::GetApproximateMemoryUsage() const |
151 { | |
152 size_t size = 0; | |
153 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
154 { | |
155 size += it->second->GetApproximateMemoryUsage(); | |
156 } | |
157 return size; | |
158 } | |
159 | |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
160 void RadiographyScene::OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message) |
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
161 { |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
162 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, message.GetOrigin())); |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
163 } |
408 | 164 |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
165 RadiographyScene::RadiographyScene() : |
408 | 166 countLayers_(0), |
167 hasWindowing_(false), | |
168 windowingCenter_(0), // Dummy initialization | |
169 windowingWidth_(0) // Dummy initialization | |
170 { | |
171 } | |
172 | |
173 | |
174 RadiographyScene::~RadiographyScene() | |
175 { | |
176 for (Layers::iterator it = layers_.begin(); it != layers_.end(); it++) | |
177 { | |
178 assert(it->second != NULL); | |
179 delete it->second; | |
180 } | |
181 } | |
182 | |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
183 RadiographyPhotometricDisplayMode RadiographyScene::GetPreferredPhotomotricDisplayMode() const |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
184 { |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
185 // return the mode of the first layer who "cares" about its display mode (normaly, the one and only layer that is a DicomLayer) |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
186 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
187 { |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
188 if (it->second->GetPreferredPhotomotricDisplayMode() != RadiographyPhotometricDisplayMode_Default) |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
189 { |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
190 return it->second->GetPreferredPhotomotricDisplayMode(); |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
191 } |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
192 } |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
193 |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
194 return RadiographyPhotometricDisplayMode_Default; |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
195 } |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
196 |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
197 |
430 | 198 void RadiographyScene::GetLayersIndexes(std::vector<size_t>& output) const |
199 { | |
200 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
201 { | |
202 output.push_back(it->first); | |
203 } | |
204 } | |
205 | |
425 | 206 void RadiographyScene::RemoveLayer(size_t layerIndex) |
207 { | |
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
208 LOG(INFO) << "Removing layer: " << layerIndex; |
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
209 |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
210 Layers::iterator found = layers_.find(layerIndex); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
211 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
212 if (found == layers_.end()) |
425 | 213 { |
214 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
215 } | |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
216 else |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
217 { |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
218 assert(found->second != NULL); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
219 delete found->second; |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
220 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
221 layers_.erase(found); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
222 countLayers_--; |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
223 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
224 LOG(INFO) << "Removing layer, there are now : " << countLayers_ << " layers"; |
1131
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
225 |
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
226 BroadcastMessage(RadiographyScene::LayerRemovedMessage(*this, layerIndex)); |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
227 } |
425 | 228 } |
229 | |
430 | 230 const RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) const |
425 | 231 { |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
232 Layers::const_iterator found = layers_.find(layerIndex); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
233 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
234 if (found == layers_.end()) |
425 | 235 { |
236 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
237 } | |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
238 else |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
239 { |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
240 assert(found->second != NULL); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
241 return *found->second; |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
242 } |
425 | 243 } |
408 | 244 |
245 bool RadiographyScene::GetWindowing(float& center, | |
246 float& width) const | |
247 { | |
248 if (hasWindowing_) | |
249 { | |
250 center = windowingCenter_; | |
251 width = windowingWidth_; | |
252 return true; | |
253 } | |
254 else | |
255 { | |
256 return false; | |
257 } | |
258 } | |
259 | |
260 | |
261 void RadiographyScene::GetWindowingWithDefault(float& center, | |
262 float& width) const | |
263 { | |
264 if (!GetWindowing(center, width)) | |
265 { | |
266 center = 128; | |
267 width = 256; | |
268 } | |
269 } | |
270 | |
271 | |
272 void RadiographyScene::SetWindowing(float center, | |
273 float width) | |
274 { | |
275 hasWindowing_ = true; | |
276 windowingCenter_ = center; | |
277 windowingWidth_ = width; | |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
278 |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
279 BroadcastMessage(RadiographyScene::WindowingChangedMessage(*this)); |
408 | 280 } |
281 | |
282 | |
1190 | 283 RadiographyLayer& RadiographyScene::LoadText(const std::string& utf8, |
284 size_t fontSize, | |
285 uint8_t foreground, | |
430 | 286 RadiographyLayer::Geometry* geometry) |
408 | 287 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
288 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(*this)); |
1190 | 289 alpha->LoadText(utf8, fontSize, foreground); |
430 | 290 if (geometry != NULL) |
291 { | |
292 alpha->SetGeometry(*geometry); | |
293 } | |
408 | 294 |
295 return RegisterLayer(alpha.release()); | |
296 } | |
297 | |
426 | 298 |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
299 RadiographyLayer& RadiographyScene::LoadTestBlock(unsigned int width, |
430 | 300 unsigned int height, |
301 RadiographyLayer::Geometry* geometry) | |
408 | 302 { |
303 std::auto_ptr<Orthanc::Image> block(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false)); | |
304 | |
305 for (unsigned int padding = 0; | |
306 (width > 2 * padding) && (height > 2 * padding); | |
307 padding++) | |
308 { | |
309 uint8_t color; | |
310 if (255 > 10 * padding) | |
311 { | |
312 color = 255 - 10 * padding; | |
313 } | |
314 else | |
315 { | |
316 color = 0; | |
317 } | |
318 | |
319 Orthanc::ImageAccessor region; | |
320 block->GetRegion(region, padding, padding, width - 2 * padding, height - 2 * padding); | |
321 Orthanc::ImageProcessing::Set(region, color); | |
322 } | |
323 | |
430 | 324 return LoadAlphaBitmap(block.release(), geometry); |
325 } | |
326 | |
488 | 327 RadiographyLayer& RadiographyScene::LoadMask(const std::vector<Orthanc::ImageProcessing::ImagePoint>& corners, |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
328 const RadiographyDicomLayer& dicomLayer, |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
329 float foreground, |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
330 RadiographyLayer::Geometry* geometry) |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
331 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
332 std::auto_ptr<RadiographyMaskLayer> mask(new RadiographyMaskLayer(*this, dicomLayer, foreground)); |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
333 mask->SetCorners(corners); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
334 if (geometry != NULL) |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
335 { |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
336 mask->SetGeometry(*geometry); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
337 } |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
338 |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
339 return RegisterLayer(mask.release()); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
340 } |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
341 |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
342 |
430 | 343 RadiographyLayer& RadiographyScene::LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, RadiographyLayer::Geometry *geometry) |
344 { | |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
345 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(*this)); |
430 | 346 alpha->SetAlpha(bitmap); |
347 if (geometry != NULL) | |
348 { | |
349 alpha->SetGeometry(*geometry); | |
350 } | |
408 | 351 |
352 return RegisterLayer(alpha.release()); | |
353 } | |
354 | |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
355 RadiographyLayer& RadiographyScene::LoadDicomImage(Orthanc::ImageAccessor* dicomImage, // takes ownership |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
356 const std::string& instance, |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
357 unsigned int frame, |
714
d2c0e347ddc2
deprecating DicomFrameConverter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
358 Deprecated::DicomFrameConverter* converter, // takes ownership |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
359 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode, |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
360 RadiographyLayer::Geometry* geometry) |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
361 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
362 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer(*this))); |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
363 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
364 layer.SetInstance(instance, frame); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
365 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
366 if (geometry != NULL) |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
367 { |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
368 layer.SetGeometry(*geometry); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
369 } |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
370 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
371 layer.SetDicomFrameConverter(converter); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
372 layer.SetSourceImage(dicomImage); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
373 layer.SetPreferredPhotomotricDisplayMode(preferredPhotometricDisplayMode); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
374 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
375 return layer; |
587 | 376 } |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
377 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
378 RadiographyLayer& RadiographyScene::LoadDicomFrame(Deprecated::OrthancApiClient& orthanc, |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
379 const std::string& instance, |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
380 unsigned int frame, |
430 | 381 bool httpCompression, |
382 RadiographyLayer::Geometry* geometry) | |
408 | 383 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
384 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer( *this))); |
430 | 385 layer.SetInstance(instance, frame); |
386 | |
387 if (geometry != NULL) | |
388 { | |
389 layer.SetGeometry(*geometry); | |
390 } | |
408 | 391 |
392 { | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
393 Deprecated::IWebService::HttpHeaders headers; |
408 | 394 std::string uri = "/instances/" + instance + "/tags"; |
426 | 395 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
396 orthanc.GetBinaryAsync( |
426 | 397 uri, headers, |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
398 new Callable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
399 (GetSharedObserver(), &RadiographyScene::OnTagsReceived), NULL, |
426 | 400 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
408 | 401 } |
402 | |
403 { | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
404 Deprecated::IWebService::HttpHeaders headers; |
408 | 405 headers["Accept"] = "image/x-portable-arbitrarymap"; |
406 | |
407 if (httpCompression) | |
408 { | |
409 headers["Accept-Encoding"] = "gzip"; | |
410 } | |
426 | 411 |
408 | 412 std::string uri = ("/instances/" + instance + "/frames/" + |
413 boost::lexical_cast<std::string>(frame) + "/image-uint16"); | |
426 | 414 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
415 orthanc.GetBinaryAsync( |
426 | 416 uri, headers, |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
417 new Callable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
418 (GetSharedObserver(), &RadiographyScene::OnFrameReceived), NULL, |
426 | 419 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
408 | 420 } |
421 | |
422 return layer; | |
423 } | |
424 | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
425 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
426 RadiographyLayer& RadiographyScene::LoadDicomWebFrame(Deprecated::IWebService& web) |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
427 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
428 RadiographyLayer& layer = RegisterLayer(new RadiographyDicomLayer(*this)); |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
429 |
426 | 430 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
431 return layer; |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
432 } |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
433 |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
434 |
426 | 435 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
436 void RadiographyScene::OnTagsReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
408 | 437 { |
438 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&> | |
426 | 439 (message.GetPayload()).GetValue(); |
408 | 440 |
441 LOG(INFO) << "JSON received: " << message.GetUri().c_str() | |
442 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
426 | 443 |
408 | 444 Layers::iterator layer = layers_.find(index); |
445 if (layer != layers_.end()) | |
446 { | |
447 assert(layer->second != NULL); | |
426 | 448 |
408 | 449 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer(), message.GetAnswerSize()); |
430 | 450 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetDicomTags(dicom); |
408 | 451 |
452 float c, w; | |
453 if (!hasWindowing_ && | |
454 layer->second->GetDefaultWindowing(c, w)) | |
455 { | |
456 hasWindowing_ = true; | |
457 windowingCenter_ = c; | |
458 windowingWidth_ = w; | |
459 } | |
460 | |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
461 BroadcastMessage(GeometryChangedMessage(*this, *(layer->second))); |
408 | 462 } |
463 } | |
426 | 464 |
408 | 465 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
466 void RadiographyScene::OnFrameReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
408 | 467 { |
468 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>(message.GetPayload()).GetValue(); | |
426 | 469 |
408 | 470 LOG(INFO) << "DICOM frame received: " << message.GetUri().c_str() |
471 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
426 | 472 |
408 | 473 Layers::iterator layer = layers_.find(index); |
474 if (layer != layers_.end()) | |
475 { | |
476 assert(layer->second != NULL); | |
477 | |
478 std::string content; | |
479 if (message.GetAnswerSize() > 0) | |
480 { | |
481 content.assign(reinterpret_cast<const char*>(message.GetAnswer()), message.GetAnswerSize()); | |
482 } | |
426 | 483 |
408 | 484 std::auto_ptr<Orthanc::PamReader> reader(new Orthanc::PamReader); |
485 reader->ReadFromMemory(content); | |
430 | 486 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetSourceImage(reader.release()); |
408 | 487 |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
488 BroadcastMessage(ContentChangedMessage(*this, *(layer->second))); |
408 | 489 } |
490 } | |
491 | |
492 | |
493 Extent2D RadiographyScene::GetSceneExtent() const | |
494 { | |
495 Extent2D extent; | |
496 | |
497 for (Layers::const_iterator it = layers_.begin(); | |
498 it != layers_.end(); ++it) | |
499 { | |
500 assert(it->second != NULL); | |
501 extent.Union(it->second->GetExtent()); | |
502 } | |
503 | |
504 return extent; | |
505 } | |
426 | 506 |
408 | 507 |
508 void RadiographyScene::Render(Orthanc::ImageAccessor& buffer, | |
409 | 509 const AffineTransform2D& viewTransform, |
408 | 510 ImageInterpolation interpolation) const |
511 { | |
512 // Render layers in the background-to-foreground order | |
513 for (size_t index = 0; index < countLayers_; index++) | |
514 { | |
515 Layers::const_iterator it = layers_.find(index); | |
516 if (it != layers_.end()) | |
517 { | |
518 assert(it->second != NULL); | |
519 it->second->Render(buffer, viewTransform, interpolation); | |
520 } | |
521 } | |
522 } | |
523 | |
524 | |
525 bool RadiographyScene::LookupLayer(size_t& index /* out */, | |
526 double x, | |
527 double y) const | |
528 { | |
529 // Render layers in the foreground-to-background order | |
530 for (size_t i = countLayers_; i > 0; i--) | |
531 { | |
532 index = i - 1; | |
533 Layers::const_iterator it = layers_.find(index); | |
534 if (it != layers_.end()) | |
535 { | |
536 assert(it->second != NULL); | |
537 if (it->second->Contains(x, y)) | |
538 { | |
539 return true; | |
540 } | |
541 } | |
542 } | |
543 | |
544 return false; | |
545 } | |
546 | |
426 | 547 |
408 | 548 void RadiographyScene::DrawBorder(CairoContext& context, |
549 unsigned int layer, | |
550 double zoom) | |
551 { | |
552 Layers::const_iterator found = layers_.find(layer); | |
426 | 553 |
408 | 554 if (found != layers_.end()) |
555 { | |
556 context.SetSourceColor(255, 0, 0); | |
557 found->second->DrawBorders(context, zoom); | |
558 } | |
559 } | |
560 | |
561 | |
562 void RadiographyScene::GetRange(float& minValue, | |
563 float& maxValue) const | |
564 { | |
565 bool first = true; | |
426 | 566 |
408 | 567 for (Layers::const_iterator it = layers_.begin(); |
568 it != layers_.end(); it++) | |
569 { | |
570 assert(it->second != NULL); | |
571 | |
572 float a, b; | |
573 if (it->second->GetRange(a, b)) | |
574 { | |
575 if (first) | |
576 { | |
577 minValue = a; | |
578 maxValue = b; | |
579 first = false; | |
580 } | |
581 else | |
582 { | |
583 minValue = std::min(a, minValue); | |
584 maxValue = std::max(b, maxValue); | |
585 } | |
586 } | |
587 } | |
588 | |
589 if (first) | |
590 { | |
591 minValue = 0; | |
592 maxValue = 0; | |
593 } | |
594 } | |
595 | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
596 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
597 double pixelSpacingY, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
598 ImageInterpolation interpolation, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
599 bool invert, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
600 int64_t maxValue /* for inversion */) |
426 | 601 { |
408 | 602 if (pixelSpacingX <= 0 || |
603 pixelSpacingY <= 0) | |
604 { | |
605 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
606 } | |
426 | 607 |
408 | 608 Extent2D extent = GetSceneExtent(); |
609 | |
928
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
610 int w = boost::math::iround(extent.GetWidth() / pixelSpacingX); |
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
611 int h = boost::math::iround(extent.GetHeight() / pixelSpacingY); |
408 | 612 |
613 if (w < 0 || h < 0) | |
614 { | |
615 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
616 } | |
617 | |
618 Orthanc::Image layers(Orthanc::PixelFormat_Float32, | |
619 static_cast<unsigned int>(w), | |
620 static_cast<unsigned int>(h), false); | |
621 | |
409 | 622 AffineTransform2D view = AffineTransform2D::Combine( |
426 | 623 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY), |
624 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); | |
625 | |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
626 // wipe background before rendering |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
627 Orthanc::ImageProcessing::Set(layers, 0); |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
628 |
408 | 629 Render(layers, view, interpolation); |
630 | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
631 std::auto_ptr<Orthanc::Image> rendered(new Orthanc::Image(Orthanc::PixelFormat_Grayscale16, |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
632 layers.GetWidth(), layers.GetHeight(), false)); |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
633 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
634 Orthanc::ImageProcessing::Convert(*rendered, layers); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
635 if (invert) |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
636 Orthanc::ImageProcessing::Invert(*rendered, maxValue); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
637 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
638 return rendered.release(); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
639 } |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
640 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
641 |
587 | 642 Orthanc::Image* RadiographyScene::ExportToCreateDicomRequestAndImage(Json::Value& createDicomRequestContent, |
643 const Json::Value& dicomTags, | |
644 const std::string& parentOrthancId, | |
645 double pixelSpacingX, | |
646 double pixelSpacingY, | |
647 bool invert, | |
648 ImageInterpolation interpolation) | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
649 { |
541 | 650 LOG(INFO) << "Exporting RadiographyScene to DICOM"; |
651 | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
652 std::auto_ptr<Orthanc::Image> rendered(ExportToImage(pixelSpacingX, pixelSpacingY, interpolation)); // note: we don't invert the image in the pixels data because we'll set the PhotometricDisplayMode correctly in the DICOM tags |
408 | 653 |
483 | 654 createDicomRequestContent["Tags"] = dicomTags; |
408 | 655 |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
656 RadiographyPhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode(); |
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
657 if ((invert && photometricMode != RadiographyPhotometricDisplayMode_Monochrome2) || |
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
658 (!invert && photometricMode == RadiographyPhotometricDisplayMode_Monochrome1)) |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
659 { |
483 | 660 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1"; |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
661 } |
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
662 else |
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
663 { |
483 | 664 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2"; |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
665 } |
408 | 666 |
667 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to | |
668 // avoid floating-point numbers to grow over 16 characters, | |
669 // which would be invalid according to DICOM standard | |
670 // ("dciodvfy" would complain). | |
671 char buf[32]; | |
672 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX); | |
426 | 673 |
483 | 674 createDicomRequestContent["Tags"]["PixelSpacing"] = buf; |
408 | 675 |
676 float center, width; | |
677 if (GetWindowing(center, width)) | |
678 { | |
483 | 679 createDicomRequestContent["Tags"]["WindowCenter"] = |
426 | 680 boost::lexical_cast<std::string>(boost::math::iround(center)); |
408 | 681 |
483 | 682 createDicomRequestContent["Tags"]["WindowWidth"] = |
426 | 683 boost::lexical_cast<std::string>(boost::math::iround(width)); |
408 | 684 } |
685 | |
587 | 686 if (!parentOrthancId.empty()) |
687 { | |
688 createDicomRequestContent["Parent"] = parentOrthancId; | |
689 } | |
690 | |
691 return rendered.release(); | |
692 } | |
693 | |
694 | |
695 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, | |
696 const Json::Value& dicomTags, | |
697 const std::string& parentOrthancId, | |
698 double pixelSpacingX, | |
699 double pixelSpacingY, | |
700 bool invert, | |
701 ImageInterpolation interpolation, | |
702 bool usePam) | |
703 { | |
704 LOG(INFO) << "Exporting RadiographyScene to DICOM"; | |
705 VLOG(1) << "Exporting RadiographyScene to: export to image"; | |
706 | |
707 std::auto_ptr<Orthanc::Image> rendered(ExportToCreateDicomRequestAndImage(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation)); | |
708 | |
709 // convert the image into base64 for inclusing in the createDicomRequest | |
710 std::string base64; | |
711 | |
712 { | |
713 std::string content; | |
714 | |
715 if (usePam) | |
716 { | |
717 VLOG(1) << "Exporting RadiographyScene: convert to PAM"; | |
718 Orthanc::PamWriter writer; | |
719 writer.WriteToMemory(content, *rendered); | |
720 } | |
721 else | |
722 { | |
723 Orthanc::PngWriter writer; | |
724 writer.WriteToMemory(content, *rendered); | |
725 } | |
726 | |
727 VLOG(1) << "Exporting RadiographyScene: encoding to base64"; | |
728 Orthanc::Toolbox::EncodeBase64(base64, content); | |
729 } | |
426 | 730 |
408 | 731 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme |
426 | 732 createDicomRequestContent["Content"] = ("data:" + |
733 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) + | |
734 ";base64," + base64); | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
735 |
541 | 736 VLOG(1) << "Exporting RadiographyScene: create-dicom request is ready"; |
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
737 } |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
738 |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
739 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
740 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
741 const Json::Value& dicomTags, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
742 const std::string& parentOrthancId, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
743 double pixelSpacingX, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
744 double pixelSpacingY, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
745 bool invert, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
746 ImageInterpolation interpolation, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
747 bool usePam) |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
748 { |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
749 Json::Value createDicomRequestContent; |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
750 |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
751 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
752 |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
753 orthanc.PostJsonAsyncExpectJson( |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
754 "/tools/create-dicom", createDicomRequestContent, |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
755 new Callable<RadiographyScene, Deprecated::OrthancApiClient::JsonResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
756 (GetSharedObserver(), &RadiographyScene::OnDicomExported), |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
757 NULL, NULL); |
483 | 758 |
759 } | |
760 | |
761 | |
762 // Export using PAM is faster than using PNG, but requires Orthanc | |
763 // core >= 1.4.3 | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
764 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
483 | 765 const Orthanc::DicomMap& dicom, |
766 const std::string& parentOrthancId, | |
767 double pixelSpacingX, | |
768 double pixelSpacingY, | |
769 bool invert, | |
770 ImageInterpolation interpolation, | |
771 bool usePam) | |
772 { | |
773 std::set<Orthanc::DicomTag> tags; | |
774 dicom.GetTags(tags); | |
775 | |
776 Json::Value jsonTags = Json::objectValue; | |
777 | |
778 for (std::set<Orthanc::DicomTag>::const_iterator | |
779 tag = tags.begin(); tag != tags.end(); ++tag) | |
780 { | |
781 const Orthanc::DicomValue& value = dicom.GetValue(*tag); | |
782 if (!value.IsNull() && | |
783 !value.IsBinary()) | |
784 { | |
785 jsonTags[tag->Format()] = value.GetContent(); | |
786 } | |
787 } | |
788 | |
789 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); | |
408 | 790 } |
791 | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
792 void RadiographyScene::OnDicomExported(const Deprecated::OrthancApiClient::JsonResponseReadyMessage& message) |
408 | 793 { |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
794 LOG(INFO) << "DICOM export was successful: " |
408 | 795 << message.GetJson().toStyledString(); |
796 } | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
797 |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
798 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
799 void RadiographyScene::OnDicomWebReceived(const Deprecated::IWebService::HttpRequestSuccessMessage& message) |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
800 { |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
801 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes"; |
418 | 802 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
803 const Deprecated::IWebService::HttpHeaders& h = message.GetAnswerHttpHeaders(); |
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
804 for (Deprecated::IWebService::HttpHeaders::const_iterator |
426 | 805 it = h.begin(); it != h.end(); ++it) |
418 | 806 { |
807 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str()); | |
808 } | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
809 } |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
810 |
408 | 811 } |