Mercurial > hg > orthanc-gcp
changeset 40:16cf7c2eb806
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Nov 2020 18:12:00 +0100 |
| parents | 56c9b700a0db |
| children | 1a96ab7b6877 |
| files | CMakeLists.txt Plugin/GoogleAccount.cpp Plugin/GoogleConfiguration.cpp Plugin/GoogleUpdater.cpp Plugin/Plugin.cpp Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h |
| diffstat | 7 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Aug 04 14:19:27 2020 +0200 +++ b/CMakeLists.txt Fri Nov 06 18:12:00 2020 +0100 @@ -111,11 +111,14 @@ set(ORTHANC_CORE_SOURCES ${ORTHANC_CORE_SOURCES_DEPENDENCIES} ${ORTHANC_FRAMEWORK_ROOT}/ChunkedBuffer.cpp + ${ORTHANC_FRAMEWORK_ROOT}/DicomFormat/DicomTag.cpp ${ORTHANC_FRAMEWORK_ROOT}/Enumerations.cpp ${ORTHANC_FRAMEWORK_ROOT}/HttpClient.cpp ${ORTHANC_FRAMEWORK_ROOT}/Logging.cpp + ${ORTHANC_FRAMEWORK_ROOT}/OrthancException.cpp ${ORTHANC_FRAMEWORK_ROOT}/SystemToolbox.cpp ${ORTHANC_FRAMEWORK_ROOT}/Toolbox.cpp + ${ORTHANC_FRAMEWORK_ROOT}/WebServiceParameters.cpp ) endif()
--- a/Plugin/GoogleAccount.cpp Tue Aug 04 14:19:27 2020 +0200 +++ b/Plugin/GoogleAccount.cpp Fri Nov 06 18:12:00 2020 +0100 @@ -31,6 +31,7 @@ #include "GoogleAccount.h" +#include <Logging.h> #include <Toolbox.h> void GoogleAccount::LoadAuthorizedUser(const std::string& json)
--- a/Plugin/GoogleConfiguration.cpp Tue Aug 04 14:19:27 2020 +0200 +++ b/Plugin/GoogleConfiguration.cpp Fri Nov 06 18:12:00 2020 +0100 @@ -32,14 +32,13 @@ #include "GoogleConfiguration.h" - -#define DEFAULT_GOOGLE_URL "https://healthcare.googleapis.com/v1beta1/" -#define DEFAULT_DICOMWEB_PLUGIN_ROOT "/dicom-web" - +#include <Logging.h> #include <boost/thread/mutex.hpp> +#define DEFAULT_GOOGLE_URL "https://healthcare.googleapis.com/v1beta1/" +#define DEFAULT_DICOMWEB_PLUGIN_ROOT "/dicom-web" #define HAS_ORTHANC_FRAMEWORK_1_5_7 0 // TODO - Update to 1.5.7 once available + CMakeLists.txt
--- a/Plugin/GoogleUpdater.cpp Tue Aug 04 14:19:27 2020 +0200 +++ b/Plugin/GoogleUpdater.cpp Fri Nov 06 18:12:00 2020 +0100 @@ -33,6 +33,8 @@ #include "GoogleConfiguration.h" +#include <Logging.h> + #include <google/cloud/storage/internal/curl_handle_factory.h> #include <google/cloud/storage/oauth2/google_credentials.h>
--- a/Plugin/Plugin.cpp Tue Aug 04 14:19:27 2020 +0200 +++ b/Plugin/Plugin.cpp Fri Nov 06 18:12:00 2020 +0100 @@ -35,6 +35,7 @@ #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" #include <HttpClient.h> +#include <Logging.h> #include <Toolbox.h>
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Aug 04 14:19:27 2020 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Nov 06 18:12:00 2020 +0100 @@ -112,6 +112,12 @@ set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2") set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3") + set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4") + set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0") + set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Tue Aug 04 14:19:27 2020 +0200 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Fri Nov 06 18:12:00 2020 +0100 @@ -779,7 +779,7 @@ void UpdateProgress(float progress); public: - OrthancJob(const std::string& jobType); + explicit OrthancJob(const std::string& jobType); virtual ~OrthancJob() {