changeset 42:b04559283a1d

updated Stone Web viewer to newer snapshot
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 31 Aug 2024 12:00:40 +0200
parents d0b0bb6dfb4a
children 678bbed285a1
files .hgignore Samples/MammographyDeepLearning/src/main/java/Main.java
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Jul 03 18:00:06 2024 +0200
+++ b/.hgignore	Sat Aug 31 12:00:40 2024 +0200
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 syntax: glob
+*.orig
 *~
 JavaSDK/i/
 Plugin/Build/
@@ -24,6 +25,7 @@
 Samples/MammographyDeepLearning/.idea/
 Samples/MammographyDeepLearning/2024-03-08-retina_res50_trained_08_03.torchscript
 Samples/MammographyDeepLearning/2024-03-15-StoneWebViewer-DICOM-SR.zip
+Samples/MammographyDeepLearning/2024-08-31-StoneWebViewer-DICOM-SR.zip
 Samples/MammographyDeepLearning/OrthancStorage/
 Samples/MammographyDeepLearning/dependency-reduced-pom.xml
 Samples/MammographyDeepLearning/libOrthancDicomWeb.so
--- a/Samples/MammographyDeepLearning/src/main/java/Main.java	Wed Jul 03 18:00:06 2024 +0200
+++ b/Samples/MammographyDeepLearning/src/main/java/Main.java	Sat Aug 31 12:00:40 2024 +0200
@@ -49,8 +49,8 @@
 
 public class Main {
     private static final String MODEL_PATH = "2024-03-08-retina_res50_trained_08_03.torchscript";
-    private static final String STONE_VERSION = "2024-03-15-StoneWebViewer-DICOM-SR";
-    private static final String STONE_PATH = "2024-03-15-StoneWebViewer-DICOM-SR.zip";
+    private static final String STONE_VERSION = "2024-08-31-StoneWebViewer-DICOM-SR";
+    private static final String STONE_PATH = "2024-08-31-StoneWebViewer-DICOM-SR.zip";
 
     private static ZipFile stone;
     private static NDManager manager;
@@ -60,12 +60,12 @@
     static {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         try {
-            OrthancConnection.download("2024-03-08-retina_res50_trained_08_03.torchscript", executor,
-                    "https://orthanc.uclouvain.be/downloads/cross-platform/orthanc-mammography/models/2024-03-08-retina_res50_trained_08_03.torchscript",
+            OrthancConnection.download(MODEL_PATH, executor,
+                    "https://orthanc.uclouvain.be/downloads/cross-platform/orthanc-mammography/models/" + MODEL_PATH,
                     146029397L, "b3de8f562de683bc3515fe93ae102fd4");
-            OrthancConnection.download("2024-03-15-StoneWebViewer-DICOM-SR.zip", executor,
-                    "https://github.com/jodogne/orthanc-mammography/raw/master/viewer/2024-03-15-StoneWebViewer-DICOM-SR.zip",
-                    4742571L, "de952da6fc74a9d4b78ca5064a6a7318");
+            OrthancConnection.download(STONE_PATH, executor,
+                    "https://github.com/jodogne/orthanc-mammography/raw/master/viewer/" + STONE_PATH,
+                    4815178L, "86b52a17f86e4769d12e9ae680c4a99f");
         } catch (IOException | NoSuchAlgorithmException | InterruptedException e) {
             throw new RuntimeException(e);
         } finally {