Mercurial > hg > orthanc-python

changeset 148:8335b42be9fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
migration to UCLouvain servers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 22 Nov 2023 07:17:40 +0100
parents 41cd08e0e878
children 0705e324fcc8
files README Resources/Builders/MinGW32-Python2.7/docker-internal.sh Resources/Builders/MinGW32-Python3.10/docker-internal.sh Resources/Builders/MinGW32-Python3.11/docker-internal.sh Resources/Builders/MinGW32-Python3.7/docker-internal.sh Resources/Builders/MinGW32-Python3.8/docker-internal.sh Resources/Builders/MinGW32-Python3.9/docker-internal.sh Resources/Builders/MinGW64-Python2.7/docker-internal.sh Resources/Builders/MinGW64-Python3.10/docker-internal.sh Resources/Builders/MinGW64-Python3.11/docker-internal.sh Resources/Builders/MinGW64-Python3.7/docker-internal.sh Resources/Builders/MinGW64-Python3.8/docker-internal.sh Resources/Builders/MinGW64-Python3.9/docker-internal.sh Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Resources/Orthanc/Sdk-1.10.0/orthanc/OrthancCPlugin.h
diffstat 16 files changed, 61 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/README	Mon Nov 20 08:59:48 2023 +0100
+++ b/README	Wed Nov 22 07:17:40 2023 +0100
@@ -15,7 +15,7 @@
 
 Build instructions and usage details are available as part of the
 Orthanc Book:
-http://book.orthanc-server.com/plugins/python.html
+https://orthanc.uclouvain.be/book/plugins/python.html
 
 
 Contributing
@@ -23,7 +23,7 @@
 
 Instructions for contributing to the Orthanc project are included in
 the Orthanc Book:
-https://book.orthanc-server.com/developers/repositories.html
+https://orthanc.uclouvain.be/book/developers/repositories.html
 
 
 Licensing
--- a/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-2.7.17-win32.tar.bz2
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-2.7.17-win32.tar.bz2
 tar xfj python-2.7.17-win32.tar.bz2
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW32-Python3.10/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python3.10/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.10.10-win32.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.10.10-win32.zip
 unzip python-3.10.10-win32.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW32-Python3.11/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python3.11/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.11.2-win32.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.11.2-win32.zip
 unzip python-3.11.2-win32.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.7.7-win32.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.7.7-win32.zip
 unzip python-3.7.7-win32.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.8.3-win32.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.8.3-win32.zip
 unzip python-3.8.3-win32.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW32-Python3.9/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW32-Python3.9/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.9.13-win32.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.9.13-win32.zip
 unzip python-3.9.13-win32.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-2.7.17-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-2.7.17-win64.zip
 unzip python-2.7.17-win64.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW64-Python3.10/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python3.10/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.10.10-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.10.10-win64.zip
 unzip python-3.10.10-win64.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW64-Python3.11/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python3.11/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.11.2-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.11.2-win64.zip
 unzip python-3.11.2-win64.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.7.7-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.7.7-win64.zip
 unzip python-3.7.7-win64.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.8.3-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.8.3-win64.zip
 unzip python-3.8.3-win64.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW64-Python3.9/docker-internal.sh	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Builders/MinGW64-Python3.9/docker-internal.sh	Wed Nov 22 07:17:40 2023 +0100
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget https://orthanc.uclouvain.be/third-party-downloads/Python/python-3.9.13-win64.zip
+wget https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.9.13-win64.zip
 unzip python-3.9.13-win64.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Nov 22 07:17:40 2023 +0100
@@ -168,21 +168,27 @@
       #
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
         # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
         # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800")
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
         # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11"
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
         # DICOMweb 1.15 (framework pre-1.12.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
       endif()
     endif()
@@ -320,7 +326,11 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    if (ORTHANC_FRAMEWORK_PRE_RELEASE)
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    else()
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
+    endif()
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
--- a/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake	Wed Nov 22 07:17:40 2023 +0100
@@ -50,7 +50,7 @@
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
   set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1)
