Mercurial > hg > orthanc-volview

changeset 20:496db8eaa8ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated VolView to 4.3.0
author Alain Mazy <am@orthanc.team>
date Fri, 17 Jan 2025 11:19:46 +0100
parents 9d35ffe3e321
children 6a7a924e31ef
files .hgignore NEWS Resources/CreateVolViewDist.sh VolView/VolView-4.1.1.patch VolView/VolView-4.1.1.patch.license VolView/VolView-4.3.0.patch VolView/VolView-4.3.0.patch.license
diffstat 7 files changed, 39 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Apr 06 17:34:19 2024 +0200
+++ b/.hgignore	Fri Jan 17 11:19:46 2025 +0100
@@ -7,3 +7,4 @@
 VolView/VolView-*.tar.gz
 VolView/dist
 i/
+.vscode/
\ No newline at end of file
--- a/NEWS	Sat Apr 06 17:34:19 2024 +0200
+++ b/NEWS	Fri Jan 17 11:19:46 2025 +0100
@@ -1,6 +1,7 @@
 Pending changes in the mainline
 ===============================
 
+* Upgrade to VolView 4.3.0
 * Patch to make the build of static assets reproducible, following a
   suggestion by Bernhard M. Wiedemann (bwiedemann@suse.de)
 
--- a/Resources/CreateVolViewDist.sh	Sat Apr 06 17:34:19 2024 +0200
+++ b/Resources/CreateVolViewDist.sh	Fri Jan 17 11:19:46 2025 +0100
@@ -28,7 +28,7 @@
 set -ex
 
 if [ "$1" = "" ]; then
-    VERSION=4.1.1
+    VERSION=4.3.0
 else
     VERSION=$1
 fi
--- a/VolView/VolView-4.1.1.patch	Sat Apr 06 17:34:19 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-diff -urEb VolView-4.1.1.orig/src/config.ts VolView-4.1.1/src/config.ts
---- VolView-4.1.1.orig/src/config.ts	2023-05-19 12:58:22.916872311 +0200
-+++ VolView-4.1.1/src/config.ts	2023-05-19 13:01:13.557196054 +0200
-@@ -124,7 +124,7 @@
- } as Record<number, number[]>;
- 
- export const SAMPLE_DATA: SampleDataset[] = [
--  {
-+  /*{
-     name: 'CTA Head and Neck',
-     filename: 'CTA-Head_and_Neck.zip',
-     description:
-@@ -163,7 +163,7 @@
-       '3D ultrasound of a baby. Downloaded from tomovision.com.(8 MB)',
-     url: 'https://data.kitware.com/api/v1/item/635679c311dab8142820a4f4/download',
-     image: USFetusThumbnail,
--  },
-+  },*/
- ];
- 
- export const TOOL_COLORS = [
-diff -urEb VolView-4.1.1.orig/src/io/itk/itkConfig.js VolView-4.1.1/src/io/itk/itkConfig.js
---- VolView-4.1.1.orig/src/io/itk/itkConfig.js	2023-05-19 12:58:22.924872326 +0200
-+++ VolView-4.1.1/src/io/itk/itkConfig.js	2023-05-19 12:58:52.900929265 +0200
-@@ -1,9 +1,11 @@
- const base = process.env.VUE_APP_PUBLIC_PATH ?? '';
- const itkConfig = {
--  pipelineWorkerUrl: `${base}/itk/pipeline.worker.js`,
--  imageIOUrl: `${base}/itk/image-io`,
--  meshIOUrl: `${base}/itk/mesh-io`,
--  pipelinesUrl: `${base}/itk/pipelines`,
-+  pipelineWorkerUrl: `./itk/pipeline.worker.js`,
-+
-+  // The URIs below are relative to "pipeline.worker.js"
-+  imageIOUrl: `./image-io`,
-+  meshIOUrl: `./mesh-io`,
-+  pipelinesUrl: `./pipelines`,
- };
- 
- export default itkConfig;
-diff -urEb VolView-4.1.1.orig/vue.config.js VolView-4.1.1/vue.config.js
---- VolView-4.1.1.orig/vue.config.js	2023-05-19 12:58:22.916872311 +0200
-+++ VolView-4.1.1/vue.config.js	2023-05-19 12:59:16.820974677 +0200
-@@ -31,7 +31,7 @@
-       return args;
-     });
-   },
--  publicPath: process.env.VUE_APP_PUBLIC_PATH || '/',
-+  publicPath: process.env.VUE_APP_PUBLIC_PATH || '.',
-   configureWebpack: {
-     devtool: 'source-map',
-     resolve: {
--- a/VolView/VolView-4.1.1.patch.license	Sat Apr 06 17:34:19 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium
-# SPDX-FileCopyrightText: 1999-2024 Kitware, USA
-#
-# SPDX-License-Identifier: Apache-2.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/VolView/VolView-4.3.0.patch	Fri Jan 17 11:19:46 2025 +0100
@@ -0,0 +1,32 @@
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/VolView/VolView-4.3.0.patch.license	Fri Jan 17 11:19:46 2025 +0100
@@ -0,0 +1,4 @@
+# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium
+# SPDX-FileCopyrightText: 1999-2024 Kitware, USA
+#
+# SPDX-License-Identifier: Apache-2.0