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