Mercurial > hg > orthanc-dicomweb
changeset 779:c3e479690bf5
sync orthanc + use framework 1.13.0
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Mon, 17 Aug 2026 09:32:26 +0200 |
| parents | a7b50450570c |
| children | 83ef6cd2e724 |
| files | CMakeLists.txt Plugin/Configuration.cpp Plugin/DicomWebFormatter.cpp Plugin/WadoRs.cpp Resources/Orthanc/CMake/DownloadOrthancFramework.cmake |
| diffstat | 5 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Aug 11 12:47:50 2026 +0200 +++ b/CMakeLists.txt Mon Aug 17 09:32:26 2026 +0200 @@ -29,9 +29,7 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - # Do NOT use framework 1.12.11 here, which is buggy because of: - # https://orthanc.uclouvain.be/hg/orthanc/rev/3bd8715e21bc - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.10") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.13.0") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif()
--- a/Plugin/Configuration.cpp Tue Aug 11 12:47:50 2026 +0200 +++ b/Plugin/Configuration.cpp Mon Aug 17 09:32:26 2026 +0200 @@ -367,10 +367,10 @@ } else if (value == ARRAY_OF_VALUES) { -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 12) +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 13, 0) otherBinaryMode_ = OrthancPluginDicomWebBinaryMode_ArrayOfValues; #else - LOG(WARNING) << "You need to compile the DICOMweb plugin against Orthanc SDK >= 1.12.12 to use the \"" + LOG(WARNING) << "You need to compile the DICOMweb plugin against Orthanc SDK >= 1.13.0 to use the \"" << ARRAY_OF_VALUES << "\" value in option \"" << OTHER_BINARY_MODE << "\", fallback to default \"" << BULK_DATA_URI << "\""; otherBinaryMode_ = OrthancPluginDicomWebBinaryMode_BulkDataUri;
--- a/Plugin/DicomWebFormatter.cpp Tue Aug 11 12:47:50 2026 +0200 +++ b/Plugin/DicomWebFormatter.cpp Mon Aug 17 09:32:26 2026 +0200 @@ -67,7 +67,7 @@ { effectiveMode = that.otherBinaryMode_; } -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 12) +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 13, 0) else if (vr == OrthancPluginValueRepresentation_OD || vr == OrthancPluginValueRepresentation_OL || vr == OrthancPluginValueRepresentation_OV) @@ -78,7 +78,7 @@ switch (effectiveMode) { -#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 12) +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 13, 0) case OrthancPluginDicomWebBinaryMode_ArrayOfValues: #endif
--- a/Plugin/WadoRs.cpp Tue Aug 11 12:47:50 2026 +0200 +++ b/Plugin/WadoRs.cpp Mon Aug 17 09:32:26 2026 +0200 @@ -541,7 +541,7 @@ static void PreloaderWorkerThread(ThreadedInstanceLoader* that) { -#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 12) +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 13, 0) Orthanc::Logging::ScopedCurrentThreadNameSetter setter(GetWadoLoaderThreadName()); #endif @@ -1751,7 +1751,7 @@ void InstanceWorkerThread(InstanceWorkerData* data) { -#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 12) +#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 13, 0) Orthanc::Logging::ScopedCurrentThreadNameSetter setter(std::string("DW-META-") + boost::lexical_cast<std::string>(data->GetThreadId())); #endif
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Aug 11 12:47:50 2026 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Aug 17 09:32:26 2026 +0200 @@ -179,6 +179,8 @@ set(ORTHANC_FRAMEWORK_MD5 "d5e1ba442104c89a24013cb859a9d6bf") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.11") set(ORTHANC_FRAMEWORK_MD5 "389b273b64b513ba8fc3233f34201cc1") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.13.0") + set(ORTHANC_FRAMEWORK_MD5 "cc95d3e509612b541e10e91c831fbfe3") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -238,6 +240,11 @@ # for HttpClient that returns the answer body in case of HTTP error set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "665f8aa70d7c5091bc20da37cf664910") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "004b351797fe") + # PixelsMasker 0.1.2 (framework post-1.12.11) + # for ScopedThreadNameSetter + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) + set(ORTHANC_FRAMEWORK_MD5 "f078ca997217b831ab3f6741f08a8c07") endif() endif() endif()