Mercurial > hg > orthanc-stone
annotate Framework/Deprecated/Toolbox/MessagingToolbox.cpp @ 1311:3d26447ddd28 broker
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 09 Mar 2020 14:55:22 +0100 |
parents | 8a0a62189f46 |
children | 1a08b779be64 |
rev | line source |
---|---|
0 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
792
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
47 | 8 * modify it under the terms of the GNU Affero General Public License |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
0 | 11 * |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
47 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
0 | 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 **/ | |
20 | |
21 #include "MessagingToolbox.h" | |
22 | |
212
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
23 #include <Core/Images/Image.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
24 #include <Core/Images/ImageProcessing.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
25 #include <Core/Images/JpegReader.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
26 #include <Core/Images/PngReader.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
27 #include <Core/OrthancException.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
28 #include <Core/Toolbox.h> |
5412adf19980
resort to OrthancFramework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
29 #include <Core/Logging.h> |
0 | 30 |
31 #include <boost/lexical_cast.hpp> | |
1311
3d26447ddd28
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
32 |
3d26447ddd28
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
33 // 'Json::Reader': Use CharReader and CharReaderBuilder instead |
3d26447ddd28
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
34 #pragma warning(disable:4996) |
3d26447ddd28
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
35 |
0 | 36 #include <json/reader.h> |
309 | 37 #include <json/writer.h> |
0 | 38 |
1311
3d26447ddd28
warning fixes + doc + indentation + header files in cmake for VC++ sln browsing
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
39 |
792
4fe4b221a31f
deprecating MessagingToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
439
diff
changeset
|
40 namespace Deprecated |
0 | 41 { |
42 namespace MessagingToolbox | |
43 { | |
44 static bool ParseVersion(std::string& version, | |
45 unsigned int& major, | |
46 unsigned int& minor, | |
47 unsigned int& patch, | |
48 const Json::Value& info) | |
49 { | |
50 if (info.type() != Json::objectValue || | |
51 !info.isMember("Version") || | |
52 info["Version"].type() != Json::stringValue) | |
53 { | |
54 return false; | |
55 } | |
56 | |
57 version = info["Version"].asString(); | |
58 if (version == "mainline") | |
59 { | |
60 // Some arbitrary high values Orthanc versions will never reach ;) | |
61 major = 999; | |
62 minor = 999; | |
63 patch = 999; | |
64 return true; | |
65 } | |
66 | |
67 std::vector<std::string> tokens; | |
68 Orthanc::Toolbox::TokenizeString(tokens, version, '.'); | |
69 | |
70 if (tokens.size() != 2 && | |
71 tokens.size() != 3) | |
72 { | |
73 return false; | |
74 } | |
75 | |
76 int a, b, c; | |
77 try | |
78 { | |
79 a = boost::lexical_cast<int>(tokens[0]); | |
80 b = boost::lexical_cast<int>(tokens[1]); | |
81 | |
82 if (tokens.size() == 3) | |
83 { | |
84 c = boost::lexical_cast<int>(tokens[2]); | |
85 } | |
86 else | |
87 { | |
88 c = 0; | |
89 } | |
90 } | |
91 catch (boost::bad_lexical_cast&) | |
92 { | |
93 return false; | |
94 } | |
95 | |
96 if (a < 0 || | |
97 b < 0 || | |
98 c < 0) | |
99 { | |
100 return false; | |
101 } | |
102 else | |
103 { | |
104 major = static_cast<unsigned int>(a); | |
105 minor = static_cast<unsigned int>(b); | |
106 patch = static_cast<unsigned int>(c); | |
107 return true; | |
108 } | |
109 } | |
110 | |
34 | 111 |
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
112 bool ParseJson(Json::Value& target, |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
113 const void* content, |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
114 size_t size) |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
115 { |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
116 Json::Reader reader; |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
117 return reader.parse(reinterpret_cast<const char*>(content), |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
118 reinterpret_cast<const char*>(content) + size, |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
119 target); |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
120 } |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
121 |
309 | 122 void JsonToString(std::string& target, |
123 const Json::Value& source) | |
124 { | |
125 Json::FastWriter writer; | |
126 target = writer.write(source); | |
127 } | |
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
128 |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
129 static void ParseJsonException(Json::Value& target, |
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
130 const std::string& source) |
0 | 131 { |
132 Json::Reader reader; | |
133 if (!reader.parse(source, target)) | |
134 { | |
135 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
136 } | |
137 } | |
138 | |
34 | 139 |
0 | 140 void RestApiGet(Json::Value& target, |
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
141 OrthancPlugins::IOrthancConnection& orthanc, |
0 | 142 const std::string& uri) |
143 { | |
144 std::string tmp; | |
145 orthanc.RestApiGet(tmp, uri); | |
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
146 ParseJsonException(target, tmp); |
0 | 147 } |
148 | |
149 | |
34 | 150 void RestApiPost(Json::Value& target, |
151 OrthancPlugins::IOrthancConnection& orthanc, | |
152 const std::string& uri, | |
153 const std::string& body) | |
154 { | |
155 std::string tmp; | |
156 orthanc.RestApiPost(tmp, uri, body); | |
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
157 ParseJsonException(target, tmp); |
34 | 158 } |
159 | |
160 | |
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
161 bool HasWebViewerInstalled(OrthancPlugins::IOrthancConnection& orthanc) |
0 | 162 { |
163 try | |
164 { | |
165 Json::Value json; | |
166 RestApiGet(json, orthanc, "/plugins/web-viewer"); | |
167 return json.type() == Json::objectValue; | |
168 } | |
169 catch (Orthanc::OrthancException&) | |
170 { | |
171 return false; | |
172 } | |
173 } | |
174 | |
175 | |
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
176 bool CheckOrthancVersion(OrthancPlugins::IOrthancConnection& orthanc) |
0 | 177 { |
178 Json::Value json; | |
179 std::string version; | |
180 unsigned int major, minor, patch; | |
181 | |
182 try | |
183 { | |
184 RestApiGet(json, orthanc, "/system"); | |
185 } | |
186 catch (Orthanc::OrthancException&) | |
187 { | |
188 LOG(ERROR) << "Cannot connect to your Orthanc server"; | |
189 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
190 } | |
191 | |
192 if (!ParseVersion(version, major, minor, patch, json)) | |
193 { | |
194 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
195 } | |
196 | |
122
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
197 LOG(WARNING) << "Version of the Orthanc core (must be above 1.3.1): " << version; |
0 | 198 |
122
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
199 // Stone is only compatible with Orthanc >= 1.3.1 |
0 | 200 if (major < 1 || |
122
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
201 (major == 1 && minor < 3) || |
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
202 (major == 1 && minor == 3 && patch < 1)) |
0 | 203 { |
204 return false; | |
205 } | |
206 | |
207 try | |
208 { | |
209 RestApiGet(json, orthanc, "/plugins/web-viewer"); | |
210 } | |
211 catch (Orthanc::OrthancException&) | |
212 { | |
213 // The Web viewer is not installed, this is OK | |
214 LOG(WARNING) << "The Web viewer plugin is not installed, progressive download is disabled"; | |
215 return true; | |
216 } | |
217 | |
218 if (!ParseVersion(version, major, minor, patch, json)) | |
219 { | |
220 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
221 } | |
222 | |
223 LOG(WARNING) << "Version of the Web viewer plugin (must be above 2.2): " << version; | |
224 | |
225 return (major >= 3 || | |
226 (major == 2 && minor >= 2)); | |
227 } | |
228 | |
229 | |
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
230 Orthanc::ImageAccessor* DecodeFrame(OrthancPlugins::IOrthancConnection& orthanc, |
0 | 231 const std::string& instance, |
232 unsigned int frame, | |
233 Orthanc::PixelFormat targetFormat) | |
234 { | |
235 std::string uri = ("instances/" + instance + "/frames/" + | |
236 boost::lexical_cast<std::string>(frame)); | |
237 | |
238 std::string compressed; | |
239 | |
240 switch (targetFormat) | |
241 { | |
242 case Orthanc::PixelFormat_RGB24: | |
243 orthanc.RestApiGet(compressed, uri + "/preview"); | |
244 break; | |
245 | |
246 case Orthanc::PixelFormat_Grayscale16: | |
247 orthanc.RestApiGet(compressed, uri + "/image-uint16"); | |
248 break; | |
249 | |
250 case Orthanc::PixelFormat_SignedGrayscale16: | |
251 orthanc.RestApiGet(compressed, uri + "/image-int16"); | |
252 break; | |
253 | |
254 default: | |
255 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
256 } | |
257 | |
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
258 std::unique_ptr<Orthanc::PngReader> result(new Orthanc::PngReader); |
0 | 259 result->ReadFromMemory(compressed); |
260 | |
261 if (targetFormat == Orthanc::PixelFormat_SignedGrayscale16) | |
262 { | |
263 if (result->GetFormat() == Orthanc::PixelFormat_Grayscale16) | |
264 { | |
265 result->SetFormat(Orthanc::PixelFormat_SignedGrayscale16); | |
266 } | |
267 else | |
268 { | |
269 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
270 } | |
271 } | |
272 | |
273 return result.release(); | |
274 } | |
275 | |
276 | |
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
277 Orthanc::ImageAccessor* DecodeJpegFrame(OrthancPlugins::IOrthancConnection& orthanc, |
0 | 278 const std::string& instance, |
279 unsigned int frame, | |
280 unsigned int quality, | |
281 Orthanc::PixelFormat targetFormat) | |
282 { | |
283 if (quality <= 0 || | |
284 quality > 100) | |
285 { | |
286 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
287 } | |
288 | |
289 // This requires the official Web viewer plugin to be installed! | |
290 std::string uri = ("web-viewer/instances/jpeg" + | |
291 boost::lexical_cast<std::string>(quality) + | |
292 "-" + instance + "_" + | |
293 boost::lexical_cast<std::string>(frame)); | |
294 | |
295 Json::Value encoded; | |
296 RestApiGet(encoded, orthanc, uri); | |
297 | |
298 if (encoded.type() != Json::objectValue || | |
299 !encoded.isMember("Orthanc") || | |
300 encoded["Orthanc"].type() != Json::objectValue) | |
301 { | |
302 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
303 } | |
304 | |
305 Json::Value& info = encoded["Orthanc"]; | |
306 if (!info.isMember("PixelData") || | |
307 !info.isMember("Stretched") || | |
308 !info.isMember("Compression") || | |
309 info["Compression"].type() != Json::stringValue || | |
310 info["PixelData"].type() != Json::stringValue || | |
311 info["Stretched"].type() != Json::booleanValue || | |
312 info["Compression"].asString() != "Jpeg") | |
313 { | |
314 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
315 } | |
316 | |
317 bool isSigned = false; | |
318 bool isStretched = info["Stretched"].asBool(); | |
319 | |
320 if (info.isMember("IsSigned")) | |
321 { | |
322 if (info["IsSigned"].type() != Json::booleanValue) | |
323 { | |
324 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
325 } | |
326 else | |
327 { | |
328 isSigned = info["IsSigned"].asBool(); | |
329 } | |
330 } | |
331 | |
332 std::string jpeg; | |
333 Orthanc::Toolbox::DecodeBase64(jpeg, info["PixelData"].asString()); | |
334 | |
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
335 std::unique_ptr<Orthanc::JpegReader> reader(new Orthanc::JpegReader); |
0 | 336 reader->ReadFromMemory(jpeg); |
337 | |
338 if (reader->GetFormat() == Orthanc::PixelFormat_RGB24) // This is a color image | |
339 { | |
340 if (targetFormat != Orthanc::PixelFormat_RGB24) | |
341 { | |
342 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
343 } | |
344 | |
345 if (isSigned || isStretched) | |
346 { | |
347 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
348 } | |
349 else | |
350 { | |
351 return reader.release(); | |
352 } | |
353 } | |
354 | |
355 if (reader->GetFormat() != Orthanc::PixelFormat_Grayscale8) | |
356 { | |
357 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
358 } | |
359 | |
360 if (!isStretched) | |
361 { | |
362 if (targetFormat != reader->GetFormat()) | |
363 { | |
364 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
365 } | |
366 | |
367 return reader.release(); | |
368 } | |
369 | |
370 int32_t stretchLow = 0; | |
371 int32_t stretchHigh = 0; | |
372 | |
373 if (!info.isMember("StretchLow") || | |
374 !info.isMember("StretchHigh") || | |
375 info["StretchLow"].type() != Json::intValue || | |
376 info["StretchHigh"].type() != Json::intValue) | |
377 { | |
378 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
379 } | |
380 | |
381 stretchLow = info["StretchLow"].asInt(); | |
382 stretchHigh = info["StretchHigh"].asInt(); | |
383 | |
384 if (stretchLow < -32768 || | |
385 stretchHigh > 65535 || | |
386 (stretchLow < 0 && stretchHigh > 32767)) | |
387 { | |
388 // This range cannot be represented with a uint16_t or an int16_t | |
389 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
390 } | |
391 | |
392 // Decode a grayscale JPEG 8bpp image coming from the Web viewer | |
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
393 std::unique_ptr<Orthanc::ImageAccessor> image |
11 | 394 (new Orthanc::Image(targetFormat, reader->GetWidth(), reader->GetHeight(), false)); |
0 | 395 |
396 float scaling = static_cast<float>(stretchHigh - stretchLow) / 255.0f; | |
397 float offset = static_cast<float>(stretchLow) / scaling; | |
398 | |
399 Orthanc::ImageProcessing::Convert(*image, *reader); | |
178 | 400 Orthanc::ImageProcessing::ShiftScale(*image, offset, scaling, true); |
0 | 401 |
402 #if 0 | |
403 /*info.removeMember("PixelData"); | |
404 std::cout << info.toStyledString();*/ | |
405 | |
406 int64_t a, b; | |
407 Orthanc::ImageProcessing::GetMinMaxValue(a, b, *image); | |
408 std::cout << stretchLow << "->" << stretchHigh << " = " << a << "->" << b << std::endl; | |
409 #endif | |
410 | |
411 return image.release(); | |
412 } | |
118
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
413 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
414 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
415 static void AddTag(Orthanc::DicomMap& target, |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
416 const OrthancPlugins::IDicomDataset& source, |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
417 const Orthanc::DicomTag& tag) |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
418 { |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
419 OrthancPlugins::DicomTag key(tag.GetGroup(), tag.GetElement()); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
420 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
421 std::string value; |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
422 if (source.GetStringValue(value, key)) |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
423 { |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
424 target.SetValue(tag, value, false); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
425 } |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
426 } |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
427 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
428 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
429 void ConvertDataset(Orthanc::DicomMap& target, |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
430 const OrthancPlugins::IDicomDataset& source) |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
431 { |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
432 target.Clear(); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
433 |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
434 AddTag(target, source, Orthanc::DICOM_TAG_BITS_ALLOCATED); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
435 AddTag(target, source, Orthanc::DICOM_TAG_BITS_STORED); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
436 AddTag(target, source, Orthanc::DICOM_TAG_COLUMNS); |
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
118
diff
changeset
|
437 AddTag(target, source, Orthanc::DICOM_TAG_DOSE_GRID_SCALING); |
118
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
438 AddTag(target, source, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
439 AddTag(target, source, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
440 AddTag(target, source, Orthanc::DICOM_TAG_HIGH_BIT); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
441 AddTag(target, source, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
442 AddTag(target, source, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
443 AddTag(target, source, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
444 AddTag(target, source, Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
445 AddTag(target, source, Orthanc::DICOM_TAG_PIXEL_REPRESENTATION); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
446 AddTag(target, source, Orthanc::DICOM_TAG_PIXEL_SPACING); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
447 AddTag(target, source, Orthanc::DICOM_TAG_PLANAR_CONFIGURATION); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
448 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_INTERCEPT); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
449 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_SLOPE); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
450 AddTag(target, source, Orthanc::DICOM_TAG_ROWS); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
451 AddTag(target, source, Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL); |
122
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
452 AddTag(target, source, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID); |
118
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
453 AddTag(target, source, Orthanc::DICOM_TAG_SLICE_THICKNESS); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
454 AddTag(target, source, Orthanc::DICOM_TAG_SOP_CLASS_UID); |
122
e3433dabfb8d
refactoring DicomStructureSet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
455 AddTag(target, source, Orthanc::DICOM_TAG_SOP_INSTANCE_UID); |
118
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
456 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_CENTER); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
457 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_WIDTH); |
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
458 } |
0 | 459 } |
460 } |