Mercurial > hg > orthanc-wsi
comparison Framework/Inputs/DicomPyramidInstance.cpp @ 223:443f219a68fd
sync, compatibility with Orthanc framework 1.8.2
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 13 Jan 2021 09:23:22 +0100 |
parents | ef3f8c5126a4 |
children | 4eefa34657f0 |
comparison
equal
deleted
inserted
replaced
222:68cc194e69e5 | 223:443f219a68fd |
---|---|
21 | 21 |
22 #include "../PrecompiledHeadersWSI.h" | 22 #include "../PrecompiledHeadersWSI.h" |
23 #include "DicomPyramidInstance.h" | 23 #include "DicomPyramidInstance.h" |
24 | 24 |
25 #include "../DicomToolbox.h" | 25 #include "../DicomToolbox.h" |
26 #include "../../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" | |
26 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" | 27 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" |
27 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" | 28 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" |
28 | 29 |
29 #include <Logging.h> | 30 #include <Logging.h> |
30 #include <OrthancException.h> | 31 #include <OrthancException.h> |
347 content[TOTAL_WIDTH] = totalWidth_; | 348 content[TOTAL_WIDTH] = totalWidth_; |
348 content[TOTAL_HEIGHT] = totalHeight_; | 349 content[TOTAL_HEIGHT] = totalHeight_; |
349 content[PHOTOMETRIC_INTERPRETATION] = Orthanc::EnumerationToString(photometric_); | 350 content[PHOTOMETRIC_INTERPRETATION] = Orthanc::EnumerationToString(photometric_); |
350 content[IMAGE_TYPE] = imageType_; | 351 content[IMAGE_TYPE] = imageType_; |
351 | 352 |
352 Orthanc::Toolbox::WriteFastJson(result, content); | 353 OrthancPlugins::WriteFastJson(result, content); |
353 } | 354 } |
354 | 355 |
355 | 356 |
356 void DicomPyramidInstance::Deserialize(const std::string& s) | 357 void DicomPyramidInstance::Deserialize(const std::string& s) |
357 { | 358 { |
358 Json::Value content; | 359 Json::Value content; |
359 Orthanc::Toolbox::ReadJson(content, s); | 360 OrthancPlugins::ReadJson(content, s); |
360 | 361 |
361 if (content.type() != Json::objectValue || | 362 if (content.type() != Json::objectValue || |
362 !content.isMember(FRAMES) || | 363 !content.isMember(FRAMES) || |
363 content[FRAMES].type() != Json::arrayValue) | 364 content[FRAMES].type() != Json::arrayValue) |
364 { | 365 { |