Mercurial > hg > orthanc-stone
annotate Framework/Radiography/RadiographyScene.cpp @ 1131:4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Wed, 06 Nov 2019 10:46:46 +0100 |
| parents | d33ae2b0db9d |
| children | 1a73f852810a f417a0ae282b |
| rev | line source |
|---|---|
| 408 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 439 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 408 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "RadiographyScene.h" | |
| 23 | |
| 430 | 24 #include "RadiographyAlphaLayer.h" |
| 25 #include "RadiographyDicomLayer.h" | |
| 26 #include "RadiographyTextLayer.h" | |
|
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
27 #include "RadiographyMaskLayer.h" |
|
732
c35e98d22764
move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
726
diff
changeset
|
28 #include "../Deprecated/Toolbox/DicomFrameConverter.h" |
| 408 | 29 |
| 30 #include <Core/Images/Image.h> | |
| 31 #include <Core/Images/ImageProcessing.h> | |
| 32 #include <Core/Images/PamReader.h> | |
| 33 #include <Core/Images/PamWriter.h> | |
| 34 #include <Core/Images/PngWriter.h> | |
| 35 #include <Core/OrthancException.h> | |
| 36 #include <Core/Toolbox.h> | |
| 37 #include <Plugins/Samples/Common/DicomDatasetReader.h> | |
| 38 #include <Plugins/Samples/Common/FullOrthancDataset.h> | |
| 39 | |
| 412 | 40 #include <boost/math/special_functions/round.hpp> |
| 41 | |
| 408 | 42 |
| 43 namespace OrthancStone | |
| 44 { | |
| 45 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene, | |
| 46 size_t index) : | |
| 47 scene_(scene), | |
| 48 index_(index) | |
| 49 { | |
| 50 Layers::iterator layer = scene.layers_.find(index); | |
| 51 if (layer == scene.layers_.end()) | |
| 52 { | |
| 53 layer_ = NULL; | |
| 54 } | |
| 55 else | |
| 56 { | |
| 57 assert(layer->second != NULL); | |
| 58 layer_ = layer->second; | |
| 59 } | |
| 60 } | |
| 61 | |
| 426 | 62 |
| 408 | 63 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene, |
| 64 double x, | |
| 65 double y) : | |
| 66 scene_(scene), | |
| 67 index_(0) // Dummy initialization | |
| 68 { | |
| 69 if (scene.LookupLayer(index_, x, y)) | |
| 70 { | |
| 71 Layers::iterator layer = scene.layers_.find(index_); | |
| 426 | 72 |
| 408 | 73 if (layer == scene.layers_.end()) |
| 74 { | |
| 75 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 76 } | |
| 77 else | |
| 78 { | |
| 79 assert(layer->second != NULL); | |
| 80 layer_ = layer->second; | |
| 81 } | |
| 82 } | |
| 83 else | |
| 84 { | |
| 85 layer_ = NULL; | |
| 86 } | |
| 87 } | |
| 88 | |
| 89 | |
| 90 RadiographyScene& RadiographyScene::LayerAccessor::GetScene() const | |
| 91 { | |
| 92 if (IsValid()) | |
| 93 { | |
| 94 return scene_; | |
| 95 } | |
| 96 else | |
| 97 { | |
| 98 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 99 } | |
| 100 } | |
| 101 | |
| 102 | |
| 103 size_t RadiographyScene::LayerAccessor::GetIndex() const | |
| 104 { | |
| 105 if (IsValid()) | |
| 106 { | |
| 107 return index_; | |
| 108 } | |
| 109 else | |
| 110 { | |
| 111 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 112 } | |
| 113 } | |
| 114 | |
| 115 | |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
116 RadiographyLayer& RadiographyScene::LayerAccessor::GetLayer() const |
| 408 | 117 { |
| 118 if (IsValid()) | |
| 119 { | |
| 120 return *layer_; | |
| 121 } | |
| 122 else | |
| 123 { | |
| 124 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 125 } | |
| 426 | 126 } |
| 408 | 127 |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
128 RadiographyLayer& RadiographyScene::RegisterLayer(RadiographyLayer* layer) |
| 408 | 129 { |
| 130 if (layer == NULL) | |
| 131 { | |
| 132 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 133 } | |
| 134 | |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
135 std::auto_ptr<RadiographyLayer> raii(layer); |
| 426 | 136 |
|
1112
d33ae2b0db9d
less logs + allow changing the size of the RadiographyLayer (to replace a low res image by a high res image)
Alain Mazy <alain@mazy.be>
parents:
928
diff
changeset
|
137 // LOG(INFO) << "Registering layer: " << countLayers_; |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
138 |
| 408 | 139 size_t index = countLayers_++; |
| 140 raii->SetIndex(index); | |
| 141 layers_[index] = raii.release(); | |
| 142 | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
143 BroadcastMessage(GeometryChangedMessage(*this, *layer)); |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
144 BroadcastMessage(ContentChangedMessage(*this, *layer)); |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
145 layer->RegisterObserverCallback(new Callable<RadiographyScene, RadiographyLayer::LayerEditedMessage>(*this, &RadiographyScene::OnLayerEdited)); |
| 408 | 146 |
| 147 return *layer; | |
| 148 } | |
| 426 | 149 |
| 876 | 150 size_t RadiographyScene::GetApproximateMemoryUsage() const |
| 151 { | |
| 152 size_t size = 0; | |
| 153 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
| 154 { | |
| 155 size += it->second->GetApproximateMemoryUsage(); | |
| 156 } | |
| 157 return size; | |
| 158 } | |
| 159 | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
160 void RadiographyScene::OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message) |
|
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
161 { |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
162 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, message.GetOrigin())); |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
163 } |
| 408 | 164 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
165 RadiographyScene::RadiographyScene(MessageBroker& broker) : |
| 408 | 166 IObserver(broker), |
| 167 IObservable(broker), | |
| 168 countLayers_(0), | |
| 169 hasWindowing_(false), | |
| 170 windowingCenter_(0), // Dummy initialization | |
| 171 windowingWidth_(0) // Dummy initialization | |
| 172 { | |
| 173 } | |
| 174 | |
| 175 | |
| 176 RadiographyScene::~RadiographyScene() | |
| 177 { | |
| 178 for (Layers::iterator it = layers_.begin(); it != layers_.end(); it++) | |
| 179 { | |
| 180 assert(it->second != NULL); | |
| 181 delete it->second; | |
| 182 } | |
| 183 } | |
| 184 | |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
185 RadiographyPhotometricDisplayMode RadiographyScene::GetPreferredPhotomotricDisplayMode() const |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
186 { |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
187 // 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
|
188 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
|
189 { |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
190 if (it->second->GetPreferredPhotomotricDisplayMode() != RadiographyPhotometricDisplayMode_Default) |
|
432
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 return it->second->GetPreferredPhotomotricDisplayMode(); |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
193 } |
|
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 |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
196 return RadiographyPhotometricDisplayMode_Default; |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
197 } |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
198 |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
199 |
| 430 | 200 void RadiographyScene::GetLayersIndexes(std::vector<size_t>& output) const |
| 201 { | |
| 202 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
| 203 { | |
| 204 output.push_back(it->first); | |
| 205 } | |
| 206 } | |
| 207 | |
| 425 | 208 void RadiographyScene::RemoveLayer(size_t layerIndex) |
| 209 { | |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
210 LOG(INFO) << "Removing layer: " << layerIndex; |
|
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
211 |
|
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
212 Layers::iterator found = layers_.find(layerIndex); |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
213 |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
214 if (found == layers_.end()) |
| 425 | 215 { |
| 216 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 217 } | |
|
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
218 else |
|
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 assert(found->second != NULL); |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
221 delete found->second; |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
222 |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
223 layers_.erase(found); |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
224 countLayers_--; |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
225 |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
226 LOG(INFO) << "Removing layer, there are now : " << countLayers_ << " layers"; |
|
1131
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
227 |
|
4663f158c748
RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents:
1112
diff
changeset
|
228 BroadcastMessage(RadiographyScene::LayerRemovedMessage(*this, layerIndex)); |
|
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
229 } |
| 425 | 230 } |
| 231 | |
| 430 | 232 const RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) const |
| 425 | 233 { |
|
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
234 Layers::const_iterator found = layers_.find(layerIndex); |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
235 |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
236 if (found == layers_.end()) |
| 425 | 237 { |
| 238 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 239 } | |
|
571
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
240 else |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
241 { |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
242 assert(found->second != NULL); |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
243 return *found->second; |
|
a29f9628369e
fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
553
diff
changeset
|
244 } |
| 425 | 245 } |
| 408 | 246 |
| 247 bool RadiographyScene::GetWindowing(float& center, | |
| 248 float& width) const | |
| 249 { | |
| 250 if (hasWindowing_) | |
| 251 { | |
| 252 center = windowingCenter_; | |
| 253 width = windowingWidth_; | |
| 254 return true; | |
| 255 } | |
| 256 else | |
| 257 { | |
| 258 return false; | |
| 259 } | |
| 260 } | |
| 261 | |
| 262 | |
| 263 void RadiographyScene::GetWindowingWithDefault(float& center, | |
| 264 float& width) const | |
| 265 { | |
| 266 if (!GetWindowing(center, width)) | |
| 267 { | |
| 268 center = 128; | |
| 269 width = 256; | |
| 270 } | |
| 271 } | |
| 272 | |
| 273 | |
| 274 void RadiographyScene::SetWindowing(float center, | |
| 275 float width) | |
| 276 { | |
| 277 hasWindowing_ = true; | |
| 278 windowingCenter_ = center; | |
| 279 windowingWidth_ = width; | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
280 |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
605
diff
changeset
|
281 BroadcastMessage(RadiographyScene::WindowingChangedMessage(*this)); |
| 408 | 282 } |
| 283 | |
| 284 | |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
285 RadiographyLayer& RadiographyScene::LoadText(const Orthanc::Font& font, |
| 430 | 286 const std::string& utf8, |
| 287 RadiographyLayer::Geometry* geometry) | |
| 408 | 288 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
289 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(IObservable::GetBroker(), *this)); |
| 408 | 290 alpha->LoadText(font, utf8); |
| 430 | 291 if (geometry != NULL) |
| 292 { | |
| 293 alpha->SetGeometry(*geometry); | |
| 294 } | |
| 408 | 295 |
| 296 return RegisterLayer(alpha.release()); | |
| 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 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
333 std::auto_ptr<RadiographyMaskLayer> mask(new RadiographyMaskLayer(IObservable::GetBroker(), *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 { | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
346 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(IObservable::GetBroker(), *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 { |
|
92305ee35b1c
web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents:
541
diff
changeset
|
363 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer(IObservable::GetBroker(), *this))); |
|
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 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
385 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer(IObservable::GetBroker(), *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> |
| 426 | 400 (*this, &RadiographyScene::OnTagsReceived), NULL, |
| 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> |
| 426 | 419 (*this, &RadiographyScene::OnFrameReceived), NULL, |
| 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 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
429 RadiographyLayer& layer = RegisterLayer(new RadiographyDicomLayer(IObservable::GetBroker(), *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, |
| 408 | 511 ImageInterpolation interpolation) const |
| 512 { | |
| 513 // Render layers in the background-to-foreground order | |
| 514 for (size_t index = 0; index < countLayers_; index++) | |
| 515 { | |
| 516 Layers::const_iterator it = layers_.find(index); | |
| 517 if (it != layers_.end()) | |
| 518 { | |
| 519 assert(it->second != NULL); | |
| 520 it->second->Render(buffer, viewTransform, interpolation); | |
| 521 } | |
| 522 } | |
| 523 } | |
| 524 | |
| 525 | |
| 526 bool RadiographyScene::LookupLayer(size_t& index /* out */, | |
| 527 double x, | |
| 528 double y) const | |
| 529 { | |
| 530 // Render layers in the foreground-to-background order | |
| 531 for (size_t i = countLayers_; i > 0; i--) | |
| 532 { | |
| 533 index = i - 1; | |
| 534 Layers::const_iterator it = layers_.find(index); | |
| 535 if (it != layers_.end()) | |
| 536 { | |
| 537 assert(it->second != NULL); | |
| 538 if (it->second->Contains(x, y)) | |
| 539 { | |
| 540 return true; | |
| 541 } | |
| 542 } | |
| 543 } | |
| 544 | |
| 545 return false; | |
| 546 } | |
| 547 | |
| 426 | 548 |
| 408 | 549 void RadiographyScene::DrawBorder(CairoContext& context, |
| 550 unsigned int layer, | |
| 551 double zoom) | |
| 552 { | |
| 553 Layers::const_iterator found = layers_.find(layer); | |
| 426 | 554 |
| 408 | 555 if (found != layers_.end()) |
| 556 { | |
| 557 context.SetSourceColor(255, 0, 0); | |
| 558 found->second->DrawBorders(context, zoom); | |
| 559 } | |
| 560 } | |
| 561 | |
| 562 | |
| 563 void RadiographyScene::GetRange(float& minValue, | |
| 564 float& maxValue) const | |
| 565 { | |
| 566 bool first = true; | |
| 426 | 567 |
| 408 | 568 for (Layers::const_iterator it = layers_.begin(); |
| 569 it != layers_.end(); it++) | |
| 570 { | |
| 571 assert(it->second != NULL); | |
| 572 | |
| 573 float a, b; | |
| 574 if (it->second->GetRange(a, b)) | |
| 575 { | |
| 576 if (first) | |
| 577 { | |
| 578 minValue = a; | |
| 579 maxValue = b; | |
| 580 first = false; | |
| 581 } | |
| 582 else | |
| 583 { | |
| 584 minValue = std::min(a, minValue); | |
| 585 maxValue = std::max(b, maxValue); | |
| 586 } | |
| 587 } | |
| 588 } | |
| 589 | |
| 590 if (first) | |
| 591 { | |
| 592 minValue = 0; | |
| 593 maxValue = 0; | |
| 594 } | |
| 595 } | |
| 596 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
597 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
598 double pixelSpacingY, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
599 ImageInterpolation interpolation, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
600 bool invert, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
601 int64_t maxValue /* for inversion */) |
| 426 | 602 { |
| 408 | 603 if (pixelSpacingX <= 0 || |
| 604 pixelSpacingY <= 0) | |
| 605 { | |
| 606 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 607 } | |
| 426 | 608 |
| 408 | 609 Extent2D extent = GetSceneExtent(); |
| 610 | |
|
928
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
611 int w = boost::math::iround(extent.GetWidth() / pixelSpacingX); |
|
1b49e78d91d0
fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
923
diff
changeset
|
612 int h = boost::math::iround(extent.GetHeight() / pixelSpacingY); |
| 408 | 613 |
| 614 if (w < 0 || h < 0) | |
| 615 { | |
| 616 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 617 } | |
| 618 | |
| 619 Orthanc::Image layers(Orthanc::PixelFormat_Float32, | |
| 620 static_cast<unsigned int>(w), | |
| 621 static_cast<unsigned int>(h), false); | |
| 622 | |
| 409 | 623 AffineTransform2D view = AffineTransform2D::Combine( |
| 426 | 624 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY), |
| 625 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); | |
| 626 | |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
627 // wipe background before rendering |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
628 Orthanc::ImageProcessing::Set(layers, 0); |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
629 |
| 408 | 630 Render(layers, view, interpolation); |
| 631 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
632 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
|
633 layers.GetWidth(), layers.GetHeight(), false)); |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
634 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
635 Orthanc::ImageProcessing::Convert(*rendered, layers); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
636 if (invert) |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
637 Orthanc::ImageProcessing::Invert(*rendered, maxValue); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
638 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
639 return rendered.release(); |
|
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 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
642 |
| 587 | 643 Orthanc::Image* RadiographyScene::ExportToCreateDicomRequestAndImage(Json::Value& createDicomRequestContent, |
| 644 const Json::Value& dicomTags, | |
| 645 const std::string& parentOrthancId, | |
| 646 double pixelSpacingX, | |
| 647 double pixelSpacingY, | |
| 648 bool invert, | |
| 649 ImageInterpolation interpolation) | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
650 { |
| 541 | 651 LOG(INFO) << "Exporting RadiographyScene to DICOM"; |
| 652 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
653 std::auto_ptr<Orthanc::Image> rendered(ExportToImage(pixelSpacingX, pixelSpacingY, interpolation)); // note: we don't invert the image in the pixels data because we'll set the PhotometricDisplayMode correctly in the DICOM tags |
| 408 | 654 |
| 483 | 655 createDicomRequestContent["Tags"] = dicomTags; |
| 408 | 656 |
|
739
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
657 RadiographyPhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode(); |
|
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
658 if ((invert && photometricMode != RadiographyPhotometricDisplayMode_Monochrome2) || |
|
be9c1530d40a
deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
732
diff
changeset
|
659 (!invert && photometricMode == RadiographyPhotometricDisplayMode_Monochrome1)) |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
660 { |
| 483 | 661 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
662 } |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
663 else |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
664 { |
| 483 | 665 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
666 } |
| 408 | 667 |
| 668 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to | |
| 669 // avoid floating-point numbers to grow over 16 characters, | |
| 670 // which would be invalid according to DICOM standard | |
| 671 // ("dciodvfy" would complain). | |
| 672 char buf[32]; | |
| 673 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX); | |
| 426 | 674 |
| 483 | 675 createDicomRequestContent["Tags"]["PixelSpacing"] = buf; |
| 408 | 676 |
| 677 float center, width; | |
| 678 if (GetWindowing(center, width)) | |
| 679 { | |
| 483 | 680 createDicomRequestContent["Tags"]["WindowCenter"] = |
| 426 | 681 boost::lexical_cast<std::string>(boost::math::iround(center)); |
| 408 | 682 |
| 483 | 683 createDicomRequestContent["Tags"]["WindowWidth"] = |
| 426 | 684 boost::lexical_cast<std::string>(boost::math::iround(width)); |
| 408 | 685 } |
| 686 | |
| 587 | 687 if (!parentOrthancId.empty()) |
| 688 { | |
| 689 createDicomRequestContent["Parent"] = parentOrthancId; | |
| 690 } | |
| 691 | |
| 692 return rendered.release(); | |
| 693 } | |
| 694 | |
| 695 | |
| 696 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, | |
| 697 const Json::Value& dicomTags, | |
| 698 const std::string& parentOrthancId, | |
| 699 double pixelSpacingX, | |
| 700 double pixelSpacingY, | |
| 701 bool invert, | |
| 702 ImageInterpolation interpolation, | |
| 703 bool usePam) | |
| 704 { | |
| 705 LOG(INFO) << "Exporting RadiographyScene to DICOM"; | |
| 706 VLOG(1) << "Exporting RadiographyScene to: export to image"; | |
| 707 | |
| 708 std::auto_ptr<Orthanc::Image> rendered(ExportToCreateDicomRequestAndImage(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation)); | |
| 709 | |
| 710 // convert the image into base64 for inclusing in the createDicomRequest | |
| 711 std::string base64; | |
| 712 | |
| 713 { | |
| 714 std::string content; | |
| 715 | |
| 716 if (usePam) | |
| 717 { | |
| 718 VLOG(1) << "Exporting RadiographyScene: convert to PAM"; | |
| 719 Orthanc::PamWriter writer; | |
| 720 writer.WriteToMemory(content, *rendered); | |
| 721 } | |
| 722 else | |
| 723 { | |
| 724 Orthanc::PngWriter writer; | |
| 725 writer.WriteToMemory(content, *rendered); | |
| 726 } | |
| 727 | |
| 728 VLOG(1) << "Exporting RadiographyScene: encoding to base64"; | |
| 729 Orthanc::Toolbox::EncodeBase64(base64, content); | |
| 730 } | |
| 426 | 731 |
| 408 | 732 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme |
| 426 | 733 createDicomRequestContent["Content"] = ("data:" + |
| 734 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) + | |
| 735 ";base64," + base64); | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
736 |
| 541 | 737 VLOG(1) << "Exporting RadiographyScene: create-dicom request is ready"; |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
738 } |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
739 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
740 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
741 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
742 const Json::Value& dicomTags, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
743 const std::string& parentOrthancId, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
744 double pixelSpacingX, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
745 double pixelSpacingY, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
746 bool invert, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
747 ImageInterpolation interpolation, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
748 bool usePam) |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
749 { |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
750 Json::Value createDicomRequestContent; |
|
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 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
753 |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
754 orthanc.PostJsonAsyncExpectJson( |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
755 "/tools/create-dicom", createDicomRequestContent, |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
756 new Callable<RadiographyScene, Deprecated::OrthancApiClient::JsonResponseReadyMessage> |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
757 (*this, &RadiographyScene::OnDicomExported), |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
758 NULL, NULL); |
| 483 | 759 |
| 760 } | |
| 761 | |
| 762 | |
| 763 // Export using PAM is faster than using PNG, but requires Orthanc | |
| 764 // core >= 1.4.3 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
765 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc, |
| 483 | 766 const Orthanc::DicomMap& dicom, |
| 767 const std::string& parentOrthancId, | |
| 768 double pixelSpacingX, | |
| 769 double pixelSpacingY, | |
| 770 bool invert, | |
| 771 ImageInterpolation interpolation, | |
| 772 bool usePam) | |
| 773 { | |
| 774 std::set<Orthanc::DicomTag> tags; | |
| 775 dicom.GetTags(tags); | |
| 776 | |
| 777 Json::Value jsonTags = Json::objectValue; | |
| 778 | |
| 779 for (std::set<Orthanc::DicomTag>::const_iterator | |
| 780 tag = tags.begin(); tag != tags.end(); ++tag) | |
| 781 { | |
| 782 const Orthanc::DicomValue& value = dicom.GetValue(*tag); | |
| 783 if (!value.IsNull() && | |
| 784 !value.IsBinary()) | |
| 785 { | |
| 786 jsonTags[tag->Format()] = value.GetContent(); | |
| 787 } | |
| 788 } | |
| 789 | |
| 790 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); | |
| 408 | 791 } |
| 792 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
793 void RadiographyScene::OnDicomExported(const Deprecated::OrthancApiClient::JsonResponseReadyMessage& message) |
| 408 | 794 { |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
795 LOG(INFO) << "DICOM export was successful: " |
| 408 | 796 << message.GetJson().toStyledString(); |
| 797 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
798 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
799 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
800 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
|
801 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
802 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes"; |
| 418 | 803 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
714
diff
changeset
|
804 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
|
805 for (Deprecated::IWebService::HttpHeaders::const_iterator |
| 426 | 806 it = h.begin(); it != h.end(); ++it) |
| 418 | 807 { |
| 808 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str()); | |
| 809 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
810 } |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
811 |
| 408 | 812 } |