Mercurial > hg > orthanc-wsi

annotate Framework/Inputs/DicomPyramidInstance.cpp @ 219:ef3f8c5126a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't display the thumbnail/overview instances in the Web viewer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 Jan 2021 17:09:57 +0100
parents 20bc074ec19a
children 443f219a68fd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
16
7a88c614be04 preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
22 #include "../PrecompiledHeadersWSI.h"
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "DicomPyramidInstance.h"
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
194
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
28
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
29 #include <Logging.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
30 #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
31 #include <SerializationToolbox.h>
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
32 #include <Toolbox.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 175
diff changeset
33
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include <cassert>
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
36 #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
37
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
38
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 namespace OrthancWSI
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 {
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
41 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
42 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
43 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
44 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
45 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
46 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
47 static const Orthanc::DicomTag DICOM_TAG_IMAGE_TYPE(0x0008, 0x0008);
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
48
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
49 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
50 const std::string& instanceId)
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 {
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
52 using namespace OrthancStone;
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
53
87
3d83d34cd4db sync, optimizations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
54 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/header");
3d83d34cd4db sync, optimizations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
55 DicomDatasetReader header(dataset);
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
56
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 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
58 (header.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_TRANSFER_SYNTAX_UID)));
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 if (s == "1.2.840.10008.1.2" ||
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 s == "1.2.840.10008.1.2.1")
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 return ImageCompression_None;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 else if (s == "1.2.840.10008.1.2.4.50")
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 return ImageCompression_Jpeg;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 else if (s == "1.2.840.10008.1.2.4.90" ||
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 s == "1.2.840.10008.1.2.4.91")
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 return ImageCompression_Jpeg2000;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 else
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 LOG(ERROR) << "Unsupported transfer syntax: " << s;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
82 static void DetectPixelFormat(Orthanc::PixelFormat& format,
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
83 Orthanc::PhotometricInterpretation& photometric,
216
c35a3a0627b9 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
84 const OrthancStone::DicomDatasetReader& reader)
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 {
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
86 using namespace OrthancStone;
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
87
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
88 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
89 (reader.GetMandatoryStringValue(OrthancStone::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
90
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
91 photometric = Orthanc::StringToPhotometricInterpretation(p.c_str());
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
93 if (photometric == Orthanc::PhotometricInterpretation_Palette)
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
95 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented,
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
96 "Unsupported photometric interpretation: " + p);
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
99 unsigned int bitsStored, samplesPerPixel, tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
100
213
2a4e1f7de5ab remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 196
diff changeset
101 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
102 !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
103 !reader.GetUnsignedIntegerValue(tmp, OrthancStone::DicomPath(Orthanc::DICOM_TAG_PIXEL_REPRESENTATION)))
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
104 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
105 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentTag);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
106 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
107
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
108 bool isSigned = (tmp != 0);
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 if (bitsStored == 8 &&
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 samplesPerPixel == 1 &&
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 !isSigned)
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 {
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
114 format = Orthanc::PixelFormat_Grayscale8;
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 else if (bitsStored == 8 &&
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 samplesPerPixel == 3 &&
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 !isSigned)
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 {
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
120 format = Orthanc::PixelFormat_RGB24;
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 else
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 {
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
124 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Unsupported pixel format");
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
56
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
128
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
129 ImageCompression DicomPyramidInstance::GetImageCompression(OrthancStone::IOrthancConnection& orthanc)
56
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
130 {
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
131 /**
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
132 * 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
133 * 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
134 * 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
135 * 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
136 * 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
137 * "/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
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 if (!hasCompression_)
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
141 {
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
142 compression_ = DetectImageCompression(orthanc, instanceId_);
56
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
143 hasCompression_ = true;
83cd735c885d speedup the loading of DICOM sources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
144 }
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 return compression_;
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
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
150 void DicomPyramidInstance::Load(OrthancStone::IOrthancConnection& orthanc,
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
151 const std::string& instanceId)
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 {
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
153 using namespace OrthancStone;
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
87
3d83d34cd4db sync, optimizations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
155 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/tags");
3d83d34cd4db sync, optimizations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
156 DicomDatasetReader reader(dataset);
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
157
213
2a4e1f7de5ab remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 196
diff changeset
158 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
159 reader.GetMandatoryStringValue(OrthancStone::DicomPath(Orthanc::DICOM_TAG_MODALITY)) != "SM")
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163
69
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
164 hasCompression_ = false;
166
f0dac1e8f736 access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 157
diff changeset
165 DetectPixelFormat(format_, photometric_, reader);
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
166
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
167 unsigned int tmp;
213
2a4e1f7de5ab remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 196
diff changeset
168 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
169 !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
170 !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
171 !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
172 !reader.GetUnsignedIntegerValue(tmp, OrthancStone::DicomPath(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES)))
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
173 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
174 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
175 }
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176
219
ef3f8c5126a4 Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
177 imageType_ = reader.GetStringValue(OrthancStone::DicomPath(DICOM_TAG_IMAGE_TYPE), "");
ef3f8c5126a4 Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
178
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
179 size_t countFrames;
215
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
180 if (reader.GetDataset().GetSequenceSize(countFrames, OrthancStone::DicomPath(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE)))
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
215
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
182 if (countFrames != tmp)
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
183 {
215
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
184 LOG(ERROR) << "Mismatch between the number of frames in instance: " << instanceId;
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187
215
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
188 frames_.resize(countFrames);
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
189
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
190 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
191 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
192 DicomPath pathX(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i,
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
193 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0,
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
194 DICOM_TAG_COLUMN_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX);
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
195
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
196 DicomPath pathY(DICOM_TAG_PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE, i,
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
197 DICOM_TAG_PLANE_POSITION_SLIDE_SEQUENCE, 0,
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
198 DICOM_TAG_ROW_POSITION_IN_TOTAL_IMAGE_PIXEL_MATRIX);
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
199
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
200 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
201 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
202 !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
203 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
204 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
205 }
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
206
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
207 // "-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
208 xx -= 1;
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
209 yy -= 1;
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
210
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
211 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
212 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
213
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
214 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
215 yy < 0 ||
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
216 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
217 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
218 x >= totalWidth_ ||
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
219 y >= totalHeight_)
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
220 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
221 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
222 << 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
223 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
224 }
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
225
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
226 frames_[i].first = x / tileWidth_;
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
227 frames_[i].second = y / tileHeight_;
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 }
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
230 else
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
231 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
232 // 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
233 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
234
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
235 // 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
236 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
237 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
238 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
239 w += 1;
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
240 }
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
241
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
242 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
243 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
244 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
245 h += 1;
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
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
248 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
249 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
250 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
251 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
252 }
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
253
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
254 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
255 {
02cb86d07966 Allow images without "Per frame functional groups sequence" tag (0x5200,0x9230)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
256 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
257 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
258 }
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262
196
b0bd22077cd8 sharing code with orthanc-stone
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 194
diff changeset
263 DicomPyramidInstance::DicomPyramidInstance(OrthancStone::IOrthancConnection& orthanc,
69
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
264 const std::string& instanceId,
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
265 bool useCache) :
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
266 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
267 hasCompression_(false),
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
268 compression_(ImageCompression_None) // Dummy initialization for serialization
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
269 {
69
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
270 if (useCache)
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
271 {
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
272 try
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
273 {
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
274 // Try and deserialized the cached information about this instance
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
275 std::string serialized;
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
276 orthanc.RestApiGet(serialized, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA);
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
277 Deserialize(serialized);
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
278 return; // Success
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
279 }
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
280 catch (Orthanc::OrthancException&)
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
281 {
70
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
282 // No cached information yet
69
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
283 }
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
284 }
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
285
70
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
286 // Compute information about this instance from scratch
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
287 Load(orthanc, instanceId);
69
d529d9ce3c7e cache for DicomPyramidInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
288
70
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
289 if (useCache)
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
290 {
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
291 // Serialize the computed information and cache it as a metadata
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
292 std::string serialized, tmp;
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
293 Serialize(serialized);
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
294 orthanc.RestApiPut(tmp, "/instances/" + instanceId + "/metadata/" + SERIALIZED_METADATA, serialized);
f2c179294382 improvement
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
295 }
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
296 }
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
297
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
298
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 unsigned int DicomPyramidInstance::GetFrameLocationX(size_t frame) const
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 assert(frame < frames_.size());
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 return frames_[frame].first;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 unsigned int DicomPyramidInstance::GetFrameLocationY(size_t frame) const
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 assert(frame < frames_.size());
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 return frames_[frame].second;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 }
64
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
311
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
312
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
313
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
314 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
315 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
316 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
317 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
318 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
319 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
320 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
321 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
322 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
323 static const char* const IMAGE_TYPE = "ImageType";
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
324
64
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
325
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
326 void DicomPyramidInstance::Serialize(std::string& result) const
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
327 {
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
328 Json::Value frames = Json::arrayValue;
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
329 for (size_t i = 0; i < frames_.size(); i++)
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
330 {
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
331 Json::Value frame = Json::arrayValue;
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
332 frame.append(frames_[i].first);
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
333 frame.append(frames_[i].second);
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
334 frames.append(frame);
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
335 }
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
336
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
337 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
338 content[FRAMES] = frames;
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
339
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
340 // "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
341
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
342 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
343 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
344 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
345 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
346 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
347 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
348 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
349 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
350 content[IMAGE_TYPE] = imageType_;
64
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
351
213
2a4e1f7de5ab remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 196
diff changeset
352 Orthanc::Toolbox::WriteFastJson(result, content);
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
353 }
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
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
356 void DicomPyramidInstance::Deserialize(const std::string& s)
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 Json::Value content;
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
359 Orthanc::Toolbox::ReadJson(content, s);
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
360
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
361 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
362 !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
363 content[FRAMES].type() != Json::arrayValue)
68
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
366 }
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
367
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
368 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
369 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
370 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
371 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
372 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
373 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
374 totalHeight_ = Orthanc::SerializationToolbox::ReadUnsignedInteger(content, TOTAL_HEIGHT);
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
375
217
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
376 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
377 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
378
ef3f8c5126a4 Don't display the thumbnail/overview instances in the Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
379 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
380
20bc074ec19a Viewer can display DICOM pyramids whose tile sizes vary across levels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 216
diff changeset
381 const Json::Value f = content[FRAMES];
68
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
382 frames_.resize(f.size());
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
383
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
384 for (Json::Value::ArrayIndex i = 0; i < f.size(); i++)
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
385 {
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
386 if (f[i].type() != Json::arrayValue ||
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
387 f[i].size() != 2 ||
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
388 f[i][0].type() != Json::intValue ||
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
389 f[i][1].type() != Json::intValue ||
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
390 f[i][0].asInt() < 0 ||
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
391 f[i][1].asInt() < 0)
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
392 {
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
393 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
394 }
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
395
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
396 frames_[i].first = f[i][0].asInt();
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
397 frames_[i].second = f[i][1].asInt();
c619c8bd72ed DicomPyramidInstance::Deserialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
398 }
64
63d0a5c74460 DicomPyramidInstance::Serialize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
399 }
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 }