comparison Applications/DicomToTiff.cpp @ 61:147bd6dc28db

refactoring using new items in the plugin toolbox of Orthanc
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Nov 2016 17:15:55 +0100
parents 7a3853d51c45
children d529d9ce3c7e
comparison
equal deleted inserted replaced
60:a59fdb848a7b 61:147bd6dc28db
20 20
21 #include "../Framework/DicomToolbox.h" 21 #include "../Framework/DicomToolbox.h"
22 #include "../Framework/ImageToolbox.h" 22 #include "../Framework/ImageToolbox.h"
23 #include "../Framework/Inputs/DicomPyramid.h" 23 #include "../Framework/Inputs/DicomPyramid.h"
24 #include "../Framework/Inputs/TiledPyramidStatistics.h" 24 #include "../Framework/Inputs/TiledPyramidStatistics.h"
25 #include "../Framework/Messaging/CurlOrthancConnection.h"
26 #include "../Framework/Outputs/HierarchicalTiffWriter.h" 25 #include "../Framework/Outputs/HierarchicalTiffWriter.h"
27 26
28 #include "../Resources/Orthanc/Core/Logging.h" 27 #include "../Resources/Orthanc/Core/Logging.h"
29 #include "../Resources/Orthanc/Core/OrthancException.h" 28 #include "../Resources/Orthanc/Core/OrthancException.h"
29 #include "../Resources/Orthanc/Plugins/Samples/Common/OrthancHttpConnection.h"
30 30
31 #include "ApplicationToolbox.h" 31 #include "ApplicationToolbox.h"
32 32
33 #include <boost/program_options.hpp> 33 #include <boost/program_options.hpp>
34 34
297 if (options.count("password")) 297 if (options.count("password"))
298 { 298 {
299 params.SetPassword(options["password"].as<std::string>()); 299 params.SetPassword(options["password"].as<std::string>());
300 } 300 }
301 301
302 OrthancWSI::CurlOrthancConnection orthanc(params); 302 OrthancPlugins::OrthancHttpConnection orthanc(params);
303 OrthancWSI::DicomPyramid source(orthanc, options["input"].as<std::string>()); 303 OrthancWSI::DicomPyramid source(orthanc, options["input"].as<std::string>());
304 304
305 OrthancWSI::TiledPyramidStatistics stats(source); 305 OrthancWSI::TiledPyramidStatistics stats(source);
306 Run(stats, options); 306 Run(stats, options);
307 } 307 }