Mercurial > hg > orthanc-volview

changeset 29:963d42f5bbe7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to VolView mainline (commit 6df6e6e)
author Alain Mazy <am@orthanc.team>
date Mon, 24 Feb 2025 11:54:43 +0100
parents a26f5e7d8b28
children e2fd60bf5a09
files NEWS Resources/CreateVolViewDist.sh Resources/CreateVolViewDist/build.sh VolView/VolView-4.3.0.patch VolView/VolView-4.3.0.patch.license
diffstat 5 files changed, 5 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Jan 17 17:57:20 2025 +0100
+++ b/NEWS	Mon Feb 24 11:54:43 2025 +0100
@@ -1,6 +1,8 @@
 Pending changes in the mainline
 ===============================
 
+* Upgrade to VolView mainline (commit 6df6e6e).
+
 
 Version 1.2 (2025-01-17)
 ========================
--- a/Resources/CreateVolViewDist.sh	Fri Jan 17 17:57:20 2025 +0100
+++ b/Resources/CreateVolViewDist.sh	Mon Feb 24 11:54:43 2025 +0100
@@ -28,7 +28,8 @@
 set -ex
 
 if [ "$1" = "" ]; then
-    VERSION=4.3.0
+    #VERSION=4.3.0
+    VERSION=main-6df6e6e
 else
     VERSION=$1
 fi
@@ -61,7 +62,6 @@
 docker run -t ${DOCKER_FLAGS} --rm \
        --user $(id -u):$(id -g) \
        -v ${ROOT_DIR}/Resources/CreateVolViewDist/build.sh:/source/build.sh:ro \
-       -v ${ROOT_DIR}/VolView/VolView-${VERSION}.patch:/source/VolView-${VERSION}.patch:ro \
        -v ${ROOT_DIR}/VolView/VolView-${VERSION}.tar.gz:/source/VolView-${VERSION}.tar.gz:ro \
        -v ${ROOT_DIR}/VolView/dist/:/target:rw \
        ${IMAGE} \
--- a/Resources/CreateVolViewDist/build.sh	Fri Jan 17 17:57:20 2025 +0100
+++ b/Resources/CreateVolViewDist/build.sh	Mon Feb 24 11:54:43 2025 +0100
@@ -30,7 +30,7 @@
 tar xvf /source/VolView-$1.tar.gz
 
 cd /tmp/VolView-$1
-patch -p1 < /source/VolView-$1.patch
+# patch -p1 < /source/VolView-$1.patch
 npm install --cache /tmp/npm-cache
 npm run build --cache /tmp/npm-cache
 
--- a/VolView/VolView-4.3.0.patch	Fri Jan 17 17:57:20 2025 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-diff -urEb VolView-4.3.0.orig/src/io/itk/itkConfig.js VolView-4.3.0/src/io/itk/itkConfig.js
---- VolView-4.3.0.orig/src/io/itk/itkConfig.js  2025-01-16 18:46:08.962374027 +0100
-+++ VolView-4.3.0/src/io/itk/itkConfig.js       2025-01-17 11:10:48.362129043 +0100
-@@ -2,8 +2,15 @@
- 
- const base = import.meta.env.BASE_URL;
- 
--const fullUrl = (relative) =>
--  new URL(join(base, relative), document.location.origin).href;
-+const fullUrl = (relative) => {          // ex: /itk/image-io
-+  const u = new URL(document.location);  // ex: http://localhost:8043/orthanc/volview/index.html
-+  const origin = u.origin;               // ex: http://localhost:8043
-+  let pathParts = u.pathname.split('/'); // ex: ['', 'orthanc', 'volview', 'index.html']
-+  pathParts.pop();                       // ex: ['', 'orthanc', 'volview']          
-+
-+  const url = origin + pathParts.join('/') + relative; // ex http://localhost:8043/orthanc/volview/itk/image-io
-+  return url;
-+}
- 
- const itkConfig = {
-   pipelineWorkerUrl: fullUrl('/itk/itk-wasm-pipeline.min.worker.js'),
-diff -urEb VolView-4.3.0.orig/vite.config.ts VolView-4.3.0/vite.config.ts
---- VolView-4.3.0.orig/vite.config.ts   2025-01-16 18:46:08.862370324 +0100
-+++ VolView-4.3.0/vite.config.ts        2025-01-16 19:12:29.866854537 +0100
-@@ -114,6 +114,7 @@
-       },
-     ],
-   },
-+  base: './',
-   plugins: [
-     {
-       name: 'virtual-modules',
\ No newline at end of file
--- a/VolView/VolView-4.3.0.patch.license	Fri Jan 17 17:57:20 2025 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
-# SPDX-FileCopyrightText: 1999-2025 Kitware, USA
-#
-# SPDX-License-Identifier: Apache-2.0