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