# HG changeset patch # User Sebastien Jodogne # Date 1700635430 -3600 # Node ID ca376147db15b89fba6d5ed895f28af83f35c210 # Parent 2c11573602b9337d4642770e66321029b9370615# Parent 5653b633564259a19e1ee504ea86ba379512d1cd integration mainline->dicom-sr diff -r 2c11573602b9 -r ca376147db15 Applications/Samples/README.md --- a/Applications/Samples/README.md Tue Nov 14 11:45:39 2023 +0100 +++ b/Applications/Samples/README.md Wed Nov 22 07:43:50 2023 +0100 @@ -18,7 +18,7 @@ Orthanc can be retrieved with: ``` - hg clone https://hg.orthanc-server.com/orthanc + hg clone https://orthanc.uclouvain.be/hg/orthanc ``` Furthermore, the samples usually assume that an Orthanc is running locally, diff -r 2c11573602b9 -r ca376147db15 Applications/Samples/WebAssembly/docker-internal.sh --- a/Applications/Samples/WebAssembly/docker-internal.sh Tue Nov 14 11:45:39 2023 +0100 +++ b/Applications/Samples/WebAssembly/docker-internal.sh Wed Nov 22 07:43:50 2023 +0100 @@ -29,7 +29,7 @@ # Get the Orthanc framework cd /tmp/ -hg clone https://hg.orthanc-server.com/orthanc/ +hg clone https://orthanc.uclouvain.be/hg/orthanc/ # Make a copy of the read-only folder containing the source code into # a writeable folder, because of "DownloadPackage.cmake" that writes diff -r 2c11573602b9 -r ca376147db15 Applications/StoneWebViewer/BuildInstructions.txt --- a/Applications/StoneWebViewer/BuildInstructions.txt Tue Nov 14 11:45:39 2023 +0100 +++ b/Applications/StoneWebViewer/BuildInstructions.txt Wed Nov 22 07:43:50 2023 +0100 @@ -12,9 +12,9 @@ mkdir ~/dev cd ~/dev -hg clone https://hg.orthanc-server.com/orthanc/ -hg clone https://hg.orthanc-server.com/orthanc-stone/ -hg clone https://hg.orthanc-server.com/orthanc-dicomweb/ +hg clone https://orthanc.uclouvain.be/hg/orthanc/ +hg clone https://orthanc.uclouvain.be/hg/orthanc-stone/ +hg clone https://orthanc.uclouvain.be/hg/orthanc-dicomweb/ mkdir -p ~/dev/build/orthanc mkdir -p ~/dev/build/orthanc-dicomweb mkdir -p ~/dev/build/wasm-stone-viewer diff -r 2c11573602b9 -r ca376147db15 Applications/StoneWebViewer/NOTES.txt --- a/Applications/StoneWebViewer/NOTES.txt Tue Nov 14 11:45:39 2023 +0100 +++ b/Applications/StoneWebViewer/NOTES.txt Wed Nov 22 07:43:50 2023 +0100 @@ -26,7 +26,7 @@ - The Stone Web viewer uses the DICOM identifiers, while the Osimis Web viewer uses the Orthanc identifiers. - https://book.orthanc-server.com/faq/orthanc-ids.html + https://orthanc.uclouvain.be/book/faq/orthanc-ids.html In the Stone Web viewer, the studies are indexed by their "Study Instance UID" tag (0020,000d). The series are indexed by their diff -r 2c11573602b9 -r ca376147db15 CITATION.cff --- a/CITATION.cff Tue Nov 14 11:45:39 2023 +0100 +++ b/CITATION.cff Wed Nov 22 07:43:50 2023 +0100 @@ -14,7 +14,7 @@ - type: url value: 'http://hdl.handle.net/2078.1/277125' description: On the Use of WebAssembly for Rendering and Segmenting Medical Images -repository-code: 'https://hg.orthanc-server.com/orthanc-stone/' +repository-code: 'https://orthanc.uclouvain.be/hg/orthanc-stone/' url: 'https://www.orthanc-server.com/' license: AGPL-3.0-or-later version: 2.5 diff -r 2c11573602b9 -r ca376147db15 OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Nov 14 11:45:39 2023 +0100 +++ b/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Nov 22 07:43:50 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}") diff -r 2c11573602b9 -r ca376147db15 OrthancStone/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake --- a/OrthancStone/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Tue Nov 14 11:45:39 2023 +0100 +++ b/OrthancStone/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Wed Nov 22 07:43:50 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}") diff -r 2c11573602b9 -r ca376147db15 OrthancStone/Resources/SyncOrthancFolder.py --- a/OrthancStone/Resources/SyncOrthancFolder.py Tue Nov 14 11:45:39 2023 +0100 +++ b/OrthancStone/Resources/SyncOrthancFolder.py Wed Nov 22 07:43:50 2023 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Stone of Orthanc # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics diff -r 2c11573602b9 -r ca376147db15 README --- a/README Tue Nov 14 11:45:39 2023 +0100 +++ b/README Wed Nov 22 07:43:50 2023 +0100 @@ -81,7 +81,7 @@ Build instructions and usage details are available as part of the Orthanc Book: -http://book.orthanc-server.com/developers/stone.html +https://orthanc.uclouvain.be/book/developers/stone.html Stone of Orthanc comes with several sample applications in the "Applications/Samples" folder. Please check the @@ -116,7 +116,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 diff -r 2c11573602b9 -r ca376147db15 RenderingPlugin/Resources/SyncOrthancFolder.py --- a/RenderingPlugin/Resources/SyncOrthancFolder.py Tue Nov 14 11:45:39 2023 +0100 +++ b/RenderingPlugin/Resources/SyncOrthancFolder.py Wed Nov 22 07:43:50 2023 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Stone of Orthanc # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics diff -r 2c11573602b9 -r ca376147db15 TODO --- a/TODO Tue Nov 14 11:45:39 2023 +0100 +++ b/TODO Wed Nov 22 07:43:50 2023 +0100 @@ -1,4 +1,4 @@ -Update OrthancFramework to 1.12.1 to benefit from https://hg.orthanc-server.com/orthanc/rev/57c0fba5e5c7 +Update OrthancFramework to 1.12.1 to benefit from https://orthanc.uclouvain.be/hg/orthanc/rev/57c0fba5e5c7 ====================== == Stone Web viewer == @@ -10,7 +10,7 @@ * Save/load annotations as attachments of their parent series (including detection of collisions thanks to revisions). - https://book.orthanc-server.com/faq/features.html#metadata-attachments + https://orthanc.uclouvain.be/book/faq/features.html#metadata-attachments * Internationalization and translations (i18n). Some possible libraries: https://phrase.com/blog/posts/the-best-javascript-i18n-libraries/ @@ -113,7 +113,7 @@ => A solution for AMD64 architectures is to use the standalone Debian repository that is provided by Sebastien Jodogne: - https://book.orthanc-server.com/users/cookbook.html#obtaining-binaries + https://orthanc.uclouvain.be/book/users/cookbook.html#obtaining-binaries