Mercurial > hg > orthanc-stone

annotate Framework/Radiography/RadiographySceneReader.cpp @ 1190:f417a0ae282b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wip: TextLayer with new fonts
author Alain Mazy <alain@mazy.be>
date Tue, 26 Nov 2019 15:27:48 +0100
parents 9889c819db01
children bdc6837d5917 9ee6b28f53e8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
1 /**
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
2 * Stone of Orthanc
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
6 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
10 * the License, or (at your option) any later version.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
11 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
15 * Affero General Public License for more details.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
16 *
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
19 **/
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
20
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
21
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
22 #include "RadiographySceneReader.h"
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
23
732
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 714
diff changeset
24 #include "../Deprecated/Toolbox/DicomFrameConverter.h"
650
200f7e1d57d1 Moved RadiographyDicomLayer::SetDicomFrameConverter to cpp file to prevent
Benjamin Golinvaux <bgo@osimis.io>
parents: 553
diff changeset
25
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
26 #include <Core/Images/FontRegistry.h>
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
27 #include <Core/Images/PngReader.h>
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
28 #include <Core/OrthancException.h>
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
29 #include <Core/Toolbox.h>
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
30
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
31 namespace OrthancStone
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
32 {
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
33
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
34 void RadiographySceneBuilder::Read(const Json::Value& input, Orthanc::ImageAccessor* dicomImage /* takes ownership */,
714
d2c0e347ddc2 deprecating DicomFrameConverter
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 658
diff changeset
35 Deprecated::DicomFrameConverter* dicomFrameConverter /* takes ownership */,
739
be9c1530d40a deprecating enum SliceImageQuality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
36 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
37 )
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
38 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
39 dicomImage_.reset(dicomImage);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
40 dicomFrameConverter_.reset(dicomFrameConverter);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
41 preferredPhotometricDisplayMode_ = preferredPhotometricDisplayMode;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
42 Read(input);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
43 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
44
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
45 RadiographyDicomLayer* RadiographySceneBuilder::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
46 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
47 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomImage(dicomImage_.release(), instanceId, frame, dicomFrameConverter_.release(), preferredPhotometricDisplayMode_, geometry)));
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
48 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
49
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
50
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
51 RadiographyDicomLayer* RadiographySceneReader::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
52 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
53 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, instanceId, frame, false, geometry)));
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
54 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
55
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
56 void RadiographySceneBuilder::Read(const Json::Value& input)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
57 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
58 unsigned int version = input["version"].asUInt();
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
59
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
60 if (version != 1)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
61 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
62
772
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
63 if (input.isMember("hasWindowing") && input["hasWindowing"].asBool())
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
64 {
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
65 scene_.SetWindowing(input["windowCenter"].asFloat(), input["windowWidth"].asFloat());
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
66 }
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
67
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
68 RadiographyDicomLayer* dicomLayer = NULL;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
69 for(size_t layerIndex = 0; layerIndex < input["layers"].size(); layerIndex++)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
70 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
71 const Json::Value& jsonLayer = input["layers"][(int)layerIndex];
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
72 RadiographyLayer::Geometry geometry;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
73
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
74 if (jsonLayer["type"].asString() == "dicom")
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
75 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
76 ReadLayerGeometry(geometry, jsonLayer);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
77 dicomLayer = LoadDicom(jsonLayer["instanceId"].asString(), jsonLayer["frame"].asUInt(), &geometry);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
78 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
79 else if (jsonLayer["type"].asString() == "mask")
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
80 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
81 if (dicomLayer == NULL)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
82 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
83 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // we always assumed the dicom layer was read before the mask
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
84 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
85 ReadLayerGeometry(geometry, jsonLayer);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
86
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
87 float foreground = jsonLayer["foreground"].asFloat();
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
88 std::vector<Orthanc::ImageProcessing::ImagePoint> corners;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
89 for (size_t i = 0; i < jsonLayer["corners"].size(); i++)
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
90 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
91 Orthanc::ImageProcessing::ImagePoint corner(jsonLayer["corners"][(int)i]["x"].asInt(),
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
92 jsonLayer["corners"][(int)i]["y"].asInt());
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
93 corners.push_back(corner);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
94 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
95
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
96 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
97 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
98 else if (jsonLayer["type"].asString() == "text")
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
99 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
100 ReadLayerGeometry(geometry, jsonLayer);
1190
f417a0ae282b wip: TextLayer with new fonts
Alain Mazy <alain@mazy.be>
parents: 1024
diff changeset
101 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry);
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
102 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
103 else if (jsonLayer["type"].asString() == "alpha")
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
104 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
105 ReadLayerGeometry(geometry, jsonLayer);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
106
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
107 const std::string& pngContentBase64 = jsonLayer["content"].asString();
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
108 std::string pngContent;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
109 std::string mimeType;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
110 Orthanc::Toolbox::DecodeDataUriScheme(mimeType, pngContent, pngContentBase64);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
111
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
112 std::auto_ptr<Orthanc::ImageAccessor> image;
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
113 if (mimeType == "image/png")
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
114 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
115 image.reset(new Orthanc::PngReader());
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
116 dynamic_cast<Orthanc::PngReader*>(image.get())->ReadFromMemory(pngContent);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
117 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
118 else
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
119 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
120
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
121 RadiographyAlphaLayer& layer = dynamic_cast<RadiographyAlphaLayer&>(scene_.LoadAlphaBitmap(image.release(), &geometry));
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
122
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
123 if (!jsonLayer["isUsingWindowing"].asBool())
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
124 {
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
125 layer.SetForegroundValue((float)(jsonLayer["foreground"].asDouble()));
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
126 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
127 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
128 else
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
129 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
130 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
131 }
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
132
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
133 void RadiographySceneReader::Read(const Json::Value& input)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
134 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
135 unsigned int version = input["version"].asUInt();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
136
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
137 if (version != 1)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
138 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
139
772
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
140 if (input.isMember("hasWindowing") && input["hasWindowing"].asBool())
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
141 {
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
142 scene_.SetWindowing(input["windowCenter"].asFloat(), input["windowWidth"].asFloat());
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
143 }
cfb4d39065a4 fix windowing + save windowing
Alain Mazy <alain@mazy.be>
parents: 714
diff changeset
144
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
145 RadiographyDicomLayer* dicomLayer = NULL;
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
146 for(size_t layerIndex = 0; layerIndex < input["layers"].size(); layerIndex++)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
147 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
148 const Json::Value& jsonLayer = input["layers"][(int)layerIndex];
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
149 RadiographyLayer::Geometry geometry;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
150
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
151 if (jsonLayer["type"].asString() == "dicom")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
152 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
153 ReadLayerGeometry(geometry, jsonLayer);
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
154 dicomLayer = dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, jsonLayer["instanceId"].asString(), jsonLayer["frame"].asUInt(), false, &geometry)));
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
155 }
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
156 else if (jsonLayer["type"].asString() == "mask")
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
157 {
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
158 if (dicomLayer == NULL)
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
159 {
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
160 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // we always assumed the dicom layer was read before the mask
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
161 }
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
162 ReadLayerGeometry(geometry, jsonLayer);
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
163
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
164 float foreground = jsonLayer["foreground"].asFloat();
488
aede9b042cb7 now using ImageProcessing::FillPolygon
am@osimis.io
parents: 481
diff changeset
165 std::vector<Orthanc::ImageProcessing::ImagePoint> corners;
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
166 for (size_t i = 0; i < jsonLayer["corners"].size(); i++)
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
167 {
488
aede9b042cb7 now using ImageProcessing::FillPolygon
am@osimis.io
parents: 481
diff changeset
168 Orthanc::ImageProcessing::ImagePoint corner(jsonLayer["corners"][(int)i]["x"].asInt(),
aede9b042cb7 now using ImageProcessing::FillPolygon
am@osimis.io
parents: 481
diff changeset
169 jsonLayer["corners"][(int)i]["y"].asInt());
481
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
170 corners.push_back(corner);
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
171 }
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
172
159a465e27bd reworked RadiographyScene export to export to an Orthanc::Image too
am@osimis.io
parents: 437
diff changeset
173 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry);
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
174 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
175 else if (jsonLayer["type"].asString() == "text")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
176 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
177 ReadLayerGeometry(geometry, jsonLayer);
1190
f417a0ae282b wip: TextLayer with new fonts
Alain Mazy <alain@mazy.be>
parents: 1024
diff changeset
178 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry);
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
179 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
180 else if (jsonLayer["type"].asString() == "alpha")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
181 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
182 ReadLayerGeometry(geometry, jsonLayer);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
183
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
184 const std::string& pngContentBase64 = jsonLayer["content"].asString();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
185 std::string pngContent;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
186 std::string mimeType;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
187 Orthanc::Toolbox::DecodeDataUriScheme(mimeType, pngContent, pngContentBase64);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
188
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
189 std::auto_ptr<Orthanc::ImageAccessor> image;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
190 if (mimeType == "image/png")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
191 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
192 image.reset(new Orthanc::PngReader());
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
193 dynamic_cast<Orthanc::PngReader*>(image.get())->ReadFromMemory(pngContent);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
194 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
195 else
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
196 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
197
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
198 RadiographyAlphaLayer& layer = dynamic_cast<RadiographyAlphaLayer&>(scene_.LoadAlphaBitmap(image.release(), &geometry));
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
199
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
200 if (!jsonLayer["isUsingWindowing"].asBool())
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
201 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
202 layer.SetForegroundValue((float)(jsonLayer["foreground"].asDouble()));
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
203 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
204 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
205 else
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
206 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
207 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
208 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
209
1022
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
210 void RadiographySceneBuilder::ReadDicomLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& input)
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
211 {
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
212 for(size_t layerIndex = 0; layerIndex < input["layers"].size(); layerIndex++)
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
213 {
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
214 const Json::Value& jsonLayer = input["layers"][(int)layerIndex];
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
215 if (jsonLayer["type"].asString() == "dicom")
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
216 {
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
217 ReadLayerGeometry(geometry, jsonLayer);
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
218 return;
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
219 }
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
220 }
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
221 }
1e80a925323a ReadDicomLayerGeometry
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
222
553
92305ee35b1c web-worker consequences: give access to lower level data
Alain Mazy <alain@mazy.be>
parents: 488
diff changeset
223 void RadiographySceneBuilder::ReadLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& jsonLayer)
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
224 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
225 {// crop
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
226 unsigned int x, y, width, height;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
227 if (jsonLayer["crop"]["hasCrop"].asBool())
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
228 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
229 x = jsonLayer["crop"]["x"].asUInt();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
230 y = jsonLayer["crop"]["y"].asUInt();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
231 width = jsonLayer["crop"]["width"].asUInt();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
232 height = jsonLayer["crop"]["height"].asUInt();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
233 geometry.SetCrop(x, y, width, height);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
234 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
235 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
236
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
237 geometry.SetAngle(jsonLayer["angle"].asDouble());
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
238 geometry.SetResizeable(jsonLayer["isResizable"].asBool());
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
239 geometry.SetPan(jsonLayer["pan"]["x"].asDouble(), jsonLayer["pan"]["y"].asDouble());
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
240 geometry.SetPixelSpacing(jsonLayer["pixelSpacing"]["x"].asDouble(), jsonLayer["pixelSpacing"]["y"].asDouble());
620
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
241
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
242 // these fields were introduced later -> they might not exist
629
Alain Mazy <alain@mazy.be>
parents: 620
diff changeset
243 if (jsonLayer.isMember("flipVertical"))
620
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
244 {
629
Alain Mazy <alain@mazy.be>
parents: 620
diff changeset
245 geometry.SetFlipVertical(jsonLayer["flipVertical"].asBool());
620
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
246 }
629
Alain Mazy <alain@mazy.be>
parents: 620
diff changeset
247 if (jsonLayer.isMember("flipHorizontal"))
620
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
248 {
629
Alain Mazy <alain@mazy.be>
parents: 620
diff changeset
249 geometry.SetFlipHorizontal(jsonLayer["flipHorizontal"].asBool());
620
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
250 }
fd9b9d993fc7 added flip to RadiographyLayer
Alain Mazy <alain@mazy.be>
parents: 553
diff changeset
251
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
252 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents:
diff changeset
253 }