Mercurial > hg > orthanc-stone
annotate Framework/Radiography/RadiographyScene.cpp @ 1255:c1c83c1fb837 broker
GetOrthancImageCommand: handling of unsupported formats
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 08 Jan 2020 15:22:13 +0100 |
parents | 37bc7f115f81 |
children | 0ca50d275b9a |
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 |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
137 size_t index = nextLayerIndex_++; |
408 | 138 raii->SetIndex(index); |
139 layers_[index] = raii.release(); | |
140 | |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
141 BroadcastMessage(GeometryChangedMessage(*this, *layer)); |
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
142 BroadcastMessage(ContentChangedMessage(*this, *layer)); |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
143 Register<RadiographyLayer::LayerEditedMessage>(*layer, &RadiographyScene::OnLayerEdited); |
408 | 144 |
145 return *layer; | |
146 } | |
426 | 147 |
876 | 148 size_t RadiographyScene::GetApproximateMemoryUsage() const |
149 { | |
150 size_t size = 0; | |
151 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
152 { | |
153 size += it->second->GetApproximateMemoryUsage(); | |
154 } | |
155 return size; | |
156 } | |
157 | |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
158 void RadiographyScene::OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message) |
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
159 { |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
160 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, message.GetOrigin())); |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
161 } |
408 | 162 |
1200 | 163 |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
164 RadiographyScene::RadiographyScene() : |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
165 nextLayerIndex_(0), |
408 | 166 hasWindowing_(false), |
167 windowingCenter_(0), // Dummy initialization | |
168 windowingWidth_(0) // Dummy initialization | |
169 { | |
170 } | |
171 | |
172 | |
173 RadiographyScene::~RadiographyScene() | |
174 { | |
175 for (Layers::iterator it = layers_.begin(); it != layers_.end(); it++) | |
176 { | |
177 assert(it->second != NULL); | |
178 delete it->second; | |
179 } | |
180 } | |
181 | |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
182 RadiographyPhotometricDisplayMode RadiographyScene::GetPreferredPhotomotricDisplayMode() const |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
183 { |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
184 // 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
|
185 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
|
186 { |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
187 if (it->second->GetPreferredPhotomotricDisplayMode() != RadiographyPhotometricDisplayMode_Default) |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
188 { |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
189 return it->second->GetPreferredPhotomotricDisplayMode(); |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
190 } |
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 |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
193 return RadiographyPhotometricDisplayMode_Default; |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
194 } |
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 |
430 | 197 void RadiographyScene::GetLayersIndexes(std::vector<size_t>& output) const |
198 { | |
199 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
200 { | |
201 output.push_back(it->first); | |
202 } | |
203 } | |
204 | |
425 | 205 void RadiographyScene::RemoveLayer(size_t layerIndex) |
206 { | |
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
207 LOG(INFO) << "Removing layer: " << layerIndex; |
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
208 |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
209 Layers::iterator found = layers_.find(layerIndex); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
210 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
211 if (found == layers_.end()) |
425 | 212 { |
213 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
214 } | |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
215 else |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
216 { |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
217 assert(found->second != NULL); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
218 delete found->second; |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
219 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
220 layers_.erase(found); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
221 |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
222 LOG(INFO) << "Removing layer, there are now : " << layers_.size() << " layers"; |
1131
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
223 |
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
224 BroadcastMessage(RadiographyScene::LayerRemovedMessage(*this, layerIndex)); |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
225 } |
425 | 226 } |
227 | |
430 | 228 const RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) const |
425 | 229 { |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
230 Layers::const_iterator found = layers_.find(layerIndex); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
231 |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
232 if (found == layers_.end()) |
425 | 233 { |
234 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
235 } | |
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
236 else |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
237 { |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
238 assert(found->second != NULL); |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
239 return *found->second; |
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
240 } |
425 | 241 } |
408 | 242 |
1201 | 243 RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) |
244 { | |
245 Layers::const_iterator found = layers_.find(layerIndex); | |
246 | |
247 if (found == layers_.end()) | |
248 { | |
249 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
250 } | |
251 else | |
252 { | |
253 assert(found->second != NULL); | |
254 return *found->second; | |
255 } | |
256 } | |
257 | |
408 | 258 bool RadiographyScene::GetWindowing(float& center, |
259 float& width) const | |
260 { | |
261 if (hasWindowing_) | |
262 { | |
263 center = windowingCenter_; | |
264 width = windowingWidth_; | |
265 return true; | |
266 } | |
267 else | |
268 { | |
269 return false; | |
270 } | |
271 } | |
272 | |
273 | |
274 void RadiographyScene::GetWindowingWithDefault(float& center, | |
275 float& width) const | |
276 { | |
277 if (!GetWindowing(center, width)) | |
278 { | |
279 center = 128; | |
280 width = 256; | |
281 } | |
282 } | |
283 | |
284 | |
285 void RadiographyScene::SetWindowing(float center, | |
286 float width) | |
287 { | |
288 hasWindowing_ = true; | |
289 windowingCenter_ = center; | |
290 windowingWidth_ = width; | |
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
291 |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
292 BroadcastMessage(RadiographyScene::WindowingChangedMessage(*this)); |
408 | 293 } |
294 | |
295 | |
1201 | 296 RadiographyLayer& RadiographyScene::UpdateText(size_t layerIndex, |
297 const std::string& utf8, | |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
298 const std::string& font, |
1201 | 299 unsigned int fontSize, |
300 uint8_t foreground) | |
301 { | |
302 RadiographyTextLayer& textLayer = dynamic_cast<RadiographyTextLayer&>(GetLayer(layerIndex)); | |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
303 textLayer.SetText(utf8, font, fontSize, foreground); |
1201 | 304 |
305 BroadcastMessage(RadiographyScene::ContentChangedMessage(*this, textLayer)); | |
306 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, textLayer)); | |
307 return textLayer; | |
308 } | |
309 | |
310 | |
1190 | 311 RadiographyLayer& RadiographyScene::LoadText(const std::string& utf8, |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
312 const std::string& font, |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
313 unsigned int fontSize, |
1190 | 314 uint8_t foreground, |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
315 RadiographyLayer::Geometry* centerGeometry, |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
316 bool isCenterGeometry) |
408 | 317 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
318 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(*this)); |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
319 alpha->SetText(utf8, font, fontSize, foreground); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
320 if (centerGeometry != NULL) |
430 | 321 { |
1220
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
322 if (isCenterGeometry) |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
323 { |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
324 // modify geometry to reference the top left corner |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
325 double tlx = centerGeometry->GetPanX(); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
326 double tly = centerGeometry->GetPanY(); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
327 Extent2D textExtent = alpha->GetExtent(); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
328 tlx = tlx - (textExtent.GetWidth() / 2) * centerGeometry->GetPixelSpacingX(); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
329 tly = tly - (textExtent.GetHeight() / 2) * centerGeometry->GetPixelSpacingY(); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
330 centerGeometry->SetPan(tlx, tly); |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
331 } |
9ee6b28f53e8
RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents:
1201
diff
changeset
|
332 alpha->SetGeometry(*centerGeometry); |
430 | 333 } |
408 | 334 |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
335 RadiographyLayer& registeredLayer = RegisterLayer(alpha.release()); |
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
336 |
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
337 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, registeredLayer)); |
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
338 return registeredLayer; |
408 | 339 } |
340 | |
426 | 341 |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
342 RadiographyLayer& RadiographyScene::LoadTestBlock(unsigned int width, |
430 | 343 unsigned int height, |
344 RadiographyLayer::Geometry* geometry) | |
408 | 345 { |
346 std::auto_ptr<Orthanc::Image> block(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false)); | |
347 | |
348 for (unsigned int padding = 0; | |
349 (width > 2 * padding) && (height > 2 * padding); | |
350 padding++) | |
351 { | |
352 uint8_t color; | |
353 if (255 > 10 * padding) | |
354 { | |
355 color = 255 - 10 * padding; | |
356 } | |
357 else | |
358 { | |
359 color = 0; | |
360 } | |
361 | |
362 Orthanc::ImageAccessor region; | |
363 block->GetRegion(region, padding, padding, width - 2 * padding, height - 2 * padding); | |
364 Orthanc::ImageProcessing::Set(region, color); | |
365 } | |
366 | |
430 | 367 return LoadAlphaBitmap(block.release(), geometry); |
368 } | |
369 | |
488 | 370 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
|
371 const RadiographyDicomLayer& dicomLayer, |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
372 float foreground, |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
373 RadiographyLayer::Geometry* geometry) |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
374 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
375 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
|
376 mask->SetCorners(corners); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
377 if (geometry != NULL) |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
378 { |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
379 mask->SetGeometry(*geometry); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
380 } |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
381 |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
382 return RegisterLayer(mask.release()); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
383 } |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
384 |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
385 |
430 | 386 RadiographyLayer& RadiographyScene::LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, RadiographyLayer::Geometry *geometry) |
387 { | |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
388 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(*this)); |
430 | 389 alpha->SetAlpha(bitmap); |
390 if (geometry != NULL) | |
391 { | |
392 alpha->SetGeometry(*geometry); | |
393 } | |
408 | 394 |
395 return RegisterLayer(alpha.release()); | |
396 } | |
397 | |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
398 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
|
399 const std::string& instance, |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
400 unsigned int frame, |
714
d2c0e347ddc2
deprecating DicomFrameConverter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
401 Deprecated::DicomFrameConverter* converter, // takes ownership |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
402 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode, |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
403 RadiographyLayer::Geometry* geometry) |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
404 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
405 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
|
406 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
407 layer.SetInstance(instance, frame); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
408 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
409 if (geometry != NULL) |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
410 { |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
411 layer.SetGeometry(*geometry); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
412 } |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
413 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
414 layer.SetDicomFrameConverter(converter); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
415 layer.SetSourceImage(dicomImage); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
416 layer.SetPreferredPhotomotricDisplayMode(preferredPhotometricDisplayMode); |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
417 |
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
418 return layer; |
587 | 419 } |
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
420 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
421 RadiographyLayer& RadiographyScene::LoadDicomFrame(Deprecated::OrthancApiClient& orthanc, |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
422 const std::string& instance, |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
423 unsigned int frame, |
430 | 424 bool httpCompression, |
425 RadiographyLayer::Geometry* geometry) | |
408 | 426 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
427 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer( *this))); |
430 | 428 layer.SetInstance(instance, frame); |
429 | |
430 if (geometry != NULL) | |
431 { | |
432 layer.SetGeometry(*geometry); | |
433 } | |
408 | 434 |
435 { | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
436 Deprecated::IWebService::HttpHeaders headers; |
408 | 437 std::string uri = "/instances/" + instance + "/tags"; |
426 | 438 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
439 orthanc.GetBinaryAsync( |
426 | 440 uri, headers, |
1222
21c2b0eee53c
deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1204
diff
changeset
|
441 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
442 (GetSharedObserver(), &RadiographyScene::OnTagsReceived), NULL, |
426 | 443 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
408 | 444 } |
445 | |
446 { | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
447 Deprecated::IWebService::HttpHeaders headers; |
408 | 448 headers["Accept"] = "image/x-portable-arbitrarymap"; |
449 | |
450 if (httpCompression) | |
451 { | |
452 headers["Accept-Encoding"] = "gzip"; | |
453 } | |
426 | 454 |
408 | 455 std::string uri = ("/instances/" + instance + "/frames/" + |
456 boost::lexical_cast<std::string>(frame) + "/image-uint16"); | |
426 | 457 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
458 orthanc.GetBinaryAsync( |
426 | 459 uri, headers, |
1222
21c2b0eee53c
deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1204
diff
changeset
|
460 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
461 (GetSharedObserver(), &RadiographyScene::OnFrameReceived), NULL, |
426 | 462 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
408 | 463 } |
464 | |
465 return layer; | |
466 } | |
467 | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
468 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
469 RadiographyLayer& RadiographyScene::LoadDicomWebFrame(Deprecated::IWebService& web) |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
470 { |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
471 RadiographyLayer& layer = RegisterLayer(new RadiographyDicomLayer(*this)); |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
472 |
426 | 473 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
474 return layer; |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
475 } |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
476 |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
477 |
426 | 478 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
479 void RadiographyScene::OnTagsReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
408 | 480 { |
481 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&> | |
426 | 482 (message.GetPayload()).GetValue(); |
408 | 483 |
484 LOG(INFO) << "JSON received: " << message.GetUri().c_str() | |
485 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
426 | 486 |
408 | 487 Layers::iterator layer = layers_.find(index); |
488 if (layer != layers_.end()) | |
489 { | |
490 assert(layer->second != NULL); | |
426 | 491 |
408 | 492 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer(), message.GetAnswerSize()); |
430 | 493 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetDicomTags(dicom); |
408 | 494 |
495 float c, w; | |
496 if (!hasWindowing_ && | |
497 layer->second->GetDefaultWindowing(c, w)) | |
498 { | |
499 hasWindowing_ = true; | |
500 windowingCenter_ = c; | |
501 windowingWidth_ = w; | |
502 } | |
503 | |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
504 BroadcastMessage(GeometryChangedMessage(*this, *(layer->second))); |
408 | 505 } |
506 } | |
426 | 507 |
408 | 508 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
509 void RadiographyScene::OnFrameReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
408 | 510 { |
511 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>(message.GetPayload()).GetValue(); | |
426 | 512 |
408 | 513 LOG(INFO) << "DICOM frame received: " << message.GetUri().c_str() |
514 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
426 | 515 |
408 | 516 Layers::iterator layer = layers_.find(index); |
517 if (layer != layers_.end()) | |
518 { | |
519 assert(layer->second != NULL); | |
520 | |
521 std::string content; | |
522 if (message.GetAnswerSize() > 0) | |
523 { | |
524 content.assign(reinterpret_cast<const char*>(message.GetAnswer()), message.GetAnswerSize()); | |
525 } | |
426 | 526 |
408 | 527 std::auto_ptr<Orthanc::PamReader> reader(new Orthanc::PamReader); |
528 reader->ReadFromMemory(content); | |
430 | 529 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetSourceImage(reader.release()); |
408 | 530 |
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
531 BroadcastMessage(ContentChangedMessage(*this, *(layer->second))); |
408 | 532 } |
533 } | |
534 | |
535 | |
536 Extent2D RadiographyScene::GetSceneExtent() const | |
537 { | |
538 Extent2D extent; | |
539 | |
540 for (Layers::const_iterator it = layers_.begin(); | |
541 it != layers_.end(); ++it) | |
542 { | |
543 assert(it->second != NULL); | |
544 extent.Union(it->second->GetExtent()); | |
545 } | |
546 | |
547 return extent; | |
548 } | |
426 | 549 |
408 | 550 |
551 void RadiographyScene::Render(Orthanc::ImageAccessor& buffer, | |
409 | 552 const AffineTransform2D& viewTransform, |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
553 ImageInterpolation interpolation, |
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
554 bool applyWindowing) const |
408 | 555 { |
556 // Render layers in the background-to-foreground order | |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
557 for (size_t index = 0; index < nextLayerIndex_; index++) |
408 | 558 { |
559 Layers::const_iterator it = layers_.find(index); | |
560 if (it != layers_.end()) | |
561 { | |
562 assert(it->second != NULL); | |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
563 it->second->Render(buffer, viewTransform, interpolation, windowingCenter_, windowingWidth_, applyWindowing); |
408 | 564 } |
565 } | |
566 } | |
567 | |
568 | |
569 bool RadiographyScene::LookupLayer(size_t& index /* out */, | |
570 double x, | |
571 double y) const | |
572 { | |
573 // Render layers in the foreground-to-background order | |
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
574 for (size_t i = nextLayerIndex_; i > 0; i--) |
408 | 575 { |
576 index = i - 1; | |
577 Layers::const_iterator it = layers_.find(index); | |
578 if (it != layers_.end()) | |
579 { | |
580 assert(it->second != NULL); | |
581 if (it->second->Contains(x, y)) | |
582 { | |
583 return true; | |
584 } | |
585 } | |
586 } | |
587 | |
588 return false; | |
589 } | |
590 | |
426 | 591 |
408 | 592 void RadiographyScene::DrawBorder(CairoContext& context, |
593 unsigned int layer, | |
594 double zoom) | |
595 { | |
596 Layers::const_iterator found = layers_.find(layer); | |
426 | 597 |
408 | 598 if (found != layers_.end()) |
599 { | |
600 context.SetSourceColor(255, 0, 0); | |
601 found->second->DrawBorders(context, zoom); | |
602 } | |
603 } | |
604 | |
605 | |
606 void RadiographyScene::GetRange(float& minValue, | |
607 float& maxValue) const | |
608 { | |
609 bool first = true; | |
426 | 610 |
408 | 611 for (Layers::const_iterator it = layers_.begin(); |
612 it != layers_.end(); it++) | |
613 { | |
614 assert(it->second != NULL); | |
615 | |
616 float a, b; | |
617 if (it->second->GetRange(a, b)) | |
618 { | |
619 if (first) | |
620 { | |
621 minValue = a; | |
622 maxValue = b; | |
623 first = false; | |
624 } | |
625 else | |
626 { | |
627 minValue = std::min(a, minValue); | |
628 maxValue = std::max(b, maxValue); | |
629 } | |
630 } | |
631 } | |
632 | |
633 if (first) | |
634 { | |
635 minValue = 0; | |
636 maxValue = 0; | |
637 } | |
638 } | |
639 | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
640 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
641 double pixelSpacingY, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
642 ImageInterpolation interpolation, |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
643 bool invert, |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
644 int64_t maxValue /* for inversion */, |
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
645 bool applyWindowing) |
426 | 646 { |
408 | 647 if (pixelSpacingX <= 0 || |
648 pixelSpacingY <= 0) | |
649 { | |
650 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
651 } | |
426 | 652 |
408 | 653 Extent2D extent = GetSceneExtent(); |
654 | |
928
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
655 int w = boost::math::iround(extent.GetWidth() / pixelSpacingX); |
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
656 int h = boost::math::iround(extent.GetHeight() / pixelSpacingY); |
408 | 657 |
658 if (w < 0 || h < 0) | |
659 { | |
660 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
661 } | |
662 | |
663 Orthanc::Image layers(Orthanc::PixelFormat_Float32, | |
664 static_cast<unsigned int>(w), | |
665 static_cast<unsigned int>(h), false); | |
666 | |
409 | 667 AffineTransform2D view = AffineTransform2D::Combine( |
426 | 668 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY), |
669 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); | |
670 | |
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
671 // wipe background before rendering |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
672 Orthanc::ImageProcessing::Set(layers, 0); |
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
673 |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
674 Render(layers, view, interpolation, applyWindowing); |
408 | 675 |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
676 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
|
677 layers.GetWidth(), layers.GetHeight(), false)); |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
678 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
679 Orthanc::ImageProcessing::Convert(*rendered, layers); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
680 if (invert) |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
681 Orthanc::ImageProcessing::Invert(*rendered, maxValue); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
682 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
683 return rendered.release(); |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
684 } |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
685 |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
686 |
587 | 687 Orthanc::Image* RadiographyScene::ExportToCreateDicomRequestAndImage(Json::Value& createDicomRequestContent, |
688 const Json::Value& dicomTags, | |
689 const std::string& parentOrthancId, | |
690 double pixelSpacingX, | |
691 double pixelSpacingY, | |
692 bool invert, | |
693 ImageInterpolation interpolation) | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
694 { |
541 | 695 LOG(INFO) << "Exporting RadiographyScene to DICOM"; |
696 | |
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
697 std::auto_ptr<Orthanc::Image> rendered(ExportToImage(pixelSpacingX, pixelSpacingY, interpolation, false)); // note: we don't invert the image in the pixels data because we'll set the PhotometricDisplayMode correctly in the DICOM tags |
408 | 698 |
483 | 699 createDicomRequestContent["Tags"] = dicomTags; |
408 | 700 |
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
701 RadiographyPhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode(); |
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
702 if ((invert && photometricMode != RadiographyPhotometricDisplayMode_Monochrome2) || |
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
703 (!invert && photometricMode == RadiographyPhotometricDisplayMode_Monochrome1)) |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
704 { |
483 | 705 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1"; |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
706 } |
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
707 else |
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
708 { |
483 | 709 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2"; |
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
710 } |
408 | 711 |
712 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to | |
713 // avoid floating-point numbers to grow over 16 characters, | |
714 // which would be invalid according to DICOM standard | |
715 // ("dciodvfy" would complain). | |
716 char buf[32]; | |
717 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX); | |
426 | 718 |
483 | 719 createDicomRequestContent["Tags"]["PixelSpacing"] = buf; |
408 | 720 |
721 float center, width; | |
722 if (GetWindowing(center, width)) | |
723 { | |
483 | 724 createDicomRequestContent["Tags"]["WindowCenter"] = |
426 | 725 boost::lexical_cast<std::string>(boost::math::iround(center)); |
408 | 726 |
483 | 727 createDicomRequestContent["Tags"]["WindowWidth"] = |
426 | 728 boost::lexical_cast<std::string>(boost::math::iround(width)); |
408 | 729 } |
730 | |
587 | 731 if (!parentOrthancId.empty()) |
732 { | |
733 createDicomRequestContent["Parent"] = parentOrthancId; | |
734 } | |
735 | |
736 return rendered.release(); | |
737 } | |
738 | |
739 | |
740 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, | |
741 const Json::Value& dicomTags, | |
742 const std::string& parentOrthancId, | |
743 double pixelSpacingX, | |
744 double pixelSpacingY, | |
745 bool invert, | |
746 ImageInterpolation interpolation, | |
747 bool usePam) | |
748 { | |
749 LOG(INFO) << "Exporting RadiographyScene to DICOM"; | |
750 VLOG(1) << "Exporting RadiographyScene to: export to image"; | |
751 | |
752 std::auto_ptr<Orthanc::Image> rendered(ExportToCreateDicomRequestAndImage(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation)); | |
753 | |
754 // convert the image into base64 for inclusing in the createDicomRequest | |
755 std::string base64; | |
756 | |
757 { | |
758 std::string content; | |
759 | |
760 if (usePam) | |
761 { | |
762 VLOG(1) << "Exporting RadiographyScene: convert to PAM"; | |
763 Orthanc::PamWriter writer; | |
764 writer.WriteToMemory(content, *rendered); | |
765 } | |
766 else | |
767 { | |
768 Orthanc::PngWriter writer; | |
769 writer.WriteToMemory(content, *rendered); | |
770 } | |
771 | |
772 VLOG(1) << "Exporting RadiographyScene: encoding to base64"; | |
773 Orthanc::Toolbox::EncodeBase64(base64, content); | |
774 } | |
426 | 775 |
408 | 776 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme |
426 | 777 createDicomRequestContent["Content"] = ("data:" + |
778 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) + | |
779 ";base64," + base64); | |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
780 |
541 | 781 VLOG(1) << "Exporting RadiographyScene: create-dicom request is ready"; |
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
782 } |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
783 |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
784 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
785 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
786 const Json::Value& dicomTags, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
787 const std::string& parentOrthancId, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
788 double pixelSpacingX, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
789 double pixelSpacingY, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
790 bool invert, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
791 ImageInterpolation interpolation, |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
792 bool usePam) |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
793 { |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
794 Json::Value createDicomRequestContent; |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
795 |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
796 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); |
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
797 |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
798 orthanc.PostJsonAsyncExpectJson( |
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
799 "/tools/create-dicom", createDicomRequestContent, |
1222
21c2b0eee53c
deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1204
diff
changeset
|
800 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::JsonResponseReadyMessage> |
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
801 (GetSharedObserver(), &RadiographyScene::OnDicomExported), |
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
802 NULL, NULL); |
483 | 803 |
804 } | |
805 | |
806 | |
807 // Export using PAM is faster than using PNG, but requires Orthanc | |
808 // core >= 1.4.3 | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
809 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
483 | 810 const Orthanc::DicomMap& dicom, |
811 const std::string& parentOrthancId, | |
812 double pixelSpacingX, | |
813 double pixelSpacingY, | |
814 bool invert, | |
815 ImageInterpolation interpolation, | |
816 bool usePam) | |
817 { | |
818 std::set<Orthanc::DicomTag> tags; | |
819 dicom.GetTags(tags); | |
820 | |
821 Json::Value jsonTags = Json::objectValue; | |
822 | |
823 for (std::set<Orthanc::DicomTag>::const_iterator | |
824 tag = tags.begin(); tag != tags.end(); ++tag) | |
825 { | |
826 const Orthanc::DicomValue& value = dicom.GetValue(*tag); | |
827 if (!value.IsNull() && | |
828 !value.IsBinary()) | |
829 { | |
830 jsonTags[tag->Format()] = value.GetContent(); | |
831 } | |
832 } | |
833 | |
834 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); | |
408 | 835 } |
836 | |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
837 void RadiographyScene::OnDicomExported(const Deprecated::OrthancApiClient::JsonResponseReadyMessage& message) |
408 | 838 { |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
839 LOG(INFO) << "DICOM export was successful: " |
408 | 840 << message.GetJson().toStyledString(); |
841 } | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
842 |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
843 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
844 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
|
845 { |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
846 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes"; |
418 | 847 |
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
848 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
|
849 for (Deprecated::IWebService::HttpHeaders::const_iterator |
426 | 850 it = h.begin(); it != h.end(); ++it) |
418 | 851 { |
852 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str()); | |
853 } | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
854 } |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
855 |
408 | 856 } |