-  set(GOOGLE_TEST_URL "https://orthanc.uclouvain.be/third-party-downloads/gtest-1.8.1.tar.gz")
+  set(GOOGLE_TEST_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/gtest-1.8.1.tar.gz")
   set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596")
 
   DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
--- a/Resources/Orthanc/Sdk-1.10.0/orthanc/OrthancCPlugin.h	Mon Nov 20 08:59:48 2023 +0100
+++ b/Resources/Orthanc/Sdk-1.10.0/orthanc/OrthancCPlugin.h	Wed Nov 22 07:17:40 2023 +0100
@@ -837,7 +837,7 @@
    **/
   typedef enum
   {
-    OrthancPluginDicomToJsonFlags_None                  = 0,         /*!< Default formatting */
+    OrthancPluginDicomToJsonFlags_None                  = 0,
     OrthancPluginDicomToJsonFlags_IncludeBinary         = (1 << 0),  /*!< Include the binary tags */
     OrthancPluginDicomToJsonFlags_IncludePrivateTags    = (1 << 1),  /*!< Include the private tags */
     OrthancPluginDicomToJsonFlags_IncludeUnknownTags    = (1 << 2),  /*!< Include the tags unknown by the dictionary */
@@ -858,7 +858,7 @@
    **/
   typedef enum
   {
-    OrthancPluginCreateDicomFlags_None                  = 0,         /*!< Default mode */
+    OrthancPluginCreateDicomFlags_None                  = 0,
     OrthancPluginCreateDicomFlags_DecodeDataUriScheme   = (1 << 0),  /*!< Decode fields encoded using data URI scheme */
     OrthancPluginCreateDicomFlags_GenerateIdentifiers   = (1 << 1),  /*!< Automatically generate DICOM identifiers */
 
@@ -975,46 +975,32 @@
    **/
   typedef enum
   {
-    /**
-     * Success: The DICOM instance is properly stored in the SCP
-     **/
     OrthancPluginStorageCommitmentFailureReason_Success = 0,
-
-    /**
-     * 0110H: A general failure in processing the operation was encountered
-     **/
+    /*!< Success: The DICOM instance is properly stored in the SCP */
+
     OrthancPluginStorageCommitmentFailureReason_ProcessingFailure = 1,
-
-    /**
-     * 0112H: One or more of the elements in the Referenced SOP
-     * Instance Sequence was not available
-     **/
+    /*!< 0110H: A general failure in processing the operation was encountered */
+
     OrthancPluginStorageCommitmentFailureReason_NoSuchObjectInstance = 2,
-
-    /**
-     * 0213H: The SCP does not currently have enough resources to
-     * store the requested SOP Instance(s)
-     **/
+    /*!< 0112H: One or more of the elements in the Referenced SOP
+      Instance Sequence was not available */
+
     OrthancPluginStorageCommitmentFailureReason_ResourceLimitation = 3,
-
-    /**
-     * 0122H: Storage Commitment has been requested for a SOP Instance
-     * with a SOP Class that is not supported by the SCP
-     **/
+    /*!< 0213H: The SCP does not currently have enough resources to
+      store the requested SOP Instance(s) */
+
     OrthancPluginStorageCommitmentFailureReason_ReferencedSOPClassNotSupported = 4,
-
-    /**
-     * 0119H: The SOP Class of an element in the Referenced SOP
-     * Instance Sequence did not correspond to the SOP class
-     * registered for this SOP Instance at the SCP
-     **/
+    /*!< 0122H: Storage Commitment has been requested for a SOP
+      Instance with a SOP Class that is not supported by the SCP */
+
     OrthancPluginStorageCommitmentFailureReason_ClassInstanceConflict = 5,
-
-    /**
-     * 0131H: The Transaction UID of the Storage Commitment Request is
-     * already in use
-     **/
+    /*!< 0119H: The SOP Class of an element in the Referenced SOP
+      Instance Sequence did not correspond to the SOP class registered
+      for this SOP Instance at the SCP */
+
     OrthancPluginStorageCommitmentFailureReason_DuplicateTransactionUID = 6
+    /*!< 0131H: The Transaction UID of the Storage Commitment Request
+      is already in use */
   } OrthancPluginStorageCommitmentFailureReason;
 
 
@@ -1843,16 +1829,15 @@
    * @see OrthancPluginCheckVersion
    * @ingroup Callbacks
    **/
-  ORTHANC_PLUGIN_INLINE int32_t  OrthancPluginCheckVersionAdvanced(
+  ORTHANC_PLUGIN_INLINE int  OrthancPluginCheckVersionAdvanced(
     OrthancPluginContext* context,
-    int32_t expectedMajor,
-    int32_t expectedMinor,
-    int32_t expectedRevision)
-  {
-    int32_t major, minor, revision;
-
-    if (sizeof(int) != sizeof(int32_t) || /* Ensure binary compatibility with Orthanc SDK <= 1.12.1 */
-        sizeof(int32_t) != sizeof(OrthancPluginErrorCode) ||
+    int expectedMajor,
+    int expectedMinor,
+    int expectedRevision)
+  {
+    int major, minor, revision;
+
+    if (sizeof(int32_t) != sizeof(OrthancPluginErrorCode) ||
         sizeof(int32_t) != sizeof(OrthancPluginHttpMethod) ||
         sizeof(int32_t) != sizeof(_OrthancPluginService) ||
         sizeof(int32_t) != sizeof(_OrthancPluginProperty) ||
@@ -1950,7 +1935,7 @@
    * @see OrthancPluginCheckVersionAdvanced
    * @ingroup Callbacks
    **/
-  ORTHANC_PLUGIN_INLINE int32_t  OrthancPluginCheckVersion(
+  ORTHANC_PLUGIN_INLINE int  OrthancPluginCheckVersion(
     OrthancPluginContext* context)
   {
     return OrthancPluginCheckVersionAdvanced(
@@ -3092,7 +3077,7 @@
    * @return 1 if the metadata is present, 0 if it is absent, -1 in case of error.
    * @ingroup DicomInstance
    **/
-  ORTHANC_PLUGIN_INLINE int32_t  OrthancPluginHasInstanceMetadata(
+  ORTHANC_PLUGIN_INLINE int  OrthancPluginHasInstanceMetadata(
     OrthancPluginContext*              context,
     const OrthancPluginDicomInstance*  instance,
     const char*                        metadata)
@@ -3871,13 +3856,13 @@
     OrthancPluginContext*    context,
     OrthancPluginRestOutput* output,
     uint16_t                 status,
-    const void*              body,
+    const char*              body,
     uint32_t                 bodySize)
   {
     _OrthancPluginSendHttpStatus params;
     params.output = output;
     params.status = status;
-    params.body = reinterpret_cast<const char*>(body);
+    params.body = body;
     params.bodySize = bodySize;
     context->InvokeService(context, _OrthancPluginService_SendHttpStatus, &params);
   }
@@ -6775,7 +6760,7 @@
   {
     char**             resultId;
     OrthancPluginJob  *job;
-    int32_t            priority;
+    int                priority;
   } _OrthancPluginSubmitJob;
 
   /**
@@ -6794,7 +6779,7 @@
   ORTHANC_PLUGIN_INLINE char *OrthancPluginSubmitJob(
     OrthancPluginContext   *context,
     OrthancPluginJob       *job,
-    int32_t                 priority)
+    int                     priority)
   {
     char* resultId = NULL;