Mercurial > hg > orthanc-webviewer
annotate Plugin/DecodedImageAdapter.cpp @ 321:705be6d59d9b default tip
fix build on tumbleweed
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 11 Jun 2024 12:57:30 +0200 |
parents | 553fa466835a |
children |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
122 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
0 | 4 * Department, University Hospital of Liege, Belgium |
320
553fa466835a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
316
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
553fa466835a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
316
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
314
0a1ad7492050
update year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
0 | 8 * |
9 * This program is free software: you can redistribute it and/or | |
10 * modify it under the terms of the GNU Affero General Public License | |
11 * as published by the Free Software Foundation, either version 3 of | |
12 * the License, or (at your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, but | |
15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * Affero General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU Affero General Public License | |
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
21 **/ | |
22 | |
23 | |
24 #include "DecodedImageAdapter.h" | |
25 | |
26 #include "ViewerToolbox.h" | |
27 | |
266
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
28 #include <Images/ImageBuffer.h> |
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
29 #include <Images/ImageProcessing.h> |
287 | 30 #include <Logging.h> |
266
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
31 #include <OrthancException.h> |
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
32 #include <Toolbox.h> |
191
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
33 |
0 | 34 #include <boost/lexical_cast.hpp> |
35 #include <boost/algorithm/string/predicate.hpp> | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
36 #include <boost/regex.hpp> |
0 | 37 |
103 | 38 |
0 | 39 namespace OrthancPlugins |
40 { | |
160 | 41 static bool GetStringTag(std::string& value, |
42 const Json::Value& tags, | |
43 const std::string& tag) | |
44 { | |
45 if (tags.type() == Json::objectValue && | |
46 tags.isMember(tag) && | |
47 tags[tag].type() == Json::objectValue && | |
48 tags[tag].isMember("Type") && | |
49 tags[tag].isMember("Value") && | |
50 tags[tag]["Type"].type() == Json::stringValue && | |
51 tags[tag]["Value"].type() == Json::stringValue && | |
52 tags[tag]["Type"].asString() == "String") | |
53 { | |
54 value = tags[tag]["Value"].asString(); | |
55 return true; | |
56 } | |
57 else | |
58 { | |
59 return false; | |
60 } | |
61 } | |
62 | |
63 | |
64 static float GetFloatTag(const Json::Value& tags, | |
65 const std::string& tag, | |
66 float defaultValue) | |
67 { | |
68 std::string tmp; | |
69 if (GetStringTag(tmp, tags, tag)) | |
70 { | |
71 try | |
72 { | |
73 return boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tmp)); | |
74 } | |
75 catch (boost::bad_lexical_cast&) | |
76 { | |
77 } | |
78 } | |
79 | |
80 return defaultValue; | |
81 } | |
82 | |
83 | |
0 | 84 bool DecodedImageAdapter::ParseUri(CompressionType& type, |
85 uint8_t& compressionLevel, | |
86 std::string& instanceId, | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
87 unsigned int& frameIndex, |
0 | 88 const std::string& uri) |
89 { | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
90 boost::regex pattern("^([a-z0-9]+)-([a-z0-9-]+)_([0-9]+)$"); |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
91 |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
92 boost::cmatch what; |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
93 if (!regex_match(uri.c_str(), what, pattern)) |
0 | 94 { |
95 return false; | |
96 } | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
97 |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
98 std::string compression(what[1]); |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
99 instanceId = what[2]; |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
100 frameIndex = boost::lexical_cast<unsigned int>(what[3]); |
0 | 101 |
102 if (compression == "deflate") | |
103 { | |
104 type = CompressionType_Deflate; | |
105 } | |
106 else if (boost::starts_with(compression, "jpeg")) | |
107 { | |
108 type = CompressionType_Jpeg; | |
109 int level = boost::lexical_cast<int>(compression.substr(4)); | |
110 if (level <= 0 || level > 100) | |
111 { | |
112 return false; | |
113 } | |
114 | |
115 compressionLevel = static_cast<uint8_t>(level); | |
116 } | |
117 else | |
118 { | |
119 return false; | |
120 } | |
121 | |
122 return true; | |
123 } | |
124 | |
125 | |
126 | |
127 bool DecodedImageAdapter::Create(std::string& content, | |
128 const std::string& uri) | |
129 { | |
234
083d0cbcbac4
improved error message
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
230
diff
changeset
|
130 LOG(INFO) << "Decoding DICOM instance: " << uri; |
0 | 131 |
132 CompressionType type; | |
133 uint8_t level; | |
134 std::string instanceId; | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
135 unsigned int frameIndex; |
0 | 136 |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
137 if (!ParseUri(type, level, instanceId, frameIndex, uri)) |
0 | 138 { |
139 return false; | |
140 } | |
141 | |
96 | 142 bool ok = false; |
143 | |
144 Json::Value tags; | |
145 std::string dicom; | |
146 if (!GetStringFromOrthanc(dicom, context_, "/instances/" + instanceId + "/file") || | |
147 !GetJsonFromOrthanc(tags, context_, "/instances/" + instanceId + "/tags")) | |
148 { | |
149 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
150 } | |
151 | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
152 std::unique_ptr<OrthancImage> image( |
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
153 new OrthancImage(OrthancPluginDecodeDicomImage( |
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
154 context_, dicom.c_str(), dicom.size(), frameIndex))); |
96 | 155 |
156 Json::Value json; | |
157 if (GetCornerstoneMetadata(json, tags, *image)) | |
158 { | |
159 if (type == CompressionType_Deflate) | |
160 { | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
161 ok = EncodeUsingDeflate(json, *image); |
96 | 162 } |
163 else if (type == CompressionType_Jpeg) | |
164 { | |
165 ok = EncodeUsingJpeg(json, *image, level); | |
166 } | |
167 } | |
168 | |
31 | 169 if (ok) |
170 { | |
160 | 171 std::string photometric; |
172 if (GetStringTag(photometric, tags, "0028,0004")) | |
173 { | |
174 json["Orthanc"]["PhotometricInterpretation"] = photometric; | |
175 } | |
292
aadbffcee805
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
287
diff
changeset
|
176 |
aadbffcee805
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
287
diff
changeset
|
177 Orthanc::Toolbox::WriteFastJson(content, json); |
31 | 178 return true; |
0 | 179 } |
180 else | |
181 { | |
234
083d0cbcbac4
improved error message
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
230
diff
changeset
|
182 LOG(WARNING) << "Unable to decode the following instance: " << uri; |
0 | 183 return false; |
184 } | |
185 } | |
96 | 186 |
187 | |
188 bool DecodedImageAdapter::GetCornerstoneMetadata(Json::Value& result, | |
189 const Json::Value& tags, | |
304 | 190 const OrthancImage& image) |
96 | 191 { |
192 float windowCenter, windowWidth; | |
193 | |
194 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
195 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 196 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
197 | |
198 switch (accessor.GetFormat()) | |
199 { | |
296
d179f3928342
removed "using namespace Orthanc"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
200 case Orthanc::PixelFormat_Grayscale8: |
d179f3928342
removed "using namespace Orthanc"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
201 case Orthanc::PixelFormat_Grayscale16: |
d179f3928342
removed "using namespace Orthanc"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
202 case Orthanc::PixelFormat_SignedGrayscale16: |
96 | 203 { |
204 int64_t a, b; | |
172 | 205 Orthanc::ImageProcessing::GetMinMaxIntegerValue(a, b, accessor); |
96 | 206 result["minPixelValue"] = (a < 0 ? static_cast<int32_t>(a) : 0); |
207 result["maxPixelValue"] = (b > 0 ? static_cast<int32_t>(b) : 1); | |
208 result["color"] = false; | |
209 | |
210 windowCenter = static_cast<float>(a + b) / 2.0f; | |
211 | |
212 if (a == b) | |
213 { | |
214 windowWidth = 256.0f; // Arbitrary value | |
215 } | |
216 else | |
217 { | |
218 windowWidth = static_cast<float>(b - a) / 2.0f; | |
219 } | |
220 | |
221 break; | |
222 } | |
223 | |
296
d179f3928342
removed "using namespace Orthanc"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
224 case Orthanc::PixelFormat_RGB24: |
d179f3928342
removed "using namespace Orthanc"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
225 case Orthanc::PixelFormat_RGB48: |
96 | 226 result["minPixelValue"] = 0; |
227 result["maxPixelValue"] = 255; | |
228 result["color"] = true; | |
229 windowCenter = 127.5f; | |
230 windowWidth = 256.0f; | |
231 break; | |
232 | |
233 default: | |
234 return false; | |
235 } | |
236 | |
102 | 237 float slope = GetFloatTag(tags, "0028,1053", 1.0f); |
103 | 238 float intercept = GetFloatTag(tags, "0028,1052", 0.0f); |
102 | 239 |
240 result["slope"] = slope; | |
241 result["intercept"] = intercept; | |
96 | 242 result["rows"] = image.GetHeight(); |
243 result["columns"] = image.GetWidth(); | |
244 result["height"] = image.GetHeight(); | |
245 result["width"] = image.GetWidth(); | |
246 | |
102 | 247 bool ok = false; |
248 std::string pixelSpacing; | |
249 if (GetStringTag(pixelSpacing, tags, "0028,0030")) | |
96 | 250 { |
102 | 251 std::vector<std::string> tokens; |
252 Orthanc::Toolbox::TokenizeString(tokens, pixelSpacing, '\\'); | |
253 | |
254 if (tokens.size() >= 2) | |
96 | 255 { |
102 | 256 try |
257 { | |
103 | 258 result["columnPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[1])); |
259 result["rowPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[0])); | |
102 | 260 ok = true; |
261 } | |
262 catch (boost::bad_lexical_cast&) | |
263 { | |
264 } | |
96 | 265 } |
266 } | |
102 | 267 |
268 if (!ok) | |
96 | 269 { |
102 | 270 result["columnPixelSpacing"] = 1.0f; |
271 result["rowPixelSpacing"] = 1.0f; | |
96 | 272 } |
273 | |
102 | 274 result["windowCenter"] = GetFloatTag(tags, "0028,1050", windowCenter * slope + intercept); |
275 result["windowWidth"] = GetFloatTag(tags, "0028,1051", windowWidth * slope); | |
276 | |
96 | 277 return true; |
278 } | |
279 | |
280 | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
281 static void ConvertRGB48ToRGB24(Orthanc::ImageAccessor& target, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
282 const Orthanc::ImageAccessor& source) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
283 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
284 if (source.GetWidth() != target.GetWidth() || |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
285 source.GetHeight() != target.GetHeight()) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
286 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
287 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
288 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
289 |
287 | 290 const unsigned int width = source.GetWidth(); |
291 const unsigned int height = source.GetHeight(); | |
292 | |
293 for (unsigned int y = 0; y < height; y++) | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
294 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
295 const uint16_t* p = reinterpret_cast<const uint16_t*>(source.GetConstRow(y)); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
296 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y)); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
297 |
287 | 298 for (unsigned int x = 0; x < width; x++) |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
299 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
300 q[0] = p[0] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
301 q[1] = p[1] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
302 q[2] = p[2] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
303 p += 3; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
304 q += 3; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
305 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
306 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
307 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
308 |
96 | 309 |
310 bool DecodedImageAdapter::EncodeUsingDeflate(Json::Value& result, | |
304 | 311 const OrthancImage& image) |
96 | 312 { |
313 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
314 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 315 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
316 | |
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
317 std::unique_ptr<Orthanc::ImageBuffer> buffer; |
96 | 318 |
319 Orthanc::ImageAccessor converted; | |
320 | |
321 switch (accessor.GetFormat()) | |
322 { | |
323 case Orthanc::PixelFormat_RGB24: | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
324 accessor.GetReadOnlyAccessor(converted); |
96 | 325 break; |
326 | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
327 case Orthanc::PixelFormat_RGB48: |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
328 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
329 accessor.GetWidth(), |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
330 accessor.GetHeight(), false)); |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
331 buffer->GetWriteableAccessor(converted); |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
332 ConvertRGB48ToRGB24(converted, accessor); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
333 break; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
334 |
96 | 335 case Orthanc::PixelFormat_Grayscale8: |
336 case Orthanc::PixelFormat_Grayscale16: | |
145 | 337 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale16, |
338 accessor.GetWidth(), | |
339 accessor.GetHeight(), | |
340 true /* force minimal pitch */)); | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
341 buffer->GetWriteableAccessor(converted); |
96 | 342 Orthanc::ImageProcessing::Convert(converted, accessor); |
343 break; | |
344 | |
345 case Orthanc::PixelFormat_SignedGrayscale16: | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
346 accessor.GetReadOnlyAccessor(converted); |
96 | 347 break; |
348 | |
349 default: | |
350 // Unsupported pixel format | |
351 return false; | |
352 } | |
353 | |
126
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
354 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16); |
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
355 |
96 | 356 // Sanity check: The pitch must be minimal |
357 assert(converted.GetSize() == converted.GetWidth() * converted.GetHeight() * | |
358 GetBytesPerPixel(converted.GetFormat())); | |
359 result["Orthanc"]["Compression"] = "Deflate"; | |
360 result["sizeInBytes"] = converted.GetSize(); | |
361 | |
362 std::string z; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
363 CompressUsingDeflate(z, GetGlobalContext(), converted.GetConstBuffer(), converted.GetSize()); |
216 | 364 |
365 std::string s; | |
366 Orthanc::Toolbox::EncodeBase64(s, z); | |
367 result["Orthanc"]["PixelData"] = s; | |
96 | 368 |
369 return true; | |
370 } | |
371 | |
372 | |
373 | |
374 template <typename TargetType, typename SourceType> | |
375 static void ChangeDynamics(Orthanc::ImageAccessor& target, | |
376 const Orthanc::ImageAccessor& source, | |
377 SourceType source1, TargetType target1, | |
378 SourceType source2, TargetType target2) | |
379 { | |
380 if (source.GetWidth() != target.GetWidth() || | |
381 source.GetHeight() != target.GetHeight()) | |
382 { | |
383 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); | |
384 } | |
385 | |
386 float scale = static_cast<float>(target2 - target1) / static_cast<float>(source2 - source1); | |
387 float offset = static_cast<float>(target1) - scale * static_cast<float>(source1); | |
388 | |
389 const float minValue = static_cast<float>(std::numeric_limits<TargetType>::min()); | |
390 const float maxValue = static_cast<float>(std::numeric_limits<TargetType>::max()); | |
391 | |
287 | 392 const unsigned int width = source.GetWidth(); |
393 const unsigned int height = source.GetHeight(); | |
394 | |
395 for (unsigned int y = 0; y < height; y++) | |
96 | 396 { |
397 const SourceType* p = reinterpret_cast<const SourceType*>(source.GetConstRow(y)); | |
398 TargetType* q = reinterpret_cast<TargetType*>(target.GetRow(y)); | |
399 | |
287 | 400 for (unsigned int x = 0; x < width; x++, p++, q++) |
96 | 401 { |
402 float v = (scale * static_cast<float>(*p)) + offset; | |
403 | |
404 if (v > maxValue) | |
405 { | |
406 *q = std::numeric_limits<TargetType>::max(); | |
407 } | |
408 else if (v < minValue) | |
409 { | |
410 *q = std::numeric_limits<TargetType>::min(); | |
411 } | |
412 else | |
413 { | |
101 | 414 //*q = static_cast<TargetType>(boost::math::iround(v)); |
415 | |
416 // http://stackoverflow.com/a/485546/881731 | |
417 *q = static_cast<TargetType>(floor(v + 0.5f)); | |
96 | 418 } |
419 } | |
420 } | |
421 } | |
422 | |
423 | |
424 bool DecodedImageAdapter::EncodeUsingJpeg(Json::Value& result, | |
304 | 425 const OrthancImage& image, |
96 | 426 uint8_t quality /* between 0 and 100 */) |
427 { | |
428 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
429 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 430 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
431 | |
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
432 std::unique_ptr<Orthanc::ImageBuffer> buffer; |
96 | 433 |
434 Orthanc::ImageAccessor converted; | |
435 | |
436 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale8 || | |
437 accessor.GetFormat() == Orthanc::PixelFormat_RGB24) | |
438 { | |
439 result["Orthanc"]["Stretched"] = false; | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
440 accessor.GetReadOnlyAccessor(converted); |
96 | 441 } |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
442 else if (accessor.GetFormat() == Orthanc::PixelFormat_RGB48) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
443 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
444 result["Orthanc"]["Stretched"] = false; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
445 |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
446 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
447 accessor.GetWidth(), |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
448 accessor.GetHeight(), false)); |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
449 buffer->GetWriteableAccessor(converted); |
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
450 |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
451 ConvertRGB48ToRGB24(converted, accessor); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
452 } |
96 | 453 else if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16 || |
454 accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16) | |
455 { | |
456 result["Orthanc"]["Stretched"] = true; | |
145 | 457 |
458 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale8, | |
459 accessor.GetWidth(), | |
460 accessor.GetHeight(), | |
461 true /* force minimal pitch */)); | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
462 buffer->GetWriteableAccessor(converted); |
96 | 463 |
464 int64_t a, b; | |
172 | 465 Orthanc::ImageProcessing::GetMinMaxIntegerValue(a, b, accessor); |
96 | 466 result["Orthanc"]["StretchLow"] = static_cast<int32_t>(a); |
467 result["Orthanc"]["StretchHigh"] = static_cast<int32_t>(b); | |
468 | |
469 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16) | |
470 { | |
471 ChangeDynamics<uint8_t, uint16_t>(converted, accessor, a, 0, b, 255); | |
472 } | |
473 else | |
474 { | |
475 ChangeDynamics<uint8_t, int16_t>(converted, accessor, a, 0, b, 255); | |
476 } | |
477 } | |
478 else | |
479 { | |
480 return false; | |
481 } | |
482 | |
126
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
483 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16); |
96 | 484 result["Orthanc"]["Compression"] = "Jpeg"; |
485 result["sizeInBytes"] = converted.GetSize(); | |
486 | |
487 std::string jpeg; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
488 WriteJpegToMemory(jpeg, GetGlobalContext(), converted, quality); |
96 | 489 |
216 | 490 std::string s; |
491 Orthanc::Toolbox::EncodeBase64(s, jpeg); | |
492 result["Orthanc"]["PixelData"] = s; | |
493 | |
96 | 494 return true; |
495 } | |
0 | 496 } |