Mercurial > hg > orthanc-wsi

annotate Framework/Inputs/DicomPyramidInstance.cpp @ 89:61e629ce7c94

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