Mercurial > hg > orthanc-wsi
comparison Framework/Inputs/DicomPyramidInstance.cpp @ 226:4eefa34657f0
fix build
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 13 Jan 2021 13:17:03 +0100 |
parents | 443f219a68fd |
children | bab966288abe |
comparison
equal
deleted
inserted
replaced
225:96d1774148e7 | 226:4eefa34657f0 |
---|---|
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" | |
27 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" | 26 #include "../../Resources/Orthanc/Stone/DicomDatasetReader.h" |
28 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" | 27 #include "../../Resources/Orthanc/Stone/FullOrthancDataset.h" |
29 | 28 |
30 #include <Logging.h> | 29 #include <Logging.h> |
31 #include <OrthancException.h> | 30 #include <OrthancException.h> |
32 #include <SerializationToolbox.h> | 31 #include <SerializationToolbox.h> |
33 #include <Toolbox.h> | 32 #include <Toolbox.h> |
34 | 33 |
35 #include <cassert> | 34 #include <cassert> |
35 | |
36 #if !ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) | |
37 # include <json/writer.h> | |
38 #endif | |
36 | 39 |
37 #define SERIALIZED_METADATA "4201" // Was "4200" if versions <= 0.7 of this plugin | 40 #define SERIALIZED_METADATA "4201" // Was "4200" if versions <= 0.7 of this plugin |
38 | 41 |
39 | 42 |
40 namespace OrthancWSI | 43 namespace OrthancWSI |
348 content[TOTAL_WIDTH] = totalWidth_; | 351 content[TOTAL_WIDTH] = totalWidth_; |
349 content[TOTAL_HEIGHT] = totalHeight_; | 352 content[TOTAL_HEIGHT] = totalHeight_; |
350 content[PHOTOMETRIC_INTERPRETATION] = Orthanc::EnumerationToString(photometric_); | 353 content[PHOTOMETRIC_INTERPRETATION] = Orthanc::EnumerationToString(photometric_); |
351 content[IMAGE_TYPE] = imageType_; | 354 content[IMAGE_TYPE] = imageType_; |
352 | 355 |
353 OrthancPlugins::WriteFastJson(result, content); | 356 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) |
357 Orthanc::Toolbox::WriteFastJson(result, content); | |
358 #else | |
359 Json::FastWriter writer; | |
360 result = writer.write(content); | |
361 #endif | |
354 } | 362 } |
355 | 363 |
356 | 364 |
357 void DicomPyramidInstance::Deserialize(const std::string& s) | 365 void DicomPyramidInstance::Deserialize(const std::string& s) |
358 { | 366 { |
359 Json::Value content; | 367 Json::Value content; |
360 OrthancPlugins::ReadJson(content, s); | 368 OrthancStone::IOrthancConnection::ParseJson(content, s); |
361 | 369 |
362 if (content.type() != Json::objectValue || | 370 if (content.type() != Json::objectValue || |
363 !content.isMember(FRAMES) || | 371 !content.isMember(FRAMES) || |
364 content[FRAMES].type() != Json::arrayValue) | 372 content[FRAMES].type() != Json::arrayValue) |
365 { | 373 { |