Mercurial > hg > orthanc-wsi
annotate Framework/Inputs/DicomPyramidInstance.cpp @ 214:1e864138f0da
upgrade to year 2021
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 06 Jan 2021 18:10:07 +0100 |
parents | 2a4e1f7de5ab |
children | 02cb86d07966 |
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 | |
214
1e864138f0da
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
213
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
16
7a88c614be04
preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
22 #include "../PrecompiledHeadersWSI.h" |
0 | 23 #include "DicomPyramidInstance.h" |
24 | |
194 | 25 #include "../DicomToolbox.h" |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
26 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
27 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" |
194 | 28 |
192 | 29 #include <Logging.h> |
30 #include <OrthancException.h> | |
31 #include <Toolbox.h> | |
32 | |
0 | 33 #include <cassert> |
34 | |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
35 #define SERIALIZED_METADATA "4200" |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
36 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
37 |
0 | 38 namespace OrthancWSI |
39 { | |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
40 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
|
41 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
|
42 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
|
43 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
|
44 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
|
45 static const Orthanc::DicomTag DICOM_TAG_TOTAL_PIXEL_MATRIX_ROWS(0x0048, 0x0007); |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
46 |
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
47 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
|
48 const std::string& instanceId) |
0 | 49 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
50 using namespace OrthancStone; |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
51 |
87 | 52 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/header"); |
53 DicomDatasetReader header(dataset); | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
54 |
0 | 55 std::string s = Orthanc::Toolbox::StripSpaces |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
56 (header.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_TRANSFER_SYNTAX_UID))); |
0 | 57 |
58 if (s == "1.2.840.10008.1.2" || | |
59 s == "1.2.840.10008.1.2.1") | |
60 { | |
61 return ImageCompression_None; | |
62 } | |
63 else if (s == "1.2.840.10008.1.2.4.50") | |
64 { | |
65 return ImageCompression_Jpeg; | |
66 } | |
67 else if (s == "1.2.840.10008.1.2.4.90" || | |
68 s == "1.2.840.10008.1.2.4.91") | |
69 { | |
70 return ImageCompression_Jpeg2000; | |
71 } | |
72 else | |
73 { | |
74 LOG(ERROR) << "Unsupported transfer syntax: " << s; | |
75 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
76 } | |
77 } | |
78 | |
79 | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
80 static void DetectPixelFormat(Orthanc::PixelFormat& format, |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
81 Orthanc::PhotometricInterpretation& photometric, |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
82 OrthancStone::DicomDatasetReader& reader) |
0 | 83 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
84 using namespace OrthancStone; |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
85 |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
86 std::string p = Orthanc::Toolbox::StripSpaces |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
87 (reader.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION))); |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
88 |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
89 photometric = Orthanc::StringToPhotometricInterpretation(p.c_str()); |
0 | 90 |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
91 if (photometric == Orthanc::PhotometricInterpretation_Palette) |
0 | 92 { |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
93 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
94 "Unsupported photometric interpretation: " + p); |
0 | 95 } |
96 | |
89 | 97 unsigned int bitsStored, samplesPerPixel, tmp; |
98 | |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
99 if (!reader.GetUnsignedIntegerValue(bitsStored, OrthancStone::DicomPath(Orthanc::DICOM_TAG_BITS_STORED)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
100 !reader.GetUnsignedIntegerValue(samplesPerPixel, OrthancStone::DicomPath(Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
101 !reader.GetUnsignedIntegerValue(tmp, OrthancStone::DicomPath(Orthanc::DICOM_TAG_PIXEL_REPRESENTATION))) |
89 | 102 { |
103 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentTag); | |
104 } | |
105 | |
106 bool isSigned = (tmp != 0); | |
0 | 107 |
108 if (bitsStored == 8 && | |
109 samplesPerPixel == 1 && | |
110 !isSigned) | |
111 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
112 format = Orthanc::PixelFormat_Grayscale8; |
0 | 113 } |
114 else if (bitsStored == 8 && | |
115 samplesPerPixel == 3 && | |
116 !isSigned) | |
117 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
118 format = Orthanc::PixelFormat_RGB24; |
0 | 119 } |
120 else | |
121 { | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
122 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Unsupported pixel format"); |
0 | 123 } |
124 } | |
125 | |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
126 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
127 ImageCompression DicomPyramidInstance::GetImageCompression(OrthancStone::IOrthancConnection& orthanc) |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
128 { |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
129 /** |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
130 * 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
|
131 * 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
|
132 * 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
|
133 * 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
|
134 * 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
|
135 * "/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
|
136 **/ |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
137 |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
138 if (!hasCompression_) |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
139 { |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
140 compression_ = DetectImageCompression(orthanc, instanceId_); |
56
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
141 hasCompression_ = true; |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
142 } |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
143 |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
144 return compression_; |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
145 } |
83cd735c885d
speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
146 |
0 | 147 |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
148 void DicomPyramidInstance::Load(OrthancStone::IOrthancConnection& orthanc, |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
149 const std::string& instanceId) |
0 | 150 { |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
151 using namespace OrthancStone; |
0 | 152 |
87 | 153 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/tags"); |
154 DicomDatasetReader reader(dataset); | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
155 |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
156 if (reader.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_SOP_CLASS_UID)) != "1.2.840.10008.5.1.4.1.1.77.1.6" || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
157 reader.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_MODALITY)) != "SM") |
0 | 158 { |
159 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
160 } | |
161 | |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
162 hasCompression_ = false; |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
163 DetectPixelFormat(format_, photometric_, reader); |
89 | 164 |
165 unsigned int tmp; | |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
166 if (!reader.GetUnsignedIntegerValue(tileWidth_, OrthancStone::DicomPath(Orthanc::DICOM_TAG_COLUMNS)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
167 !reader.GetUnsignedIntegerValue(tileHeight_, OrthancStone::DicomPath(Orthanc::DICOM_TAG_ROWS)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
168 !reader.GetUnsignedIntegerValue(totalWidth_, OrthancStone::DicomPath(DICOM_TAG_TOTAL_PIXEL_MATRIX_COLUMNS)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
169 !reader.GetUnsignedIntegerValue(totalHeight_, OrthancStone::DicomPath(DICOM_TAG_TOTAL_PIXEL_MATRIX_ROWS)) || |
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
170 !reader.GetUnsignedIntegerValue(tmp, OrthancStone::DicomPath(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))) |
89 | 171 { |
172 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
173 } | |
0 | 174 |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
175 size_t countFrames; |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
176 if (!reader.GetDataset().GetSequenceSize(countFrames, OrthancStone::DicomPath(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE))) |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
177 { |
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
178 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
179 } |
0 | 180 |
89 | 181 if (countFrames != tmp) |
0 | 182 { |
183 LOG(ERROR) << "Mismatch between the number of frames in instance: " << instanceId; | |
184 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
185 } | |
186 | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
187 frames_.resize(countFrames); |
0 | 188 |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
189 for (size_t i = 0; i < countFrames; i++) |
0 | 190 { |
89 | 191 DicomPath pathX(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i, |
192 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0, | |
193 DICOM_TAG_COLUMN_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX); | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
194 |
89 | 195 DicomPath pathY(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i, |
196 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0, | |
197 DICOM_TAG_ROW_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX); | |
198 | |
199 int xx, yy; | |
200 if (!reader.GetIntegerValue(xx, pathX) || | |
201 !reader.GetIntegerValue(yy, pathY)) | |
202 { | |
203 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentTag); | |
204 } | |
0 | 205 |
206 // "-1", because coordinates are shifted by 1 in DICOM | |
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
207 xx -= 1; |
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
208 yy -= 1; |
0 | 209 |
210 unsigned int x = static_cast<unsigned int>(xx); | |
211 unsigned int y = static_cast<unsigned int>(yy); | |
212 | |
213 if (xx < 0 || | |
214 yy < 0 || | |
215 x % tileWidth_ != 0 || | |
216 y % tileHeight_ != 0 || | |
217 x >= totalWidth_ || | |
218 y >= totalHeight_) | |
219 { | |
220 LOG(ERROR) << "Frame " << i << " with unexpected tile location (" | |
221 << x << "," << y << ") in instance: " << instanceId; | |
222 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
223 } | |
224 | |
225 frames_[i].first = x / tileWidth_; | |
226 frames_[i].second = y / tileHeight_; | |
227 } | |
228 } | |
229 | |
230 | |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
231 DicomPyramidInstance::DicomPyramidInstance(OrthancStone::IOrthancConnection& orthanc, |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
232 const std::string& instanceId, |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
233 bool useCache) : |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
234 instanceId_(instanceId), |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
235 hasCompression_(false) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
236 { |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
237 if (useCache) |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
238 { |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
239 try |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
240 { |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
241 // Try and deserialized the cached information about this instance |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
242 std::string serialized; |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
243 orthanc.RestApiGet(serialized, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA); |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
244 Deserialize(serialized); |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
245 return; // Success |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
246 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
247 catch (Orthanc::OrthancException&) |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
248 { |
70 | 249 // No cached information yet |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
250 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
251 } |
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
252 |
70 | 253 // Compute information about this instance from scratch |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
254 Load(orthanc, instanceId); |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
255 |
70 | 256 if (useCache) |
257 { | |
258 // Serialize the computed information and cache it as a metadata | |
259 std::string serialized, tmp; | |
260 Serialize(serialized); | |
261 orthanc.RestApiPut(tmp, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA, serialized); | |
262 } | |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
263 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
264 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
265 |
0 | 266 unsigned int DicomPyramidInstance::GetFrameLocationX(size_t frame) const |
267 { | |
268 assert(frame < frames_.size()); | |
269 return frames_[frame].first; | |
270 } | |
271 | |
272 | |
273 unsigned int DicomPyramidInstance::GetFrameLocationY(size_t frame) const | |
274 { | |
275 assert(frame < frames_.size()); | |
276 return frames_[frame].second; | |
277 } | |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
278 |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
279 |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
280 void DicomPyramidInstance::Serialize(std::string& result) const |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
281 { |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
282 Json::Value frames = Json::arrayValue; |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
283 for (size_t i = 0; i < frames_.size(); i++) |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
284 { |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
285 Json::Value frame = Json::arrayValue; |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
286 frame.append(frames_[i].first); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
287 frame.append(frames_[i].second); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
288 |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
289 frames.append(frame); |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
290 } |
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
291 |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
292 Json::Value content; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
293 content["Frames"] = frames; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
294 content["TileHeight"] = tileHeight_; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
295 content["TileWidth"] = tileWidth_; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
296 content["TotalHeight"] = totalHeight_; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
297 content["TotalWidth"] = totalWidth_; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
298 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
299 switch (format_) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
300 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
301 case Orthanc::PixelFormat_RGB24: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
302 content["PixelFormat"] = 0; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
303 break; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
304 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
305 case Orthanc::PixelFormat_Grayscale8: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
306 content["PixelFormat"] = 1; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
307 break; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
308 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
309 default: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
310 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
311 } |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
312 |
213
2a4e1f7de5ab
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
196
diff
changeset
|
313 Orthanc::Toolbox::WriteFastJson(result, content); |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
314 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
315 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
316 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
317 void DicomPyramidInstance::Deserialize(const std::string& s) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
318 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
319 hasCompression_ = false; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
320 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
321 Json::Value content; |
196
b0bd22077cd8
sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
322 OrthancStone::IOrthancConnection::ParseJson(content, s); |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
323 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
324 if (content.type() != Json::objectValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
325 !content.isMember("Frames") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
326 !content.isMember("PixelFormat") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
327 !content.isMember("TileHeight") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
328 !content.isMember("TileWidth") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
329 !content.isMember("TotalHeight") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
330 !content.isMember("TotalWidth") || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
331 content["Frames"].type() != Json::arrayValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
332 content["PixelFormat"].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
333 content["TileHeight"].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
334 content["TileWidth"].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
335 content["TotalHeight"].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
336 content["TotalWidth"].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
337 content["TileHeight"].asInt() < 0 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
338 content["TileWidth"].asInt() < 0 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
339 content["TotalHeight"].asInt() < 0 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
340 content["TotalWidth"].asInt() < 0) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
341 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
342 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
343 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
344 |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
345 switch (content["PixelFormat"].asInt()) |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
346 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
347 case 0: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
348 format_ = Orthanc::PixelFormat_RGB24; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
349 break; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
350 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
351 case 1: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
352 format_ = Orthanc::PixelFormat_Grayscale8; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
353 break; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
354 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
355 default: |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
356 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
357 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
358 |
69
d529d9ce3c7e
cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
359 hasCompression_ = false; |
68
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
360 tileHeight_ = static_cast<unsigned int>(content["TileHeight"].asInt()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
361 tileWidth_ = static_cast<unsigned int>(content["TileWidth"].asInt()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
362 totalHeight_ = static_cast<unsigned int>(content["TotalHeight"].asInt()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
363 totalWidth_ = static_cast<unsigned int>(content["TotalWidth"].asInt()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
364 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
365 const Json::Value f = content["Frames"]; |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
366 frames_.resize(f.size()); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
367 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
368 for (Json::Value::ArrayIndex i = 0; i < f.size(); i++) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
369 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
370 if (f[i].type() != Json::arrayValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
371 f[i].size() != 2 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
372 f[i][0].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
373 f[i][1].type() != Json::intValue || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
374 f[i][0].asInt() < 0 || |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
375 f[i][1].asInt() < 0) |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
376 { |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
377 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
378 } |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
379 |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
380 frames_[i].first = f[i][0].asInt(); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
381 frames_[i].second = f[i][1].asInt(); |
c619c8bd72ed
DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
382 } |
64
63d0a5c74460
DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
383 } |
0 | 384 } |