Mercurial > hg > orthanc-stone

annotate Framework/Radiography/RadiographyScene.cpp @ 1297:6ab03e429f06 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 23 Feb 2020 15:32:24 +0100
parents 7ec8fea061b9 4f8fc8dbd2a1
children c38c89684d83
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include "RadiographyScene.h"
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
24 #include "RadiographyAlphaLayer.h"
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
25 #include "RadiographyDicomLayer.h"
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 #include <Core/Images/Image.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include <Core/Images/ImageProcessing.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 #include <Core/Images/PamReader.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include <Core/Images/PamWriter.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include <Core/Images/PngWriter.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include <Core/OrthancException.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include <Core/Toolbox.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include <Plugins/Samples/Common/DicomDatasetReader.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include <Plugins/Samples/Common/FullOrthancDataset.h>
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39
412
71c16998fcc8 fix msvc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
40 #include <boost/math/special_functions/round.hpp>
71c16998fcc8 fix msvc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
41
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 namespace OrthancStone
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 size_t index) :
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 scene_(scene),
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 index_(index)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 Layers::iterator layer = scene.layers_.find(index);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 if (layer == scene.layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 layer_ = NULL;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 assert(layer->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 layer_ = layer->second;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
62
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 RadiographyScene::LayerAccessor::LayerAccessor(RadiographyScene& scene,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 double x,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 double y) :
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 scene_(scene),
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 index_(0) // Dummy initialization
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 if (scene.LookupLayer(index_, x, y))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 Layers::iterator layer = scene.layers_.find(index_);
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
72
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 if (layer == scene.layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 assert(layer->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 layer_ = layer->second;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 layer_ = NULL;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 RadiographyScene& RadiographyScene::LayerAccessor::GetScene() const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 if (IsValid())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 return scene_;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 size_t RadiographyScene::LayerAccessor::GetIndex() const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 if (IsValid())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 return index_;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 if (IsValid())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 return *layer_;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
126 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 if (layer == NULL)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145
1257
6af941a68472 RadiographyScene: virtual methods to use in derived class
Alain Mazy <alain@mazy.be>
parents: 1220
diff changeset
146 _RegisterLayer(layer);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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));
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
150 Register<RadiographyLayer::LayerEditedMessage>(*layer, &RadiographyScene::OnLayerEdited);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 return *layer;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
154
876
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
155 size_t RadiographyScene::GetApproximateMemoryUsage() const
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
156 {
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
157 size_t size = 0;
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
158 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++)
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
159 {
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
160 size += it->second->GetApproximateMemoryUsage();
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
161 }
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
162 return size;
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
163 }
580dd82e13f5 added GetApproximateMemoryUsage
Alain Mazy <alain@mazy.be>
parents: 739
diff changeset
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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
1200
54cbffabdc45 integration mainline->broker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1195 1199
diff changeset
170
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
171 RadiographyScene::RadiographyScene() :
1199
922d2e61aa5d RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents: 1196
diff changeset
172 nextLayerIndex_(0),
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 hasWindowing_(false),
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 windowingCenter_(0), // Dummy initialization
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 windowingWidth_(0) // Dummy initialization
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 RadiographyScene::~RadiographyScene()
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 for (Layers::iterator it = layers_.begin(); it != layers_.end(); it++)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 assert(it->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 delete it->second;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
189 RadiographyPhotometricDisplayMode RadiographyScene::GetPreferredPhotomotricDisplayMode() const
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
190 {
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
191 // 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
192 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
193 {
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
194 if (it->second->GetPreferredPhotomotricDisplayMode() != RadiographyPhotometricDisplayMode_Default)
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
195 {
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
196 return it->second->GetPreferredPhotomotricDisplayMode();
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
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
200 return RadiographyPhotometricDisplayMode_Default;
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
201 }
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
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
204 void RadiographyScene::GetLayersIndexes(std::vector<size_t>& output) const
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
205 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
206 for (Layers::const_iterator it = layers_.begin(); it != layers_.end(); it++)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
207 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
208 output.push_back(it->first);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
209 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
210 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
211
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
212 void RadiographyScene::RemoveLayer(size_t layerIndex)
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
213 {
428
751fb354149e ability to change the scene of the RadiographyWidget
am@osimis.io
parents: 426
diff changeset
214 LOG(INFO) << "Removing layer: " << layerIndex;
751fb354149e ability to change the scene of the RadiographyWidget
am@osimis.io
parents: 426
diff changeset
215
571
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
216 Layers::iterator found = layers_.find(layerIndex);
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
217
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
218 if (found == layers_.end())
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
219 {
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
220 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
221 }
571
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
222 else
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
223 {
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
224 assert(found->second != NULL);
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
225 delete found->second;
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
226
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
227 layers_.erase(found);
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
228
1199
922d2e61aa5d RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents: 1196
diff changeset
229 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
230
1272
a989c7d46b9a options to avoid multiple LayerEditedMessage
Alain Mazy <alain@mazy.be>
parents: 1259
diff changeset
231 _OnLayerRemoved();
a989c7d46b9a options to avoid multiple LayerEditedMessage
Alain Mazy <alain@mazy.be>
parents: 1259
diff changeset
232
1131
4663f158c748 RadiographyWidget is now notified when a layer is removed from the scene
Alain Mazy <alain@mazy.be>
parents: 1112
diff changeset
233 BroadcastMessage(RadiographyScene::LayerRemovedMessage(*this, layerIndex));
571
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
234 }
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
235 }
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
236
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
237 const RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex) const
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
238 {
571
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
239 Layers::const_iterator found = layers_.find(layerIndex);
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 if (found == layers_.end())
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
242 {
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
243 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
244 }
571
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
245 else
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
246 {
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
247 assert(found->second != NULL);
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
248 return *found->second;
a29f9628369e fix build on visual studio 2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 553
diff changeset
249 }
425
087237703d63 added layer accessors
am@osimis.io
parents: 418
diff changeset
250 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251
1201
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
252 RadiographyLayer& RadiographyScene::GetLayer(size_t layerIndex)
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
253 {
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
254 Layers::const_iterator found = layers_.find(layerIndex);
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
255
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
256 if (found == layers_.end())
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
257 {
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
258 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
259 }
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
260 else
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
261 {
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
262 assert(found->second != NULL);
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
263 return *found->second;
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
264 }
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
265 }
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
266
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267 bool RadiographyScene::GetWindowing(float& center,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 float& width) const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 if (hasWindowing_)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 center = windowingCenter_;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273 width = windowingWidth_;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 return true;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 return false;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 void RadiographyScene::GetWindowingWithDefault(float& center,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 float& width) const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 if (!GetWindowing(center, width))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 center = 128;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 width = 256;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 void RadiographyScene::SetWindowing(float center,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 float width)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 hasWindowing_ = true;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 windowingCenter_ = center;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 windowingWidth_ = width;
503
77e0eb83ff63 layers are now Observable and emitting LayerEdited messages
amazy
parents: 488
diff changeset
300
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 605
diff changeset
301 BroadcastMessage(RadiographyScene::WindowingChangedMessage(*this));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304
1201
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
305 RadiographyLayer& RadiographyScene::UpdateText(size_t layerIndex,
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
306 const std::string& utf8,
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
307 const std::string& font,
1201
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
308 unsigned int fontSize,
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
309 uint8_t foreground)
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
310 {
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
311 RadiographyTextLayer& textLayer = dynamic_cast<RadiographyTextLayer&>(GetLayer(layerIndex));
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
312 textLayer.SetText(utf8, font, fontSize, foreground);
1201
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
313
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
314 BroadcastMessage(RadiographyScene::ContentChangedMessage(*this, textLayer));
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
315 BroadcastMessage(RadiographyScene::LayerEditedMessage(*this, textLayer));
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
316 return textLayer;
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
317 }
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
318
ab958fd99b07 RadiographyScene fixes
Alain Mazy <alain@mazy.be>
parents: 1199
diff changeset
319
1190
f417a0ae282b wip: TextLayer with new fonts
Alain Mazy <alain@mazy.be>
parents: 1131
diff changeset
320 RadiographyLayer& RadiographyScene::LoadText(const std::string& utf8,
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
321 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
322 unsigned int fontSize,
1190
f417a0ae282b wip: TextLayer with new fonts
Alain Mazy <alain@mazy.be>
parents: 1131
diff changeset
323 uint8_t foreground,
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
324 RadiographyLayer::Geometry* centerGeometry,
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
325 bool isCenterGeometry)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
327 std::auto_ptr<RadiographyTextLayer> alpha(new RadiographyTextLayer(*this));
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
328 alpha->SetText(utf8, font, fontSize, foreground);
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
329 if (centerGeometry != NULL)
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
330 {
1220
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
331 if (isCenterGeometry)
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
332 {
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
333 // modify geometry to reference the top left corner
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
334 double tlx = centerGeometry->GetPanX();
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
335 double tly = centerGeometry->GetPanY();
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
336 Extent2D textExtent = alpha->GetExtent();
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
337 tlx = tlx - (textExtent.GetWidth() / 2) * centerGeometry->GetPixelSpacingX();
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
338 tly = tly - (textExtent.GetHeight() / 2) * centerGeometry->GetPixelSpacingY();
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
339 centerGeometry->SetPan(tlx, tly);
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
340 }
9ee6b28f53e8 RadiographyTextLayer: support multiple fonts
Alain Mazy <alain@mazy.be>
parents: 1201
diff changeset
341 alpha->SetGeometry(*centerGeometry);
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
342 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343
1199
922d2e61aa5d RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents: 1196
diff changeset
344 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
345
922d2e61aa5d RadiograpyScene: can now remove any layer + new key wrappers for Delete/Backspace
Alain Mazy <alain@mazy.be>
parents: 1196
diff changeset
346 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
347 return registeredLayer;
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
350
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 409
diff changeset
351 RadiographyLayer& RadiographyScene::LoadTestBlock(unsigned int width,
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
352 unsigned int height,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
353 RadiographyLayer::Geometry* geometry)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355 std::auto_ptr<Orthanc::Image> block(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false));
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
357 for (unsigned int padding = 0;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
358 (width > 2 * padding) && (height > 2 * padding);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
359 padding++)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
360 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361 uint8_t color;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
362 if (255 > 10 * padding)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
363 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
364 color = 255 - 10 * padding;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
366 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
368 color = 0;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
370
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
371 Orthanc::ImageAccessor region;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 block->GetRegion(region, padding, padding, width - 2 * padding, height - 2 * padding);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 Orthanc::ImageProcessing::Set(region, color);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
375
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
376 return LoadAlphaBitmap(block.release(), geometry);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
377 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
378
488
aede9b042cb7 now using ImageProcessing::FillPolygon
am@osimis.io
parents: 484
diff changeset
379 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
380 const RadiographyDicomLayer& dicomLayer,
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
381 float foreground,
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
382 RadiographyLayer::Geometry* geometry)
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
383 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
384 std::auto_ptr<RadiographyMaskLayer> mask(new RadiographyMaskLayer(*this, dicomLayer, foreground));
475
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
385 mask->SetCorners(corners);
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
386 if (geometry != NULL)
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
387 {
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
388 mask->SetGeometry(*geometry);
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
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
391 return RegisterLayer(mask.release());
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
3c28542229a3 added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents: 440
diff changeset
394
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
395 RadiographyLayer& RadiographyScene::LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, RadiographyLayer::Geometry *geometry)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
396 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
397 std::auto_ptr<RadiographyAlphaLayer> alpha(new RadiographyAlphaLayer(*this));
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
398 alpha->SetAlpha(bitmap);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
399 if (geometry != NULL)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
400 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
401 alpha->SetGeometry(*geometry);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
402 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404 return RegisterLayer(alpha.release());
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
407 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
408 const std::string& instance,
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
409 unsigned int frame,
714
d2c0e347ddc2 deprecating DicomFrameConverter
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
410 Deprecated::DicomFrameConverter* converter, // takes ownership
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
411 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode,
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
412 RadiographyLayer::Geometry* geometry)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
413 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
414 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer(*this)));
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
415
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
416 layer.SetInstance(instance, frame);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
417
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
418 if (geometry != NULL)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
419 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
420 layer.SetGeometry(*geometry);
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
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
423 layer.SetDicomFrameConverter(converter);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
424 layer.SetSourceImage(dicomImage);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
425 layer.SetPreferredPhotomotricDisplayMode(preferredPhotometricDisplayMode);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
426
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
427 return layer;
587
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
428 }
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 541
diff changeset
429
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
430 RadiographyLayer& RadiographyScene::LoadDicomFrame(Deprecated::OrthancApiClient& orthanc,
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
431 const std::string& instance,
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 409
diff changeset
432 unsigned int frame,
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
433 bool httpCompression,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
434 RadiographyLayer::Geometry* geometry)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
435 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
436 RadiographyDicomLayer& layer = dynamic_cast<RadiographyDicomLayer&>(RegisterLayer(new RadiographyDicomLayer( *this)));
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
437 layer.SetInstance(instance, frame);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
438
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
439 if (geometry != NULL)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
440 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
441 layer.SetGeometry(*geometry);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
442 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
443
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
444 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
445 Deprecated::IWebService::HttpHeaders headers;
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
446 std::string uri = "/instances/" + instance + "/tags";
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
447
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
448 orthanc.GetBinaryAsync(
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
449 uri, headers,
1222
21c2b0eee53c deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1204
diff changeset
450 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage>
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
451 (GetSharedObserver(), &RadiographyScene::OnTagsReceived), NULL,
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
452 new Orthanc::SingleValueObject<size_t>(layer.GetIndex()));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
456 Deprecated::IWebService::HttpHeaders headers;
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 headers["Accept"] = "image/x-portable-arbitrarymap";
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459 if (httpCompression)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
460 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461 headers["Accept-Encoding"] = "gzip";
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
462 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
463
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
464 std::string uri = ("/instances/" + instance + "/frames/" +
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
465 boost::lexical_cast<std::string>(frame) + "/image-uint16");
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
466
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
467 orthanc.GetBinaryAsync(
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
468 uri, headers,
1222
21c2b0eee53c deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1204
diff changeset
469 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::BinaryResponseReadyMessage>
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
470 (GetSharedObserver(), &RadiographyScene::OnFrameReceived), NULL,
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
471 new Orthanc::SingleValueObject<size_t>(layer.GetIndex()));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
472 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
473
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 return layer;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
477
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
478 RadiographyLayer& RadiographyScene::LoadDicomWebFrame(Deprecated::IWebService& web)
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
479 {
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
480 RadiographyLayer& layer = RegisterLayer(new RadiographyDicomLayer(*this));
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
481
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
482
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
483 return layer;
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
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
486
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
487
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
488 void RadiographyScene::OnTagsReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
490 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
491 (message.GetPayload()).GetValue();
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492
1285
4f8fc8dbd2a1 changed log level
Alain Mazy <alain@mazy.be>
parents: 1273
diff changeset
493 VLOG(1) << "JSON received: " << message.GetUri().c_str()
4f8fc8dbd2a1 changed log level
Alain Mazy <alain@mazy.be>
parents: 1273
diff changeset
494 << " (" << message.GetAnswerSize() << " bytes) for layer " << index;
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
495
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
496 Layers::iterator layer = layers_.find(index);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
497 if (layer != layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 assert(layer->second != NULL);
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
500
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer(), message.GetAnswerSize());
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
502 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetDicomTags(dicom);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504 float c, w;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 if (!hasWindowing_ &&
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 layer->second->GetDefaultWindowing(c, w))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 hasWindowing_ = true;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 windowingCenter_ = c;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510 windowingWidth_ = w;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 605
diff changeset
513 BroadcastMessage(GeometryChangedMessage(*this, *(layer->second)));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
514 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
515 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
516
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
517
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
518 void RadiographyScene::OnFrameReceived(const Deprecated::OrthancApiClient::BinaryResponseReadyMessage& message)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
519 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
520 size_t index = dynamic_cast<const Orthanc::SingleValueObject<size_t>&>(message.GetPayload()).GetValue();
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
521
1285
4f8fc8dbd2a1 changed log level
Alain Mazy <alain@mazy.be>
parents: 1273
diff changeset
522 VLOG(1) << "DICOM frame received: " << message.GetUri().c_str()
4f8fc8dbd2a1 changed log level
Alain Mazy <alain@mazy.be>
parents: 1273
diff changeset
523 << " (" << message.GetAnswerSize() << " bytes) for layer " << index;
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
524
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
525 Layers::iterator layer = layers_.find(index);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
526 if (layer != layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
527 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
528 assert(layer->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
529
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
530 std::string content;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
531 if (message.GetAnswerSize() > 0)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
532 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
533 content.assign(reinterpret_cast<const char*>(message.GetAnswer()), message.GetAnswerSize());
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
534 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
535
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
536 std::auto_ptr<Orthanc::PamReader> reader(new Orthanc::PamReader);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
537 reader->ReadFromMemory(content);
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428 427
diff changeset
538 dynamic_cast<RadiographyDicomLayer*>(layer->second)->SetSourceImage(reader.release());
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
539
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 605
diff changeset
540 BroadcastMessage(ContentChangedMessage(*this, *(layer->second)));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
541 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
542 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
543
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
544
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
545 Extent2D RadiographyScene::GetSceneExtent() const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
546 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
547 Extent2D extent;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
548
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
549 for (Layers::const_iterator it = layers_.begin();
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
550 it != layers_.end(); ++it)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
551 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
552 assert(it->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
553 extent.Union(it->second->GetExtent());
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
554 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
555
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
556 return extent;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
557 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
558
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
559
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
560 void RadiographyScene::Render(Orthanc::ImageAccessor& buffer,
409
99c9b3238008 AffineTransform2D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
561 const AffineTransform2D& viewTransform,
1196
a5f2a6b04a31 RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents: 1190
diff changeset
562 ImageInterpolation interpolation,
a5f2a6b04a31 RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents: 1190
diff changeset
563 bool applyWindowing) const
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
564 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
565 // 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
566 for (size_t index = 0; index < nextLayerIndex_; index++)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
567 {
1258
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
568 try
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
569 {
1258
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
570 Layers::const_iterator it = layers_.find(index);
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
571 if (it != layers_.end())
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
572 {
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
573 assert(it->second != NULL);
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
574 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
575 }
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
576 }
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
577 catch (Orthanc::OrthancException& ex)
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
578 {
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
579 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
580 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
581 }
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
582 catch (...)
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
583 {
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
584 LOG(ERROR) << "RadiographyScene::Render: " << index << ", unkown exception: ";
9c20ae049669 more logs to debug exceptions in Render
Alain Mazy <alain@mazy.be>
parents: 1257
diff changeset
585 throw; // rethrow because we want it to crash to see there's a problem !
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
586 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
587 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
588 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
589
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
590
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
591 bool RadiographyScene::LookupLayer(size_t& index /* out */,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
592 double x,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
593 double y) const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
594 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
595 // 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
596 for (size_t i = nextLayerIndex_; i > 0; i--)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
597 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
598 index = i - 1;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
599 Layers::const_iterator it = layers_.find(index);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
600 if (it != layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
601 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
602 assert(it->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
603 if (it->second->Contains(x, y))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
604 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
605 return true;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
606 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
607 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
608 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
609
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
610 return false;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
611 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
612
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
613
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
614 void RadiographyScene::DrawBorder(CairoContext& context,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
615 unsigned int layer,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
616 double zoom)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
617 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
618 Layers::const_iterator found = layers_.find(layer);
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
619
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
620 if (found != layers_.end())
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
621 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
622 context.SetSourceColor(255, 0, 0);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
623 found->second->DrawBorders(context, zoom);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
624 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
625 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
626
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
627
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
628 void RadiographyScene::GetRange(float& minValue,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
629 float& maxValue) const
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
630 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
631 bool first = true;
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
632
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
633 for (Layers::const_iterator it = layers_.begin();
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
634 it != layers_.end(); it++)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
635 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
636 assert(it->second != NULL);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
637
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
638 float a, b;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
639 if (it->second->GetRange(a, b))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
640 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
641 if (first)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
642 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
643 minValue = a;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
644 maxValue = b;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
645 first = false;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
646 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
647 else
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
648 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
649 minValue = std::min(a, minValue);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
650 maxValue = std::max(b, maxValue);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
651 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
652 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
653 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
654
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
655 if (first)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
656 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
657 minValue = 0;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
658 maxValue = 0;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
659 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
660 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
661
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
662 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
663 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
664 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
665 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
666 {
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 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
668
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 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
670 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
671
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 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
673 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
674 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
675
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 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
677 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
678 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
679
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 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
681 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
682 }
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
683
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
684 Orthanc::Image* RadiographyScene::ExportToImage(double pixelSpacingX,
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
685 double pixelSpacingY,
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
686 ImageInterpolation interpolation,
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
687 bool invert,
1196
a5f2a6b04a31 RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents: 1190
diff changeset
688 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
689 bool applyWindowing)
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
690 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
691 if (pixelSpacingX <= 0 ||
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
692 pixelSpacingY <= 0)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
693 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
694 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
695 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
696
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
697 Extent2D extent = GetSceneExtent();
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
698
928
1b49e78d91d0 fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 923
diff changeset
699 int w = boost::math::iround(extent.GetWidth() / pixelSpacingX);
1b49e78d91d0 fix for older compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 923
diff changeset
700 int h = boost::math::iround(extent.GetHeight() / pixelSpacingY);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
701
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
702 if (w < 0 || h < 0)
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
703 {
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
704 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
705 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
706
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
707 Orthanc::Image layers(Orthanc::PixelFormat_Float32,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
708 static_cast<unsigned int>(w),
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
709 static_cast<unsigned int>(h), false);
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
710
409
99c9b3238008 AffineTransform2D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
711 AffineTransform2D view = AffineTransform2D::Combine(
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
712 AffineTransform2D::CreateScaling(1.0 / pixelSpacingX, 1.0 / pixelSpacingY),
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
713 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1()));
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
714
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
715 // 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
716 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
717 {
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 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
719 }
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 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
721 {
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 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
723 }
432
4eb96c6b4e96 improved handling of MONOCHROME1, background and invertion
am@osimis.io
parents: 431
diff changeset
724
1196
a5f2a6b04a31 RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents: 1190
diff changeset
725 Render(layers, view, interpolation, applyWindowing);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
726
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
727 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
728 layers.GetWidth(), layers.GetHeight(), false));
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
729
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
730 Orthanc::ImageProcessing::Convert(*rendered, layers);
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
731 if (invert)
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
732 Orthanc::ImageProcessing::Invert(*rendered, maxValue);
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
733
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
734 return rendered.release();
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
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
737
587
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
738 Orthanc::Image* RadiographyScene::ExportToCreateDicomRequestAndImage(Json::Value& createDicomRequestContent,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
739 const Json::Value& dicomTags,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
740 const std::string& parentOrthancId,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
741 double pixelSpacingX,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
742 double pixelSpacingY,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
743 bool invert,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
744 ImageInterpolation interpolation)
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
745 {
541
Alain Mazy <alain@mazy.be>
parents: 507
diff changeset
746 LOG(INFO) << "Exporting RadiographyScene to DICOM";
Alain Mazy <alain@mazy.be>
parents: 507
diff changeset
747
1196
a5f2a6b04a31 RadiographyScene: windowing is now only applied to the Dicom layer
Alain Mazy <alain@mazy.be>
parents: 1190
diff changeset
748 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
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
749
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
750 createDicomRequestContent["Tags"] = dicomTags;
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
751
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
752 RadiographyPhotometricDisplayMode photometricMode = GetPreferredPhotomotricDisplayMode();
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
753 if ((invert && photometricMode != RadiographyPhotometricDisplayMode_Monochrome2) ||
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
754 (!invert && photometricMode == RadiographyPhotometricDisplayMode_Monochrome1))
436
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
755 {
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
756 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME1";
436
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
757 }
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
758 else
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
759 {
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
760 createDicomRequestContent["Tags"]["PhotometricInterpretation"] = "MONOCHROME2";
436
04711a2e12cd fix crop + export photometric interpretation correctly
am@osimis.io
parents: 432
diff changeset
761 }
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
762
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
763 // WARNING: The order of PixelSpacing is Y/X. We use "%0.8f" to
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
764 // avoid floating-point numbers to grow over 16 characters,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
765 // which would be invalid according to DICOM standard
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766 // ("dciodvfy" would complain).
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
767 char buf[32];
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
768 sprintf(buf, "%0.8f\\%0.8f", pixelSpacingY, pixelSpacingX);
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
769
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
770 createDicomRequestContent["Tags"]["PixelSpacing"] = buf;
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
771
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
772 float center, width;
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
773 if (GetWindowing(center, width))
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
774 {
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
775 createDicomRequestContent["Tags"]["WindowCenter"] =
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
776 boost::lexical_cast<std::string>(boost::math::iround(center));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
777
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
778 createDicomRequestContent["Tags"]["WindowWidth"] =
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
779 boost::lexical_cast<std::string>(boost::math::iround(width));
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
780 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
781
587
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
782 if (!parentOrthancId.empty())
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
783 {
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
784 createDicomRequestContent["Parent"] = parentOrthancId;
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
785 }
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
786
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
787 return rendered.release();
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
788 }
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
789
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
790
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
791 void RadiographyScene::ExportToCreateDicomRequest(Json::Value& createDicomRequestContent,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
792 const Json::Value& dicomTags,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
793 const std::string& parentOrthancId,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
794 double pixelSpacingX,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
795 double pixelSpacingY,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
796 bool invert,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
797 ImageInterpolation interpolation,
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
798 bool usePam)
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
799 {
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
800 LOG(INFO) << "Exporting RadiographyScene to DICOM";
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
801 VLOG(1) << "Exporting RadiographyScene to: export to image";
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
802
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
803 std::auto_ptr<Orthanc::Image> rendered(ExportToCreateDicomRequestAndImage(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation));
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
804
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
805 // convert the image into base64 for inclusing in the createDicomRequest
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
806 std::string base64;
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
807
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
808 {
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
809 std::string content;
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
810
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
811 if (usePam)
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
812 {
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
813 VLOG(1) << "Exporting RadiographyScene: convert to PAM";
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
814 Orthanc::PamWriter writer;
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
815 writer.WriteToMemory(content, *rendered);
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
816 }
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
817 else
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
818 {
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
819 Orthanc::PngWriter writer;
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
820 writer.WriteToMemory(content, *rendered);
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
821 }
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
822
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
823 VLOG(1) << "Exporting RadiographyScene: encoding to base64";
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
824 Orthanc::Toolbox::EncodeBase64(base64, content);
848170ca4351 more export functions
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
825 }
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
826
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
827 // This is Data URI scheme: https://en.wikipedia.org/wiki/Data_URI_scheme
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
828 createDicomRequestContent["Content"] = ("data:" +
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
829 std::string(usePam ? Orthanc::MIME_PAM : Orthanc::MIME_PNG) +
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
830 ";base64," + base64);
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
831
541
Alain Mazy <alain@mazy.be>
parents: 507
diff changeset
832 VLOG(1) << "Exporting RadiographyScene: create-dicom request is ready";
484
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
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
835
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
836 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc,
484
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
837 const Json::Value& dicomTags,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
838 const std::string& parentOrthancId,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
839 double pixelSpacingX,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
840 double pixelSpacingY,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
841 bool invert,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
842 ImageInterpolation interpolation,
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
843 bool usePam)
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
844 {
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
845 Json::Value createDicomRequestContent;
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
846
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
847 ExportToCreateDicomRequest(createDicomRequestContent, dicomTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam);
7bf001b9d244 re-added ExportToCreateDicomRequest
Alain Mazy <alain@mazy.be>
parents: 483
diff changeset
848
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
849 orthanc.PostJsonAsyncExpectJson(
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
850 "/tools/create-dicom", createDicomRequestContent,
1222
21c2b0eee53c deprecating MessageHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1204
diff changeset
851 new Deprecated::DeprecatedCallable<RadiographyScene, Deprecated::OrthancApiClient::JsonResponseReadyMessage>
1066
b537002f83a9 removing broker from deprecated classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 928
diff changeset
852 (GetSharedObserver(), &RadiographyScene::OnDicomExported),
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 475
diff changeset
853 NULL, NULL);
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
854
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
855 }
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
856
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
857
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
858 // Export using PAM is faster than using PNG, but requires Orthanc
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
859 // core >= 1.4.3
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
860 void RadiographyScene::ExportDicom(Deprecated::OrthancApiClient& orthanc,
483
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
861 const Orthanc::DicomMap& dicom,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
862 const std::string& parentOrthancId,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
863 double pixelSpacingX,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
864 double pixelSpacingY,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
865 bool invert,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
866 ImageInterpolation interpolation,
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
867 bool usePam)
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
868 {
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
869 std::set<Orthanc::DicomTag> tags;
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
870 dicom.GetTags(tags);
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
871
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
872 Json::Value jsonTags = Json::objectValue;
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
873
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
874 for (std::set<Orthanc::DicomTag>::const_iterator
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
875 tag = tags.begin(); tag != tags.end(); ++tag)
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
876 {
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
877 const Orthanc::DicomValue& value = dicom.GetValue(*tag);
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
878 if (!value.IsNull() &&
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
879 !value.IsBinary())
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
880 {
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
881 jsonTags[tag->Format()] = value.GetContent();
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
882 }
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
883 }
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
884
29fc066b6f65 Export now accepts Json::Value
am@osimis.io
parents: 481
diff changeset
885 ExportDicom(orthanc, jsonTags, parentOrthancId, pixelSpacingX, pixelSpacingY, invert, interpolation, usePam);
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
886 }
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
887
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
888 void RadiographyScene::OnDicomExported(const Deprecated::OrthancApiClient::JsonResponseReadyMessage& message)
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
889 {
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
890 LOG(INFO) << "DICOM export was successful: "
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
891 << message.GetJson().toStyledString();
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
892 }
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
893
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
894
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
895 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
896 {
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
897 LOG(INFO) << "DICOMweb WADO-RS received: " << message.GetAnswerSize() << " bytes";
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
898
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
899 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
900 for (Deprecated::IWebService::HttpHeaders::const_iterator
426
660fe6f6bf4a split Export in 2
am@osimis.io
parents: 425
diff changeset
901 it = h.begin(); it != h.end(); ++it)
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
902 {
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
903 printf("[%s] = [%s]\n", it->first.c_str(), it->second.c_str());
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
904 }
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
905 }
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
906
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
907 }