Mercurial > hg > orthanc-wsi

comparison Applications/Dicomizer.cpp @ 223:443f219a68fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 20bc074ec19a
children 4eefa34657f0
comparison
equal deleted inserted replaced
222:68cc194e69e5 223:443f219a68fd
31 #include "../Framework/Inputs/TiledPngImage.h" 31 #include "../Framework/Inputs/TiledPngImage.h"
32 #include "../Framework/Inputs/TiledPyramidStatistics.h" 32 #include "../Framework/Inputs/TiledPyramidStatistics.h"
33 #include "../Framework/MultiThreading/BagOfTasksProcessor.h" 33 #include "../Framework/MultiThreading/BagOfTasksProcessor.h"
34 #include "../Framework/Outputs/DicomPyramidWriter.h" 34 #include "../Framework/Outputs/DicomPyramidWriter.h"
35 #include "../Framework/Outputs/TruncatedPyramidWriter.h" 35 #include "../Framework/Outputs/TruncatedPyramidWriter.h"
36 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
36 37
37 #include <Compatibility.h> // For std::unique_ptr 38 #include <Compatibility.h> // For std::unique_ptr
38 #include <DicomParsing/FromDcmtkBridge.h> 39 #include <DicomParsing/FromDcmtkBridge.h>
39 #include <Logging.h> 40 #include <Logging.h>
40 #include <OrthancException.h> 41 #include <OrthancException.h>
295 else 296 else
296 { 297 {
297 std::string content; 298 std::string content;
298 Orthanc::SystemToolbox::ReadFile(content, path); 299 Orthanc::SystemToolbox::ReadFile(content, path);
299 300
300 if (!Orthanc::Toolbox::ReadJsonWithoutComments(json, content)) 301 if (!OrthancPlugins::ReadJsonWithoutComments(json, content))
301 { 302 {
302 LOG(ERROR) << "Cannot parse the JSON file in: " << path; 303 LOG(ERROR) << "Cannot parse the JSON file in: " << path;
303 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); 304 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
304 } 305 }
305 } 306 }
469 470
470 std::string brightfield; 471 std::string brightfield;
471 Orthanc::EmbeddedResources::GetFileResource(brightfield, Orthanc::EmbeddedResources::BRIGHTFIELD_OPTICAL_PATH); 472 Orthanc::EmbeddedResources::GetFileResource(brightfield, Orthanc::EmbeddedResources::BRIGHTFIELD_OPTICAL_PATH);
472 473
473 Json::Value json; 474 Json::Value json;
474 if (!Orthanc::Toolbox::ReadJsonWithoutComments(json, brightfield)) 475 if (!OrthancPlugins::ReadJsonWithoutComments(json, brightfield))
475 { 476 {
476 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); 477 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
477 } 478 }
478 479
479 std::unique_ptr<DcmElement> element(Orthanc::FromDcmtkBridge::FromJson( 480 std::unique_ptr<DcmElement> element(Orthanc::FromDcmtkBridge::FromJson(