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