Mercurial > hg > orthanc-wsi
comparison Applications/ApplicationToolbox.cpp @ 151:fb8d4cd2f618
fix applications
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 17 Jul 2018 10:06:39 +0200 |
parents | a0f9a3df1110 |
children | a0a3530ff69c |
comparison
equal
deleted
inserted
replaced
150:442102e14933 | 151:fb8d4cd2f618 |
---|---|
20 | 20 |
21 | 21 |
22 #include "ApplicationToolbox.h" | 22 #include "ApplicationToolbox.h" |
23 | 23 |
24 #include "../Framework/Inputs/OpenSlideLibrary.h" | 24 #include "../Framework/Inputs/OpenSlideLibrary.h" |
25 #include "../Framework/MultiThreading/BagOfTasksProcessor.h" | |
25 | 26 |
26 #include <Core/DicomParsing/FromDcmtkBridge.h> | 27 #include <Core/DicomParsing/FromDcmtkBridge.h> |
27 #include <Core/HttpClient.h> | 28 #include <Core/HttpClient.h> |
28 #include <Core/Logging.h> | 29 #include <Core/Logging.h> |
29 #include <Core/MultiThreading/BagOfTasksProcessor.h> | |
30 #include <Core/OrthancException.h> | 30 #include <Core/OrthancException.h> |
31 #include <Core/SystemToolbox.h> | 31 #include <Core/SystemToolbox.h> |
32 #include <Core/Toolbox.h> | |
32 | 33 |
33 #include <boost/filesystem.hpp> | 34 #include <boost/filesystem.hpp> |
34 #include <boost/lexical_cast.hpp> | 35 #include <boost/lexical_cast.hpp> |
35 #include <boost/regex.hpp> | 36 #include <boost/regex.hpp> |
36 #include <boost/date_time/posix_time/posix_time.hpp> | 37 #include <boost/date_time/posix_time/posix_time.hpp> |
61 namespace ApplicationToolbox | 62 namespace ApplicationToolbox |
62 { | 63 { |
63 void GlobalInitialize() | 64 void GlobalInitialize() |
64 { | 65 { |
65 Orthanc::Logging::Initialize(); | 66 Orthanc::Logging::Initialize(); |
66 Orthanc::HttpClient::InitializeOpenSsl(); | 67 Orthanc::Toolbox::InitializeOpenSsl(); |
67 Orthanc::HttpClient::GlobalInitialize(); | 68 Orthanc::HttpClient::GlobalInitialize(); |
68 Orthanc::FromDcmtkBridge::InitializeDictionary(false /* don't load private dictionary */); | 69 Orthanc::FromDcmtkBridge::InitializeDictionary(false /* don't load private dictionary */); |
69 assert(DisplayPerformanceWarning()); | 70 assert(DisplayPerformanceWarning()); |
70 } | 71 } |
71 | 72 |
72 | 73 |
73 void GlobalFinalize() | 74 void GlobalFinalize() |
74 { | 75 { |
75 OrthancWSI::OpenSlideLibrary::Finalize(); | 76 OrthancWSI::OpenSlideLibrary::Finalize(); |
76 Orthanc::HttpClient::GlobalFinalize(); | 77 Orthanc::HttpClient::GlobalFinalize(); |
77 Orthanc::HttpClient::FinalizeOpenSsl(); | 78 Orthanc::Toolbox::FinalizeOpenSsl(); |
78 } | 79 } |
79 | 80 |
80 | 81 |
81 static void PrintProgress(Orthanc::BagOfTasksProcessor::Handle* handle, | 82 static void PrintProgress(Orthanc::BagOfTasksProcessor::Handle* handle, |
82 bool* done) | 83 bool* done) |