Mercurial > hg > orthanc-wsi
annotate Framework/Inputs/DicomPyramidInstance.cpp @ 334:f011fc199b6a default tip
back to mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 18 Oct 2024 15:44:18 +0200 |
parents | c42083d50ddf |
children |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
312
0683312e21ba
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
0683312e21ba
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
309
7020852a8fa9
updated year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
0 | 8 * |
9 * This program is free software: you can redistribute it and/or | |
10 * modify it under the terms of the GNU Affero General Public License | |
11 * as published by the Free Software Foundation, either version 3 of | |
12 * the License, or (at your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, but | |
15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * Affero General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU Affero General Public License | |
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
21 **/ | |
22 | |
23 | |
16
7a88c614be04
preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
24 #include "../PrecompiledHeadersWSI.h" |
0 | 25 #include "DicomPyramidInstance.h" |
26 | |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
27 #include "../ColorSpaces.h" |
194 | 28 #include "../DicomToolbox.h" |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
29 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
30 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" |
194 | 31 |
192 | 32 #include <Logging.h> |
33 #include <OrthancException.h> | |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
34 #include <SerializationToolbox.h> |
192 | 35 #include <Toolbox.h> |
36 | |
0 | 37 #include <cassert> |
38 | |
226 | 39 #if !ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) |
40 # include <json/writer.h> | |
41 #endif | |
42 | |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
43 #define SERIALIZED_METADATA "4201" // Was "4200" if versions <= 0.7 of this plugin |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
44 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
45 |
0 | 46 namespace OrthancWSI |
47 { | |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
48 static const Orthanc::DicomTag DICOM_TAG_COLUMN_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX(0x0048, 0x021e); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
49 static const Orthanc::DicomTag DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE(0x5200, 0x9230); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
50 static const Orthanc::DicomTag DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE(0x0048, 0x021a); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
51 static const Orthanc::DicomTag DICOM_TAG_ROW_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX(0x0048, 0x021f); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
52 static const Orthanc::DicomTag DICOM_TAG_TOTAL_PIXEL_MATRIX_COLUMNS(0x0048, 0x0006); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
53 static const Orthanc::DicomTag DICOM_TAG_TOTAL_PIXEL_MATRIX_ROWS(0x0048, 0x0007); |
219
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
54 static const Orthanc::DicomTag DICOM_TAG_IMAGE_TYPE(0x0008, 0x0008); |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
55 static const Orthanc::DicomTag DICOM_TAG_RECOMMENDED_ABSENT_PIXEL_CIELAB(0x0048, 0x0015); |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
56 |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
57 static ImageCompression DetectImageCompression(OrthancStone::IOrthancConnection& orthanc, |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
58 const std::string& instanceId) |
0 | 59 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
60 using namespace OrthancStone; |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
61 |
87 | 62 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/header"); |
63 DicomDatasetReader header(dataset); | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
64 |
0 | 65 std::string s = Orthanc::Toolbox::StripSpaces |
239 | 66 (header.GetMandatoryStringValue(Orthanc::DicomPath(Orthanc::DICOM_TAG_TRANSFER_SYNTAX_UID))); |
0 | 67 |
68 if (s == "1.2.840.10008.1.2" || | |
69 s == "1.2.840.10008.1.2.1") | |
70 { | |
71 return ImageCompression_None; | |
72 } | |
73 else if (s == "1.2.840.10008.1.2.4.50") | |
74 { | |
75 return ImageCompression_Jpeg; | |
76 } | |
77 else if (s == "1.2.840.10008.1.2.4.90" || | |
78 s == "1.2.840.10008.1.2.4.91") | |
79 { | |
80 return ImageCompression_Jpeg2000; | |
81 } | |
82 else | |
83 { | |
84 LOG(ERROR) << "Unsupported transfer syntax: " << s; | |
85 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
86 } | |
87 } | |
88 | |
89 | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
90 static void DetectPixelFormat(Orthanc::PixelFormat& format, |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
91 Orthanc::PhotometricInterpretation& photometric, |
216 | 92 const OrthancStone::DicomDatasetReader& reader) |
0 | 93 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
94 using namespace OrthancStone; |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
95 |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
96 std::string p = Orthanc::Toolbox::StripSpaces |
239 | 97 (reader.GetMandatoryStringValue(Orthanc::DicomPath(Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION))); |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
98 |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
99 photometric = Orthanc::StringToPhotometricInterpretation(p.c_str()); |
0 | 100 |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
101 if (photometric == Orthanc::PhotometricInterpretation_Palette) |
0 | 102 { |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
103 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
104 "Unsupported photometric interpretation: " + p); |
0 | 105 } |
106 | |
89 | 107 unsigned int bitsStored, samplesPerPixel, tmp; |
108 | |
239 | 109 if (!reader.GetUnsignedIntegerValue(bitsStored, Orthanc::DicomPath(Orthanc::DICOM_TAG_BITS_STORED)) || |
110 !reader.GetUnsignedIntegerValue(samplesPerPixel, Orthanc::DicomPath(Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL)) || | |
111 !reader.GetUnsignedIntegerValue(tmp, Orthanc::DicomPath(Orthanc::DICOM_TAG_PIXEL_REPRESENTATION))) | |
89 | 112 { |
113 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentTag); | |
114 } | |
115 | |
116 bool isSigned = (tmp != 0); | |
0 | 117 |
118 if (bitsStored == 8 && | |
119 samplesPerPixel == 1 && | |
120 !isSigned) | |
121 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
122 format = Orthanc::PixelFormat_Grayscale8; |
0 | 123 } |
124 else if (bitsStored == 8 && | |
125 samplesPerPixel == 3 && | |
126 !isSigned) | |
127 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
128 format = Orthanc::PixelFormat_RGB24; |
0 | 129 } |
130 else | |
131 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
132 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Unsupported pixel format"); |
0 | 133 } |
134 } | |
135 | |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
136 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
137 ImageCompression DicomPyramidInstance::GetImageCompression(OrthancStone::IOrthancConnection& orthanc) |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
138 { |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
139 /** |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
140 * Lazy detection of the image compression using the transfer |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
141 * syntax stored inside the DICOM header. Given the fact that |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
142 * reading the header is a time-consuming operation (it implies |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
143 * the decoding of the DICOM image by Orthanc, whereas the "/tags" |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
144 * endpoint only reads the "DICOM-as-JSON" attachment), the |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
145 * "/header" REST call is delayed until it is really required. |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
146 **/ |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
147 |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
148 if (!hasCompression_) |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
149 { |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
150 compression_ = DetectImageCompression(orthanc, instanceId_); |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
151 hasCompression_ = true; |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
152 } |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
153 |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
154 return compression_; |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
155 } |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
156 |
0 | 157 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
158 void DicomPyramidInstance::Load(OrthancStone::IOrthancConnection& orthanc, |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
159 const std::string& instanceId) |
0 | 160 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
161 using namespace OrthancStone; |
0 | 162 |
87 | 163 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/tags"); |
164 DicomDatasetReader reader(dataset); | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
165 |
265 | 166 if (reader.GetMandatoryStringValue(Orthanc::DicomPath(Orthanc::DICOM_TAG_SOP_CLASS_UID)) != VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE_IOD || |
239 | 167 reader.GetMandatoryStringValue(Orthanc::DicomPath(Orthanc::DICOM_TAG_MODALITY)) != "SM") |
0 | 168 { |
169 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
170 } | |
171 | |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
172 hasCompression_ = false; |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
173 DetectPixelFormat(format_, photometric_, reader); |
89 | 174 |
175 unsigned int tmp; | |
239 | 176 if (!reader.GetUnsignedIntegerValue(tileWidth_, Orthanc::DicomPath(Orthanc::DICOM_TAG_COLUMNS)) || |
177 !reader.GetUnsignedIntegerValue(tileHeight_, Orthanc::DicomPath(Orthanc::DICOM_TAG_ROWS)) || | |
178 !reader.GetUnsignedIntegerValue(totalWidth_, Orthanc::DicomPath(DICOM_TAG_TOTAL_PIXEL_MATRIX_COLUMNS)) || | |
179 !reader.GetUnsignedIntegerValue(totalHeight_, Orthanc::DicomPath(DICOM_TAG_TOTAL_PIXEL_MATRIX_ROWS)) || | |
180 !reader.GetUnsignedIntegerValue(tmp, Orthanc::DicomPath(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))) | |
89 | 181 { |
182 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
183 } | |
0 | 184 |
239 | 185 imageType_ = reader.GetStringValue(Orthanc::DicomPath(DICOM_TAG_IMAGE_TYPE), ""); |
219
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
186 |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
187 size_t countFrames; |
239 | 188 if (reader.GetDataset().GetSequenceSize(countFrames, Orthanc::DicomPath(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE))) |
0 | 189 { |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
190 if (countFrames != tmp) |
89 | 191 { |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
192 LOG(ERROR) << "Mismatch between the number of frames in instance: " << instanceId; |
0 | 193 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
194 } | |
195 | |
268
a6e4834ac141
added some tolerance in the PerFrameFunctionalGroupsSequence tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
254
diff
changeset
|
196 frames_.reserve(countFrames); |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
197 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
198 for (size_t i = 0; i < countFrames; i++) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
199 { |
239 | 200 Orthanc::DicomPath pathX(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i, |
201 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0, | |
202 DICOM_TAG_COLUMN_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX); | |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
203 |
239 | 204 Orthanc::DicomPath pathY(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i, |
205 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0, | |
206 DICOM_TAG_ROW_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX); | |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
207 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
208 int xx, yy; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
209 if (!reader.GetIntegerValue(xx, pathX) || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
210 !reader.GetIntegerValue(yy, pathY)) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
211 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
212 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentTag); |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
213 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
214 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
215 // "-1", because coordinates are shifted by 1 in DICOM |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
216 xx -= 1; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
217 yy -= 1; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
218 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
219 unsigned int x = static_cast<unsigned int>(xx); |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
220 unsigned int y = static_cast<unsigned int>(yy); |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
221 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
222 if (xx < 0 || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
223 yy < 0 || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
224 x % tileWidth_ != 0 || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
225 y % tileHeight_ != 0 || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
226 x >= totalWidth_ || |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
227 y >= totalHeight_) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
228 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
229 LOG(ERROR) << "Frame " << i << " with unexpected tile location (" |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
230 << x << "," << y << ") in instance: " << instanceId; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
231 } |
268
a6e4834ac141
added some tolerance in the PerFrameFunctionalGroupsSequence tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
254
diff
changeset
|
232 else |
a6e4834ac141
added some tolerance in the PerFrameFunctionalGroupsSequence tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
254
diff
changeset
|
233 { |
a6e4834ac141
added some tolerance in the PerFrameFunctionalGroupsSequence tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
254
diff
changeset
|
234 frames_.push_back(std::make_pair(x / tileWidth_, y / tileHeight_)); |
a6e4834ac141
added some tolerance in the PerFrameFunctionalGroupsSequence tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
254
diff
changeset
|
235 } |
215
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
236 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
237 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
238 else |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
239 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
240 // No "Per frame functional groups sequence" tag. Assume regular grid. |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
241 frames_.resize(tmp); |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
242 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
243 // Compute "ceiling(totalWidth_ / tileWidth_) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
244 unsigned int w = totalWidth_ / tileWidth_; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
245 if (totalWidth_ % tileWidth_ != 0) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
246 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
247 w += 1; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
248 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
249 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
250 unsigned int h = totalHeight_ / tileHeight_; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
251 if (totalHeight_ % tileHeight_ != 0) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
252 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
253 h += 1; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
254 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
255 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
256 if (w * h != tmp) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
257 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
258 LOG(ERROR) << "Mismatch between the number of frames in instance: " << instanceId; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
259 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
260 } |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
261 |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
262 for (size_t i = 0; i < frames_.size(); i++) |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
263 { |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
264 frames_[i].first = i % w; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
265 frames_[i].second = i / w; |
02cb86d07966
Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
266 } |
0 | 267 } |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
268 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
269 // New in WSI 2.1 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
270 std::string background; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
271 if (dataset.GetStringValue(background, Orthanc::DicomPath(DICOM_TAG_RECOMMENDED_ABSENT_PIXEL_CIELAB))) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
272 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
273 LABColor lab; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
274 if (LABColor::DecodeDicomRecommendedAbsentPixelCIELab(lab, background)) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
275 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
276 XYZColor xyz(lab); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
277 sRGBColor srgb(xyz); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
278 RGBColor rgb(srgb); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
279 hasBackgroundColor_ = true; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
280 backgroundRed_ = rgb.GetR(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
281 backgroundGreen_ = rgb.GetG(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
282 backgroundBlue_ = rgb.GetB(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
283 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
284 } |
0 | 285 } |
286 | |
287 | |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
288 DicomPyramidInstance::DicomPyramidInstance(OrthancStone::IOrthancConnection& orthanc, |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
289 const std::string& instanceId, |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
290 bool useCache) : |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
291 instanceId_(instanceId), |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
292 hasCompression_(false), |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
293 compression_(ImageCompression_None), // Dummy initialization for serialization |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
294 hasBackgroundColor_(false), |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
295 backgroundRed_(0), |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
296 backgroundGreen_(0), |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
297 backgroundBlue_(0) |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
298 { |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
299 if (useCache) |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
300 { |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
301 try |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
302 { |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
303 // Try and deserialized the cached information about this instance |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
304 std::string serialized; |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
305 orthanc.RestApiGet(serialized, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA); |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
306 Deserialize(serialized); |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
307 return; // Success |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
308 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
309 catch (Orthanc::OrthancException&) |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
310 { |
70 | 311 // No cached information yet |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
312 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
313 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
314 |
70 | 315 // Compute information about this instance from scratch |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
316 Load(orthanc, instanceId); |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
317 |
70 | 318 if (useCache) |
319 { | |
320 // Serialize the computed information and cache it as a metadata | |
321 std::string serialized, tmp; | |
322 Serialize(serialized); | |
323 orthanc.RestApiPut(tmp, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA, serialized); | |
324 } | |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
325 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
326 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
327 |
0 | 328 unsigned int DicomPyramidInstance::GetFrameLocationX(size_t frame) const |
329 { | |
330 assert(frame < frames_.size()); | |
331 return frames_[frame].first; | |
332 } | |
333 | |
334 | |
335 unsigned int DicomPyramidInstance::GetFrameLocationY(size_t frame) const | |
336 { | |
337 assert(frame < frames_.size()); | |
338 return frames_[frame].second; | |
339 } | |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
340 |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
341 |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
342 |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
343 static const char* const HAS_COMPRESSION = "HasCompression"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
344 static const char* const IMAGE_COMPRESSION = "ImageCompression"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
345 static const char* const PIXEL_FORMAT = "PixelFormat"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
346 static const char* const FRAMES = "Frames"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
347 static const char* const TILE_WIDTH = "TileWidth"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
348 static const char* const TILE_HEIGHT = "TileHeight"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
349 static const char* const TOTAL_WIDTH = "TotalWidth"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
350 static const char* const TOTAL_HEIGHT = "TotalHeight"; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
351 static const char* const PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation"; |
219
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
352 static const char* const IMAGE_TYPE = "ImageType"; |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
353 static const char* const BACKGROUND_COLOR = "BackgroundColor"; |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
354 |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
355 |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
356 void DicomPyramidInstance::Serialize(std::string& result) const |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
357 { |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
358 Json::Value frames = Json::arrayValue; |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
359 for (size_t i = 0; i < frames_.size(); i++) |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
360 { |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
361 Json::Value frame = Json::arrayValue; |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
362 frame.append(frames_[i].first); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
363 frame.append(frames_[i].second); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
364 frames.append(frame); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
365 } |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
366 |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
367 Json::Value content = Json::objectValue; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
368 content[FRAMES] = frames; |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
369 |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
370 // "instanceId_" is set by the constructor |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
371 |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
372 content[HAS_COMPRESSION] = hasCompression_; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
373 content[IMAGE_COMPRESSION] = static_cast<int>(compression_); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
374 content[PIXEL_FORMAT] = static_cast<int>(format_); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
375 content[TILE_WIDTH] = tileWidth_; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
376 content[TILE_HEIGHT] = tileHeight_; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
377 content[TOTAL_WIDTH] = totalWidth_; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
378 content[TOTAL_HEIGHT] = totalHeight_; |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
379 content[PHOTOMETRIC_INTERPRETATION] = Orthanc::EnumerationToString(photometric_); |
219
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
380 content[IMAGE_TYPE] = imageType_; |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
381 |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
382 if (hasBackgroundColor_) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
383 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
384 Json::Value color = Json::arrayValue; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
385 color.append(backgroundRed_); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
386 color.append(backgroundGreen_); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
387 color.append(backgroundBlue_); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
388 content[BACKGROUND_COLOR] = color; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
389 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
390 |
226 | 391 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) |
392 Orthanc::Toolbox::WriteFastJson(result, content); | |
393 #else | |
394 Json::FastWriter writer; | |
395 result = writer.write(content); | |
396 #endif | |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
397 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
398 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
399 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
400 void DicomPyramidInstance::Deserialize(const std::string& s) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
401 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
402 Json::Value content; |
226 | 403 OrthancStone::IOrthancConnection::ParseJson(content, s); |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
404 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
405 if (content.type() != Json::objectValue || |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
406 !content.isMember(FRAMES) || |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
407 content[FRAMES].type() != Json::arrayValue) |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
408 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
409 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
410 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
411 |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
412 hasCompression_ = Orthanc::SerializationToolbox::ReadBoolean(content, HAS_COMPRESSION); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
413 compression_ = static_cast<ImageCompression>(Orthanc::SerializationToolbox::ReadInteger(content, IMAGE_COMPRESSION)); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
414 format_ = static_cast<Orthanc::PixelFormat>(Orthanc::SerializationToolbox::ReadInteger(content, PIXEL_FORMAT)); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
415 tileWidth_ = Orthanc::SerializationToolbox::ReadUnsignedInteger(content, TILE_WIDTH); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
416 tileHeight_ = Orthanc::SerializationToolbox::ReadUnsignedInteger(content, TILE_HEIGHT); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
417 totalWidth_ = Orthanc::SerializationToolbox::ReadUnsignedInteger(content, TOTAL_WIDTH); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
418 totalHeight_ = Orthanc::SerializationToolbox::ReadUnsignedInteger(content, TOTAL_HEIGHT); |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
419 |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
420 std::string p = Orthanc::SerializationToolbox::ReadString(content, PHOTOMETRIC_INTERPRETATION); |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
421 photometric_ = Orthanc::StringToPhotometricInterpretation(p.c_str()); |
219
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
422 |
ef3f8c5126a4
Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
423 imageType_ = Orthanc::SerializationToolbox::ReadString(content, IMAGE_TYPE); |
217
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
424 |
20bc074ec19a
Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
425 const Json::Value f = content[FRAMES]; |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
426 frames_.resize(f.size()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
427 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
428 for (Json::Value::ArrayIndex i = 0; i < f.size(); i++) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
429 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
430 if (f[i].type() != Json::arrayValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
431 f[i].size() != 2 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
432 f[i][0].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
433 f[i][1].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
434 f[i][0].asInt() < 0 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
435 f[i][1].asInt() < 0) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
436 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
437 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
438 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
439 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
440 frames_[i].first = f[i][0].asInt(); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
441 frames_[i].second = f[i][1].asInt(); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
442 } |
330
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
443 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
444 hasBackgroundColor_ = false; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
445 if (content.isMember(BACKGROUND_COLOR)) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
446 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
447 const Json::Value& color = content[BACKGROUND_COLOR]; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
448 if (color.type() == Json::arrayValue && |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
449 color.size() == 3u && |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
450 color[0].isUInt() && |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
451 color[1].isUInt() && |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
452 color[2].isUInt()) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
453 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
454 hasBackgroundColor_ = true; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
455 backgroundRed_ = color[0].asUInt(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
456 backgroundGreen_ = color[1].asUInt(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
457 backgroundBlue_ = color[2].asUInt(); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
458 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
459 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
460 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
461 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
462 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
463 uint8_t DicomPyramidInstance::GetBackgroundRed() const |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
464 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
465 if (hasBackgroundColor_) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
466 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
467 return backgroundRed_; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
468 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
469 else |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
470 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
471 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
472 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
473 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
474 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
475 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
476 uint8_t DicomPyramidInstance::GetBackgroundGreen() const |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
477 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
478 if (hasBackgroundColor_) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
479 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
480 return backgroundGreen_; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
481 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
482 else |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
483 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
484 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
485 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
486 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
487 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
488 |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
489 uint8_t DicomPyramidInstance::GetBackgroundBlue() const |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
490 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
491 if (hasBackgroundColor_) |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
492 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
493 return backgroundBlue_; |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
494 } |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
495 else |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
496 { |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
497 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
498 } |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
499 } |
0 | 500 } |