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