Mercurial > hg > orthanc-stone
annotate Framework/Radiography/RadiographyScene.cpp @ 503:77e0eb83ff63 am-touch-events
layers are now Observable and emitting LayerEdited messages
| author | amazy |
|---|---|
| date | Tue, 26 Feb 2019 12:58:03 +0100 |
| parents | aede9b042cb7 |
| children | ce49eae4c887 |
| 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" |
| 408 | 28 #include "../Toolbox/DicomFrameConverter.h" |
| 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 |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
137 LOG(INFO) << "Registering layer: " << countLayers_; |
|
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 | |
| 430 | 143 EmitMessage(GeometryChangedMessage(*this, *layer)); |
| 144 EmitMessage(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 |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
150 void RadiographyScene::OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message) |
|
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
151 { |
|
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
152 EmitMessage(RadiographyScene::LayerEditedMessage(*this, message.GetOrigin())); |
|
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
153 } |
| 408 | 154 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
155 RadiographyScene::RadiographyScene(MessageBroker& broker) : |
| 408 | 156 IObserver(broker), |
| 157 IObservable(broker), | |
| 158 countLayers_(0), | |
| 159 hasWindowing_(false), | |
| 160 windowingCenter_(0), // Dummy initialization | |
| 161 windowingWidth_(0) // Dummy initialization | |
| 162 { | |
| 163 } | |
| 164 | |
| 165 | |
| 166 RadiographyScene::~RadiographyScene() | |
| 167 { | |
| 168 for (Layers::iterator it = layers_.begin(); it != layers_.end(); it++) | |
| 169 { | |
| 170 assert(it->second != NULL); | |
| 171 delete it->second; | |
| 172 } | |
| 173 } | |
| 174 | |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
175 PhotometricDisplayMode RadiographyScene::GetPreferredPhotomotricDisplayMode() const |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
176 { |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
177 // 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
|
178 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
|
179 { |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
180 if (it->second->GetPreferredPhotomotricDisplayMode() != PhotometricDisplayMode_Default) |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
181 { |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
182 return it->second->GetPreferredPhotomotricDisplayMode(); |
|
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 } |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
185 |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
186 return PhotometricDisplayMode_Default; |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
187 } |
|
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 |
| 430 | 190 void RadiographyScene::GetLayersIndexes(std::vector<size_t>& output) const |
| 191 { | |
| 192 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++) | |
| 193 { | |
| 194 output.push_back(it->first); | |
| 195 } | |
| 196 } | |
| 197 | |
| 425 | 198 void RadiographyScene::RemoveLayer(size_t layerIndex) |
| 199 { | |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
200 LOG(INFO) << "Removing layer: " << layerIndex; |
|
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
201 |
| 425 | 202 if (layerIndex > countLayers_) |
| 203 { | |
| 204 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 205 } | |
| 206 delete layers_[layerIndex]; | |
| 207 layers_.erase(layerIndex); | |
| 208 countLayers_--; | |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
426
diff
changeset
|
209 LOG(INFO) << "Removing layer, there are now : " << countLayers_ << " layers"; |
| 425 | 210 } |
| 211 | |
| 430 | 212 const RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) const |
| 425 | 213 { |
| 214 if (layerIndex > countLayers_) | |
| 215 { | |
| 216 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 217 } | |
| 430 | 218 |
| 219 return *(layers_.at(layerIndex)); | |
| 425 | 220 } |
| 408 | 221 |
| 222 bool RadiographyScene::GetWindowing(float& center, | |
| 223 float& width) const | |
| 224 { | |
| 225 if (hasWindowing_) | |
| 226 { | |
| 227 center = windowingCenter_; | |
| 228 width = windowingWidth_; | |
| 229 return true; | |
| 230 } | |
| 231 else | |
| 232 { | |
| 233 return false; | |
| 234 } | |
| 235 } | |
| 236 | |
| 237 | |
| 238 void RadiographyScene::GetWindowingWithDefault(float& center, | |
| 239 float& width) const | |
| 240 { | |
| 241 if (!GetWindowing(center, width)) | |
| 242 { | |
| 243 center = 128; | |
| 244 width = 256; | |
| 245 } | |
| 246 } | |
| 247 | |
| 248 | |
| 249 void RadiographyScene::SetWindowing(float center, | |
| 250 float width) | |
| 251 { | |
| 252 hasWindowing_ = true; | |
| 253 windowingCenter_ = center; | |
| 254 windowingWidth_ = width; | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
255 |
|
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
256 EmitMessage(RadiographyScene::WindowingChangedMessage(*this)); |
| 408 | 257 } |
| 258 | |
| 259 | |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
260 RadiographyLayer& RadiographyScene::LoadText(const Orthanc::Font& font, |
| 430 | 261 const std::string& utf8, |
| 262 RadiographyLayer::Geometry* geometry) | |
| 408 | 263 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
264 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(IObservable::GetBroker(), *this)); |
| 408 | 265 alpha->LoadText(font, utf8); |
| 430 | 266 if (geometry != NULL) |
| 267 { | |
| 268 alpha->SetGeometry(*geometry); | |
| 269 } | |
| 408 | 270 |
| 271 return RegisterLayer(alpha.release()); | |
| 272 } | |
| 273 | |
| 426 | 274 |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
275 RadiographyLayer& RadiographyScene::LoadTestBlock(unsigned int width, |
| 430 | 276 unsigned int height, |
| 277 RadiographyLayer::Geometry* geometry) | |
| 408 | 278 { |
| 279 std::auto_ptr<Orthanc::Image> block(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false)); | |
| 280 | |
| 281 for (unsigned int padding = 0; | |
| 282 (width > 2 * padding) && (height > 2 * padding); | |
| 283 padding++) | |
| 284 { | |
| 285 uint8_t color; | |
| 286 if (255 > 10 * padding) | |
| 287 { | |
| 288 color = 255 - 10 * padding; | |
| 289 } | |
| 290 else | |
| 291 { | |
| 292 color = 0; | |
| 293 } | |
| 294 | |
| 295 Orthanc::ImageAccessor region; | |
| 296 block->GetRegion(region, padding, padding, width - 2 * padding, height - 2 * padding); | |
| 297 Orthanc::ImageProcessing::Set(region, color); | |
| 298 } | |
| 299 | |
| 430 | 300 return LoadAlphaBitmap(block.release(), geometry); |
| 301 } | |
| 302 | |
| 488 | 303 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
|
304 const RadiographyDicomLayer& dicomLayer, |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
305 float foreground, |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
306 RadiographyLayer::Geometry* geometry) |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
307 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
308 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
|
309 mask->SetCorners(corners); |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
310 if (geometry != NULL) |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
311 { |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
312 mask->SetGeometry(*geometry); |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
313 } |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
314 |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
315 return RegisterLayer(mask.release()); |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
316 } |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
317 |
|
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
440
diff
changeset
|
318 |
| 430 | 319 RadiographyLayer& RadiographyScene::LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, RadiographyLayer::Geometry *geometry) |
| 320 { | |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
321 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(IObservable::GetBroker(), *this)); |
| 430 | 322 alpha->SetAlpha(bitmap); |
| 323 if (geometry != NULL) | |
| 324 { | |
| 325 alpha->SetGeometry(*geometry); | |
| 326 } | |
| 408 | 327 |
| 328 return RegisterLayer(alpha.release()); | |
| 329 } | |
| 330 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
331 RadiographyLayer& RadiographyScene::LoadDicomFrame(OrthancApiClient& orthanc, |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
332 const std::string& instance, |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
409
diff
changeset
|
333 unsigned int frame, |
| 430 | 334 bool httpCompression, |
| 335 RadiographyLayer::Geometry* geometry) | |
| 408 | 336 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
337 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer(IObservable::GetBroker(), *this))); |
| 430 | 338 layer.SetInstance(instance, frame); |
| 339 | |
| 340 if (geometry != NULL) | |
| 341 { | |
| 342 layer.SetGeometry(*geometry); | |
| 343 } | |
| 408 | 344 |
| 345 { | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
346 IWebService::HttpHeaders headers; |
| 408 | 347 std::string uri = "/instances/" + instance + "/tags"; |
| 426 | 348 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
349 orthanc.GetBinaryAsync( |
| 426 | 350 uri, headers, |
| 351 new Callable<RadiographyScene, OrthancApiClient::BinaryResponseReadyMessage> | |
| 352 (*this, &RadiographyScene::OnTagsReceived), NULL, | |
| 353 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); | |
| 408 | 354 } |
| 355 | |
| 356 { | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
357 IWebService::HttpHeaders headers; |
| 408 | 358 headers["Accept"] = "image/x-portable-arbitrarymap"; |
| 359 | |
| 360 if (httpCompression) | |
| 361 { | |
| 362 headers["Accept-Encoding"] = "gzip"; | |
| 363 } | |
| 426 | 364 |
| 408 | 365 std::string uri = ("/instances/" + instance + "/frames/" + |
| 366 boost::lexical_cast<std::string>(frame) + "/image-uint16"); | |
| 426 | 367 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
368 orthanc.GetBinaryAsync( |
| 426 | 369 uri, headers, |
| 370 new Callable<RadiographyScene, OrthancApiClient::BinaryResponseReadyMessage> | |
| 371 (*this, &RadiographyScene::OnFrameReceived), NULL, | |
| 372 new Orthanc::SingleValueObject<size_t>(layer.GetIndex())); | |
| 408 | 373 } |
| 374 | |
| 375 return layer; | |
| 376 } | |
| 377 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
378 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
379 RadiographyLayer& RadiographyScene::LoadDicomWebFrame(IWebService& web) |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
380 { |
|
503
77e0eb83ff63
layers are now Observable and emitting LayerEdited messages
amazy
parents:
488
diff
changeset
|
381 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
|
382 |
| 426 | 383 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
384 return layer; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
385 } |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
386 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
387 |
| 426 | 388 |
| 408 | 389 void RadiographyScene::OnTagsReceived(const OrthancApiClient::BinaryResponseReadyMessage& message) |
| 390 { | |
| 391 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&> | |
| 426 | 392 (message.GetPayload()).GetValue(); |
| 408 | 393 |
| 394 LOG(INFO) << "JSON received: " << message.GetUri().c_str() | |
| 395 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
| 426 | 396 |
| 408 | 397 Layers::iterator layer = layers_.find(index); |
| 398 if (layer != layers_.end()) | |
| 399 { | |
| 400 assert(layer->second != NULL); | |
| 426 | 401 |
| 408 | 402 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer(), message.GetAnswerSize()); |
| 430 | 403 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetDicomTags(dicom); |
| 408 | 404 |
| 405 float c, w; | |
| 406 if (!hasWindowing_ && | |
| 407 layer->second->GetDefaultWindowing(c, w)) | |
| 408 { | |
| 409 hasWindowing_ = true; | |
| 410 windowingCenter_ = c; | |
| 411 windowingWidth_ = w; | |
| 412 } | |
| 413 | |
| 430 | 414 EmitMessage(GeometryChangedMessage(*this, *(layer->second))); |
| 408 | 415 } |
| 416 } | |
| 426 | 417 |
| 408 | 418 |
| 419 void RadiographyScene::OnFrameReceived(const OrthancApiClient::BinaryResponseReadyMessage& message) | |
| 420 { | |
| 421 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>(message.GetPayload()).GetValue(); | |
| 426 | 422 |
| 408 | 423 LOG(INFO) << "DICOM frame received: " << message.GetUri().c_str() |
| 424 << " (" << message.GetAnswerSize() << " bytes) for layer " << index; | |
| 426 | 425 |
| 408 | 426 Layers::iterator layer = layers_.find(index); |
| 427 if (layer != layers_.end()) | |
| 428 { | |
| 429 assert(layer->second != NULL); | |
| 430 | |
| 431 std::string content; | |
| 432 if (message.GetAnswerSize() > 0) | |
| 433 { | |
| 434 content.assign(reinterpret_cast<const char*>(message.GetAnswer()), message.GetAnswerSize()); | |
| 435 } | |
| 426 | 436 |
| 408 | 437 std::auto_ptr<Orthanc::PamReader> reader(new Orthanc::PamReader); |
| 438 reader->ReadFromMemory(content); | |
| 430 | 439 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetSourceImage(reader.release()); |
| 408 | 440 |
| 430 | 441 EmitMessage(ContentChangedMessage(*this, *(layer->second))); |
| 408 | 442 } |
| 443 } | |
| 444 | |
| 445 | |
| 446 Extent2D RadiographyScene::GetSceneExtent() const | |
| 447 { | |
| 448 Extent2D extent; | |
| 449 | |
| 450 for (Layers::const_iterator it = layers_.begin(); | |
| 451 it != layers_.end(); ++it) | |
| 452 { | |
| 453 assert(it->second != NULL); | |
| 454 extent.Union(it->second->GetExtent()); | |
| 455 } | |
| 456 | |
| 457 return extent; | |
| 458 } | |
| 426 | 459 |
| 408 | 460 |
| 461 void RadiographyScene::Render(Orthanc::ImageAccessor& buffer, | |
| 409 | 462 const AffineTransform2D& viewTransform, |
| 408 | 463 ImageInterpolation interpolation) const |
| 464 { | |
| 465 // Render layers in the background-to-foreground order | |
| 466 for (size_t index = 0; index < countLayers_; index++) | |
| 467 { | |
| 468 Layers::const_iterator it = layers_.find(index); | |
| 469 if (it != layers_.end()) | |
| 470 { | |
| 471 assert(it->second != NULL); | |
| 472 it->second->Render(buffer, viewTransform, interpolation); | |
| 473 } | |
| 474 } | |
| 475 } | |
| 476 | |
| 477 | |
| 478 bool RadiographyScene::LookupLayer(size_t& index /* out */, | |
| 479 double x, | |
| 480 double y) const | |
| 481 { | |
| 482 // Render layers in the foreground-to-background order | |
| 483 for (size_t i = countLayers_; i > 0; i--) | |
| 484 { | |
| 485 index = i - 1; | |
| 486 Layers::const_iterator it = layers_.find(index); | |
| 487 if (it != layers_.end()) | |
| 488 { | |
| 489 assert(it->second != NULL); | |
| 490 if (it->second->Contains(x, y)) | |
| 491 { | |
| 492 return true; | |
| 493 } | |
| 494 } | |
| 495 } | |
| 496 | |
| 497 return false; | |
| 498 } | |
| 499 | |
| 426 | 500 |
| 408 | 501 void RadiographyScene::DrawBorder(CairoContext& context, |
| 502 unsigned int layer, | |
| 503 double zoom) | |
| 504 { | |
| 505 Layers::const_iterator found = layers_.find(layer); | |
| 426 | 506 |
| 408 | 507 if (found != layers_.end()) |
| 508 { | |
| 509 context.SetSourceColor(255, 0, 0); | |
| 510 found->second->DrawBorders(context, zoom); | |
| 511 } | |
| 512 } | |
| 513 | |
| 514 | |
| 515 void RadiographyScene::GetRange(float& minValue, | |
| 516 float& maxValue) const | |
| 517 { | |
| 518 bool first = true; | |
| 426 | 519 |
| 408 | 520 for (Layers::const_iterator it = layers_.begin(); |
| 521 it != layers_.end(); it++) | |
| 522 { | |
| 523 assert(it->second != NULL); | |
| 524 | |
| 525 float a, b; | |
| 526 if (it->second->GetRange(a, b)) | |
| 527 { | |
| 528 if (first) | |
| 529 { | |
| 530 minValue = a; | |
| 531 maxValue = b; | |
| 532 first = false; | |
| 533 } | |
| 534 else | |
| 535 { | |
| 536 minValue = std::min(a, minValue); | |
| 537 maxValue = std::max(b, maxValue); | |
| 538 } | |
| 539 } | |
| 540 } | |
| 541 | |
| 542 if (first) | |
| 543 { | |
| 544 minValue = 0; | |
| 545 maxValue = 0; | |
| 546 } | |
| 547 } | |
| 548 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
549 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
550 double pixelSpacingY, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
551 ImageInterpolation interpolation, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
552 bool invert, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
553 int64_t maxValue /* for inversion */) |
| 426 | 554 { |
| 408 | 555 if (pixelSpacingX <= 0 || |
| 556 pixelSpacingY <= 0) | |
| 557 { | |
| 558 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 559 } | |
| 426 | 560 |
| 408 | 561 LOG(INFO) << "Exporting DICOM"; |
| 562 | |
| 563 Extent2D extent = GetSceneExtent(); | |
| 564 | |
| 565 int w = std::ceil(extent.GetWidth() / pixelSpacingX); | |
| 566 int h = std::ceil(extent.GetHeight() / pixelSpacingY); | |
| 567 | |
| 568 if (w < 0 || h < 0) | |
| 569 { | |
| 570 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 571 } | |
| 572 | |
| 573 Orthanc::Image layers(Orthanc::PixelFormat_Float32, | |
| 574 static_cast<unsigned int>(w), | |
| 575 static_cast<unsigned int>(h), false); | |
| 576 | |
| 409 | 577 AffineTransform2D view = AffineTransform2D::Combine( |
| 426 | 578 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY), |
| 579 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); | |
| 580 | |
|
432
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
581 // wipe background before rendering |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
582 Orthanc::ImageProcessing::Set(layers, 0); |
|
4eb96c6b4e96
improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents:
431
diff
changeset
|
583 |
| 408 | 584 Render(layers, view, interpolation); |
| 585 | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
586 std::auto_ptr<Orthanc::Image> rendered(new Orthanc::Image(Orthanc::PixelFormat_Grayscale16, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
587 layers.GetWidth(), layers.GetHeight(), false)); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
588 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
589 Orthanc::ImageProcessing::Convert(*rendered, layers); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
590 if (invert) |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
591 Orthanc::ImageProcessing::Invert(*rendered, maxValue); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
592 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
593 return rendered.release(); |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
594 } |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
595 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
596 |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
597 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
598 const Json::Value& dicomTags, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
599 const std::string& parentOrthancId, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
600 double pixelSpacingX, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
601 double pixelSpacingY, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
602 bool invert, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
603 ImageInterpolation interpolation, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
604 bool usePam) |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
605 { |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
606 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 | 607 |
| 608 std::string base64; | |
| 609 | |
| 610 { | |
| 611 std::string content; | |
| 612 | |
| 613 if (usePam) | |
| 614 { | |
| 615 Orthanc::PamWriter writer; | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
616 writer.WriteToMemory(content, *rendered); |
| 408 | 617 } |
| 618 else | |
| 619 { | |
| 620 Orthanc::PngWriter writer; | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
621 writer.WriteToMemory(content, *rendered); |
| 408 | 622 } |
| 623 | |
| 624 Orthanc::Toolbox::EncodeBase64(base64, content); | |
| 625 } | |
| 626 | |
| 483 | 627 createDicomRequestContent["Tags"] = dicomTags; |
| 408 | 628 |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
629 PhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode(); |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
630 if ((invert && photometricMode != PhotometricDisplayMode_Monochrome2) || |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
631 (!invert && photometricMode == PhotometricDisplayMode_Monochrome1)) |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
632 { |
| 483 | 633 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
634 } |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
635 else |
|
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
636 { |
| 483 | 637 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2"; |
|
436
04711a2e12cd
fix crop + export photometric interpretation correctly
am@osimis.io
parents:
432
diff
changeset
|
638 } |
| 408 | 639 |
| 640 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to | |
| 641 // avoid floating-point numbers to grow over 16 characters, | |
| 642 // which would be invalid according to DICOM standard | |
| 643 // ("dciodvfy" would complain). | |
| 644 char buf[32]; | |
| 645 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX); | |
| 426 | 646 |
| 483 | 647 createDicomRequestContent["Tags"]["PixelSpacing"] = buf; |
| 408 | 648 |
| 649 float center, width; | |
| 650 if (GetWindowing(center, width)) | |
| 651 { | |
| 483 | 652 createDicomRequestContent["Tags"]["WindowCenter"] = |
| 426 | 653 boost::lexical_cast<std::string>(boost::math::iround(center)); |
| 408 | 654 |
| 483 | 655 createDicomRequestContent["Tags"]["WindowWidth"] = |
| 426 | 656 boost::lexical_cast<std::string>(boost::math::iround(width)); |
| 408 | 657 } |
| 658 | |
| 426 | 659 |
| 408 | 660 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme |
| 426 | 661 createDicomRequestContent["Content"] = ("data:" + |
| 662 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) + | |
| 663 ";base64," + base64); | |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
664 |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
665 if (!parentOrthancId.empty()) |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
666 { |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
667 createDicomRequestContent["Parent"] = parentOrthancId; |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
668 } |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
669 |
|
484
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
670 } |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
671 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
672 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
673 void RadiographyScene::ExportDicom(OrthancApiClient& orthanc, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
674 const Json::Value& dicomTags, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
675 const std::string& parentOrthancId, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
676 double pixelSpacingX, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
677 double pixelSpacingY, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
678 bool invert, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
679 ImageInterpolation interpolation, |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
680 bool usePam) |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
681 { |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
682 Json::Value createDicomRequestContent; |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
683 |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
684 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); |
|
7bf001b9d244
re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents:
483
diff
changeset
|
685 |
|
481
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
686 orthanc.PostJsonAsyncExpectJson( |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
687 "/tools/create-dicom", createDicomRequestContent, |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
688 new Callable<RadiographyScene, OrthancApiClient::JsonResponseReadyMessage> |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
689 (*this, &RadiographyScene::OnDicomExported), |
|
159a465e27bd
reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents:
475
diff
changeset
|
690 NULL, NULL); |
| 483 | 691 |
| 692 } | |
| 693 | |
| 694 | |
| 695 // Export using PAM is faster than using PNG, but requires Orthanc | |
| 696 // core >= 1.4.3 | |
| 697 void RadiographyScene::ExportDicom(OrthancApiClient& orthanc, | |
| 698 const Orthanc::DicomMap& dicom, | |
| 699 const std::string& parentOrthancId, | |
| 700 double pixelSpacingX, | |
| 701 double pixelSpacingY, | |
| 702 bool invert, | |
| 703 ImageInterpolation interpolation, | |
| 704 bool usePam) | |
| 705 { | |
| 706 std::set<Orthanc::DicomTag> tags; | |
| 707 dicom.GetTags(tags); | |
| 708 | |
| 709 Json::Value jsonTags = Json::objectValue; | |
| 710 | |
| 711 for (std::set<Orthanc::DicomTag>::const_iterator | |
| 712 tag = tags.begin(); tag != tags.end(); ++tag) | |
| 713 { | |
| 714 const Orthanc::DicomValue& value = dicom.GetValue(*tag); | |
| 715 if (!value.IsNull() && | |
| 716 !value.IsBinary()) | |
| 717 { | |
| 718 jsonTags[tag->Format()] = value.GetContent(); | |
| 719 } | |
| 720 } | |
| 721 | |
| 722 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam); | |
| 408 | 723 } |
| 724 | |
| 725 void RadiographyScene::OnDicomExported(const OrthancApiClient::JsonResponseReadyMessage& message) | |
| 726 { | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
727 LOG(INFO) << "DICOM export was successful: " |
| 408 | 728 << message.GetJson().toStyledString(); |
| 729 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
730 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
731 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
732 void RadiographyScene::OnDicomWebReceived(const IWebService::HttpRequestSuccessMessage& message) |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
733 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
734 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes"; |
| 418 | 735 |
| 736 const IWebService::HttpHeaders& h = message.GetAnswerHttpHeaders(); | |
| 737 for (IWebService::HttpHeaders::const_iterator | |
| 426 | 738 it = h.begin(); it != h.end(); ++it) |
| 418 | 739 { |
| 740 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str()); | |
| 741 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
742 } |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
412
diff
changeset
|
743 |
| 408 | 744 } |