Mercurial > hg > orthanc-stone
annotate Framework/Radiography/RadiographyScene.cpp @ 1200:54cbffabdc45 broker
integration mainline->broker
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 29 Nov 2019 11:03:41 +0100 |
| parents | bdc6837d5917 922d2e61aa5d |
| children | b519c1c878f1 |
| 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 |
| 243 bool RadiographyScene::GetWindowing(float& center, | |
| 244 float& width) const | |
| 245 { | |
| 246 if (hasWindowing_) | |
| 247 { | |
| 248 center = windowingCenter_; | |
| 249 width = windowingWidth_; | |
| 250 return true; | |
| 251 } | |
| 252 else | |
| 253 { | |
| 254 return false; | |
| 255 } | |
| 256 } | |
| 257 | |
| 258 | |
| 259 void RadiographyScene::GetWindowingWithDefault(float& center, | |
| 260 float& width) const | |
| 261 { | |
| 262 if (!GetWindowing(center, width)) | |
| 263 { | |
| 264 center = 128; | |
| 265 width = 256; | |
| 266 } | |
| 267 } | |
| 268 | |
| 269 | |
| 270 void RadiographyScene::SetWindowing(float center, | |
| 271 float width) | |
| 272 { | |
| 273 hasWindowing_ = true; | |
| 274 windowingCenter_ = center; | |
| 275 windowingWidth_ = width; | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
276 |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
277 BroadcastMessage(RadiographyScene::WindowingChangedMessage(*this)); |
| 408 | 278 } |
| 279 | |
| 280 | |
| 1190 | 281 RadiographyLayer& RadiographyScene::LoadText(const std::string& utf8, |
|
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
282 unsigned int fontSize, |
| 1190 | 283 uint8_t foreground, |
| 430 | 284 RadiographyLayer::Geometry* geometry) |
| 408 | 285 { |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
286 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(*this)); |
| 1190 | 287 alpha->LoadText(utf8, fontSize, foreground); |
| 430 | 288 if (geometry != NULL) |
| 289 { | |
| 290 alpha->SetGeometry(*geometry); | |
| 291 } | |
| 408 | 292 |
|
1199
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
293 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
|
294 |
|
922d2e61aa5d
RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents:
1196
diff
changeset
|
295 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
|
296 return registeredLayer; |
| 408 | 297 } |
| 298 | |
| 426 | 299 |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
300 RadiographyLayer& RadiographyScene::LoadTestBlock(unsigned int width, |
| 430 | 301 unsigned int height, |
| 302 RadiographyLayer::Geometry* geometry) | |
| 408 | 303 { |
| 304 std::auto_ptr<Orthanc::Image> block(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false)); | |
| 305 | |
| 306 for (unsigned int padding = 0; | |
| 307 (width > 2 * padding) && (height > 2 * padding); | |
| 308 padding++) | |
| 309 { | |
| 310 uint8_t color; | |
| 311 if (255 > 10 * padding) | |
| 312 { | |
| 313 color = 255 - 10 * padding; | |
| 314 } | |
| 315 else | |
| 316 { | |
| 317 color = 0; | |
| 318 } | |
| 319 | |
| 320 Orthanc::ImageAccessor region; | |
| 321 block->GetRegion(region, padding, padding, width - 2 * padding, height - 2 * padding); | |
| 322 Orthanc::ImageProcessing::Set(region, color); | |
| 323 } | |
| 324 | |
| 430 | 325 return LoadAlphaBitmap(block.release(), geometry); |
| 326 } | |
| 327 | |
| 488 | 328 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
|
329 const RadiographyDicomLayer& dicomLayer, |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
330 float foreground, |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
331 RadiographyLayer::Geometry* geometry) |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
332 { |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
333 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
|
334 mask->SetCorners(corners); |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
335 if (geometry != NULL) |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
336 { |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
337 mask->SetGeometry(*geometry); |
|
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 |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
340 return RegisterLayer(mask.release()); |
|
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 |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
343 |
| 430 | 344 RadiographyLayer& RadiographyScene::LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, RadiographyLayer::Geometry *geometry) |
| 345 { | |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
346 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(*this)); |
| 430 | 347 alpha->SetAlpha(bitmap); |
| 348 if (geometry != NULL) | |
| 349 { | |
| 350 alpha->SetGeometry(*geometry); | |
| 351 } | |
| 408 | 352 |
| 353 return RegisterLayer(alpha.release()); | |
| 354 } | |
| 355 | |
|
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
356 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
|
357 const std::string& instance, |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
358 unsigned int frame, |
|
714
d2c0e347ddc2
deprecating DicomFrameConverter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
359 Deprecated::DicomFrameConverter* converter, // takes ownership |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
360 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode, |
|
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
361 RadiographyLayer::Geometry* geometry) |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
362 { |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
363 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
|
364 |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
365 layer.SetInstance(instance, frame); |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
366 |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
367 if (geometry != NULL) |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
368 { |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
369 layer.SetGeometry(*geometry); |
|
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 |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
372 layer.SetDicomFrameConverter(converter); |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
373 layer.SetSourceImage(dicomImage); |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
374 layer.SetPreferredPhotomotricDisplayMode(preferredPhotometricDisplayMode); |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
375 |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
376 return layer; |
| 587 | 377 } |
|
553
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
378 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
379 RadiographyLayer& RadiographyScene::LoadDicomFrame(Deprecated::OrthancApiClient& orthanc, |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
380 const std::string& instance, |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
381 unsigned int frame, |
| 430 | 382 bool httpCompression, |
| 383 RadiographyLayer::Geometry* geometry) | |
| 408 | 384 { |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
385 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer( *this))); |
| 430 | 386 layer.SetInstance(instance, frame); |
| 387 | |
| 388 if (geometry != NULL) | |
| 389 { | |
| 390 layer.SetGeometry(*geometry); | |
| 391 } | |
| 408 | 392 |
| 393 { | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
394 Deprecated::IWebService::HttpHeaders headers; |
| 408 | 395 std::string uri = "/instances/" + instance + "/tags"; |
| 426 | 396 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
397 orthanc.GetBinaryAsync( |
| 426 | 398 uri, headers, |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
399 new Callable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
400 (GetSharedObserver(), &RadiographyScene::OnTagsReceived), NULL, |
| 426 | 401 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
| 408 | 402 } |
| 403 | |
| 404 { | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
405 Deprecated::IWebService::HttpHeaders headers; |
| 408 | 406 headers["Accept"] = "image/x-portable-arbitrarymap"; |
| 407 | |
| 408 if (httpCompression) | |
| 409 { | |
| 410 headers["Accept-Encoding"] = "gzip"; | |
| 411 } | |
| 426 | 412 |
| 408 | 413 std::string uri = ("/instances/" + instance + "/frames/" + |
| 414 boost::lexical_cast<std::string>(frame) + "/image-uint16"); | |
| 426 | 415 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
416 orthanc.GetBinaryAsync( |
| 426 | 417 uri, headers, |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
418 new Callable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage> |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
419 (GetSharedObserver(), &RadiographyScene::OnFrameReceived), NULL, |
| 426 | 420 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); |
| 408 | 421 } |
| 422 | |
| 423 return layer; | |
| 424 } | |
| 425 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
426 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
427 RadiographyLayer& RadiographyScene::LoadDicomWebFrame(Deprecated::IWebService& web) |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
428 { |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
429 RadiographyLayer& layer = RegisterLayer(new RadiographyDicomLayer(*this)); |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
430 |
| 426 | 431 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
432 return layer; |
|
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 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
435 |
| 426 | 436 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
437 void RadiographyScene::OnTagsReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
| 408 | 438 { |
| 439 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&> | |
| 426 | 440 (message.GetPayload()).GetValue(); |
| 408 | 441 |
| 442 LOG(INFO) << "JSON received: " << message.GetUri().c_str() | |
| 443 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
| 426 | 444 |
| 408 | 445 Layers::iterator layer = layers_.find(index); |
| 446 if (layer != layers_.end()) | |
| 447 { | |
| 448 assert(layer->second != NULL); | |
| 426 | 449 |
| 408 | 450 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer(), message.GetAnswerSize()); |
| 430 | 451 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetDicomTags(dicom); |
| 408 | 452 |
| 453 float c, w; | |
| 454 if (!hasWindowing_ && | |
| 455 layer->second->GetDefaultWindowing(c, w)) | |
| 456 { | |
| 457 hasWindowing_ = true; | |
| 458 windowingCenter_ = c; | |
| 459 windowingWidth_ = w; | |
| 460 } | |
| 461 | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
462 BroadcastMessage(GeometryChangedMessage(*this, *(layer->second))); |
| 408 | 463 } |
| 464 } | |
| 426 | 465 |
| 408 | 466 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
467 void RadiographyScene::OnFrameReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message) |
| 408 | 468 { |
| 469 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>(message.GetPayload()).GetValue(); | |
| 426 | 470 |
| 408 | 471 LOG(INFO) << "DICOM frame received: " << message.GetUri().c_str() |
| 472 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
| 426 | 473 |
| 408 | 474 Layers::iterator layer = layers_.find(index); |
| 475 if (layer != layers_.end()) | |
| 476 { | |
| 477 assert(layer->second != NULL); | |
| 478 | |
| 479 std::string content; | |
| 480 if (message.GetAnswerSize() > 0) | |
| 481 { | |
| 482 content.assign(reinterpret_cast<const char*>(message.GetAnswer()), message.GetAnswerSize()); | |
| 483 } | |
| 426 | 484 |
| 408 | 485 std::auto_ptr<Orthanc::PamReader> reader(new Orthanc::PamReader); |
| 486 reader->ReadFromMemory(content); | |
| 430 | 487 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetSourceImage(reader.release()); |
| 408 | 488 |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
489 BroadcastMessage(ContentChangedMessage(*this, *(layer->second))); |
| 408 | 490 } |
| 491 } | |
| 492 | |
| 493 | |
| 494 Extent2D RadiographyScene::GetSceneExtent() const | |
| 495 { | |
| 496 Extent2D extent; | |
| 497 | |
| 498 for (Layers::const_iterator it = layers_.begin(); | |
| 499 it != layers_.end(); ++it) | |
| 500 { | |
| 501 assert(it->second != NULL); | |
| 502 extent.Union(it->second->GetExtent()); | |
| 503 } | |
| 504 | |
| 505 return extent; | |
| 506 } | |
| 426 | 507 |
| 408 | 508 |
| 509 void RadiographyScene::Render(Orthanc::ImageAccessor& buffer, | |
| 409 | 510 const AffineTransform2D& viewTransform, |
|
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
511 ImageInterpolation interpolation, |
|
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
512 bool applyWindowing) const |
| 408 | 513 { |
| 514 // 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
|
515 for (size_t index = 0; index < nextLayerIndex_; index++) |
| 408 | 516 { |
| 517 Layers::const_iterator it = layers_.find(index); | |
| 518 if (it != layers_.end()) | |
| 519 { | |
| 520 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
|
521 it->second->Render(buffer, viewTransform, interpolation, windowingCenter_, windowingWidth_, applyWindowing); |
| 408 | 522 } |
| 523 } | |
| 524 } | |
| 525 | |
| 526 | |
| 527 bool RadiographyScene::LookupLayer(size_t& index /* out */, | |
| 528 double x, | |
| 529 double y) const | |
| 530 { | |
| 531 // 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
|
532 for (size_t i = nextLayerIndex_; i > 0; i--) |
| 408 | 533 { |
| 534 index = i - 1; | |
| 535 Layers::const_iterator it = layers_.find(index); | |
| 536 if (it != layers_.end()) | |
| 537 { | |
| 538 assert(it->second != NULL); | |
| 539 if (it->second->Contains(x, y)) | |
| 540 { | |
| 541 return true; | |
| 542 } | |
| 543 } | |
| 544 } | |
| 545 | |
| 546 return false; | |
| 547 } | |
| 548 | |
| 426 | 549 |
| 408 | 550 void RadiographyScene::DrawBorder(CairoContext& context, |
| 551 unsigned int layer, | |
| 552 double zoom) | |
| 553 { | |
| 554 Layers::const_iterator found = layers_.find(layer); | |
| 426 | 555 |
| 408 | 556 if (found != layers_.end()) |
| 557 { | |
| 558 context.SetSourceColor(255, 0, 0); | |
| 559 found->second->DrawBorders(context, zoom); | |
| 560 } | |
| 561 } | |
| 562 | |
| 563 | |
| 564 void RadiographyScene::GetRange(float& minValue, | |
| 565 float& maxValue) const | |
| 566 { | |
| 567 bool first = true; | |
| 426 | 568 |
| 408 | 569 for (Layers::const_iterator it = layers_.begin(); |
| 570 it != layers_.end(); it++) | |
| 571 { | |
| 572 assert(it->second != NULL); | |
| 573 | |
| 574 float a, b; | |
| 575 if (it->second->GetRange(a, b)) | |
| 576 { | |
| 577 if (first) | |
| 578 { | |
| 579 minValue = a; | |
| 580 maxValue = b; | |
| 581 first = false; | |
| 582 } | |
| 583 else | |
| 584 { | |
| 585 minValue = std::min(a, minValue); | |
| 586 maxValue = std::max(b, maxValue); | |
| 587 } | |
| 588 } | |
| 589 } | |
| 590 | |
| 591 if (first) | |
| 592 { | |
| 593 minValue = 0; | |
| 594 maxValue = 0; | |
| 595 } | |
| 596 } | |
| 597 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
598 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
599 double pixelSpacingY, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
600 ImageInterpolation interpolation, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
601 bool invert, |
|
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
602 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
|
603 bool applyWindowing) |
| 426 | 604 { |
| 408 | 605 if (pixelSpacingX <= 0 || |
| 606 pixelSpacingY <= 0) | |
| 607 { | |
| 608 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 609 } | |
| 426 | 610 |
| 408 | 611 Extent2D extent = GetSceneExtent(); |
| 612 | |
|
928
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
613 int w = boost::math::iround(extent.GetWidth() / pixelSpacingX); |
|
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
614 int h = boost::math::iround(extent.GetHeight() / pixelSpacingY); |
| 408 | 615 |
| 616 if (w < 0 || h < 0) | |
| 617 { | |
| 618 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 619 } | |
| 620 | |
| 621 Orthanc::Image layers(Orthanc::PixelFormat_Float32, | |
| 622 static_cast<unsigned int>(w), | |
| 623 static_cast<unsigned int>(h), false); | |
| 624 | |
| 409 | 625 AffineTransform2D view = AffineTransform2D::Combine( |
| 426 | 626 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY), |
| 627 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); | |
| 628 | |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
629 // wipe background before rendering |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
630 Orthanc::ImageProcessing::Set(layers, 0); |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
631 |
|
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
632 Render(layers, view, interpolation, applyWindowing); |
| 408 | 633 |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
634 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
|
635 layers.GetWidth(), layers.GetHeight(), false)); |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
636 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
637 Orthanc::ImageProcessing::Convert(*rendered, layers); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
638 if (invert) |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
639 Orthanc::ImageProcessing::Invert(*rendered, maxValue); |
|
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 return rendered.release(); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
642 } |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
643 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
644 |
| 587 | 645 Orthanc::Image* RadiographyScene::ExportToCreateDicomRequestAndImage(Json::Value& createDicomRequestContent, |
| 646 const Json::Value& dicomTags, | |
| 647 const std::string& parentOrthancId, | |
| 648 double pixelSpacingX, | |
| 649 double pixelSpacingY, | |
| 650 bool invert, | |
| 651 ImageInterpolation interpolation) | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
652 { |
| 541 | 653 LOG(INFO) << "Exporting RadiographyScene to DICOM"; |
| 654 | |
|
1196
a5f2a6b04a31
RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents:
1190
diff
changeset
|
655 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 | 656 |
| 483 | 657 createDicomRequestContent["Tags"] = dicomTags; |
| 408 | 658 |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
659 RadiographyPhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode(); |
|
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
660 if ((invert && photometricMode != RadiographyPhotometricDisplayMode_Monochrome2) || |
|
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
661 (!invert && photometricMode == RadiographyPhotometricDisplayMode_Monochrome1)) |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
662 { |
| 483 | 663 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
664 } |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
665 else |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
666 { |
| 483 | 667 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
668 } |
| 408 | 669 |
| 670 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to | |
| 671 // avoid floating-point numbers to grow over 16 characters, | |
| 672 // which would be invalid according to DICOM standard | |
| 673 // ("dciodvfy" would complain). | |
| 674 char buf[32]; | |
| 675 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX); | |
| 426 | 676 |
| 483 | 677 createDicomRequestContent["Tags"]["PixelSpacing"] = buf; |
| 408 | 678 |
| 679 float center, width; | |
| 680 if (GetWindowing(center, width)) | |
| 681 { | |
| 483 | 682 createDicomRequestContent["Tags"]["WindowCenter"] = |
| 426 | 683 boost::lexical_cast<std::string>(boost::math::iround(center)); |
| 408 | 684 |
| 483 | 685 createDicomRequestContent["Tags"]["WindowWidth"] = |
| 426 | 686 boost::lexical_cast<std::string>(boost::math::iround(width)); |
| 408 | 687 } |
| 688 | |
| 587 | 689 if (!parentOrthancId.empty()) |
| 690 { | |
| 691 createDicomRequestContent["Parent"] = parentOrthancId; | |
| 692 } | |
| 693 | |
| 694 return rendered.release(); | |
| 695 } | |
| 696 | |
| 697 | |
| 698 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, | |
| 699 const Json::Value& dicomTags, | |
| 700 const std::string& parentOrthancId, | |
| 701 double pixelSpacingX, | |
| 702 double pixelSpacingY, | |
| 703 bool invert, | |
| 704 ImageInterpolation interpolation, | |
| 705 bool usePam) | |
| 706 { | |
| 707 LOG(INFO) << "Exporting RadiographyScene to DICOM"; | |
| 708 VLOG(1) << "Exporting RadiographyScene to: export to image"; | |
| 709 | |
| 710 std::auto_ptr<Orthanc::Image> rendered(ExportToCreateDicomRequestAndImage(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation)); | |
| 711 | |
| 712 // convert the image into base64 for inclusing in the createDicomRequest | |
| 713 std::string base64; | |
| 714 | |
| 715 { | |
| 716 std::string content; | |
| 717 | |
| 718 if (usePam) | |
| 719 { | |
| 720 VLOG(1) << "Exporting RadiographyScene: convert to PAM"; | |
| 721 Orthanc::PamWriter writer; | |
| 722 writer.WriteToMemory(content, *rendered); | |
| 723 } | |
| 724 else | |
| 725 { | |
| 726 Orthanc::PngWriter writer; | |
| 727 writer.WriteToMemory(content, *rendered); | |
| 728 } | |
| 729 | |
| 730 VLOG(1) << "Exporting RadiographyScene: encoding to base64"; | |
| 731 Orthanc::Toolbox::EncodeBase64(base64, content); | |
| 732 } | |
| 426 | 733 |
| 408 | 734 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme |
| 426 | 735 createDicomRequestContent["Content"] = ("data:" + |
| 736 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) + | |
| 737 ";base64," + base64); | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
738 |
| 541 | 739 VLOG(1) << "Exporting RadiographyScene: create-dicom request is ready"; |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
740 } |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
741 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
742 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
743 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
744 const Json::Value& dicomTags, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
745 const std::string& parentOrthancId, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
746 double pixelSpacingX, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
747 double pixelSpacingY, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
748 bool invert, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
749 ImageInterpolation interpolation, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
750 bool usePam) |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
751 { |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
752 Json::Value createDicomRequestContent; |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
753 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
754 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
755 |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
756 orthanc.PostJsonAsyncExpectJson( |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
757 "/tools/create-dicom", createDicomRequestContent, |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
758 new Callable<RadiographyScene, Deprecated::OrthancApiClient::JsonResponseReadyMessage> |
|
1066
b537002f83a9
removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
928
diff
changeset
|
759 (GetSharedObserver(), &RadiographyScene::OnDicomExported), |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
760 NULL, NULL); |
| 483 | 761 |
| 762 } | |
| 763 | |
| 764 | |
| 765 // Export using PAM is faster than using PNG, but requires Orthanc | |
| 766 // core >= 1.4.3 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
767 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
| 483 | 768 const Orthanc::DicomMap& dicom, |
| 769 const std::string& parentOrthancId, | |
| 770 double pixelSpacingX, | |
| 771 double pixelSpacingY, | |
| 772 bool invert, | |
| 773 ImageInterpolation interpolation, | |
| 774 bool usePam) | |
| 775 { | |
| 776 std::set<Orthanc::DicomTag> tags; | |
| 777 dicom.GetTags(tags); | |
| 778 | |
| 779 Json::Value jsonTags = Json::objectValue; | |
| 780 | |
| 781 for (std::set<Orthanc::DicomTag>::const_iterator | |
| 782 tag = tags.begin(); tag != tags.end(); ++tag) | |
| 783 { | |
| 784 const Orthanc::DicomValue& value = dicom.GetValue(*tag); | |
| 785 if (!value.IsNull() && | |
| 786 !value.IsBinary()) | |
| 787 { | |
| 788 jsonTags[tag->Format()] = value.GetContent(); | |
| 789 } | |
| 790 } | |
| 791 | |
| 792 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); | |
| 408 | 793 } |
| 794 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
795 void RadiographyScene::OnDicomExported(const Deprecated::OrthancApiClient::JsonResponseReadyMessage& message) |
| 408 | 796 { |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
797 LOG(INFO) << "DICOM export was successful: " |
| 408 | 798 << message.GetJson().toStyledString(); |
| 799 } | |
|
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 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
802 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
|
803 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
804 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes"; |
| 418 | 805 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
806 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
|
807 for (Deprecated::IWebService::HttpHeaders::const_iterator |
| 426 | 808 it = h.begin(); it != h.end(); ++it) |
| 418 | 809 { |
| 810 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str()); | |
| 811 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
812 } |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
813 |
| 408 | 814 } |