Merge pull request #60 from tdiprima/develop

Develop
halcyon-project · Feb 9, 2024 · d1c236c · d1c236c
2 parents d347969 + 29d2330
commit d1c236c
Show file tree

Hide file tree

Showing 3,840 changed files with 371,190 additions and 133,918 deletions.
diff --git a/Halcyon/src/main/java/com/ebremer/halcyon/gui/ViewerPanel.html b/Halcyon/src/main/java/com/ebremer/halcyon/gui/ViewerPanel.html
@@ -3,7 +3,7 @@
 <wicket:head>
     <link href="multi-viewer/css/main.min.css" rel="stylesheet">
     <link href="multi-viewer/vendor/color-picker/index.min.css" rel="stylesheet">
-    <link href="multi-viewer/vendor/fontawesome-free-5.15.3-web/css/all.min.css" rel="stylesheet">
+    <link href="multi-viewer/vendor/fontawesome-free-6.5.1-web/css/all.min.css" rel="stylesheet">
 </wicket:head>
 <body>
 <wicket:panel>

diff --git a/Halcyon/src/main/java/com/ebremer/halcyon/wicket/ethereal/Zephyr2.html b/Halcyon/src/main/java/com/ebremer/halcyon/wicket/ethereal/Zephyr2.html
@@ -2,8 +2,8 @@
 <html lang="en">
 <wicket:head>
     <style> body { margin: 0; } </style>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <link rel="stylesheet" href="/multi-viewer/css/main.min.css">
+    <link href="/multi-viewer/vendor/fontawesome-free-6.5.1-web/css/all.min.css" rel="stylesheet">
     <script src="/zephyr/js/jsts.min.js"></script>
 </wicket:head>
 
@@ -24,7 +24,7 @@
 	import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
 	import { TrackballControls } from 'three/addons/controls/TrackballControls.js';
         import * as ZEPHYR from 'zephyr';
-        import { annotationTools } from '/zephyr/annotations/annotationTools.js';
+        import { toolbar } from '/zephyr/toolbar.js';
 
         function onWindowResize() {
             camera.aspect = window.innerWidth / window.innerHeight;
@@ -38,23 +38,28 @@
         // camera.position.set(0, 0, 150000);
         // camera.position.set(0, 0, 1250);
 
-        const camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 12000);
+        const camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 1, 20000);
         camera.position.set(0, 0, 11000);
         camera.lookAt(new THREE.Vector3(0, 0, 0));
         scene.add(camera);
 
-	const renderer = new THREE.WebGLRenderer({ antialias: true });
+        const renderer = new THREE.WebGLRenderer({
+          antialias: true,
+          preserveDrawingBuffer: true // Preserve the drawing buffer to capture the image later
+        });
         renderer.setPixelRatio( window.devicePixelRatio );
 	renderer.setSize( window.innerWidth, window.innerHeight );
 	document.body.appendChild( renderer.domElement );
         window.addEventListener( 'resize', onWindowResize );
         let controls = new TrackballControls( camera, renderer.domElement );
+        controls.dynamicDampingFactor = 0.2; // To offer a smooth yet responsive control feel
+
         //ZEPHYR.CreateImageViewer(scene, "http://localhost:8888/HalcyonStorage/tcga/coad/TCGA-CM-5348-01Z-00-DX1.2ad0b8f6-684a-41a7-b568-26e97675cce9.svs",0);
         console.log("HERE THIS ===> "+options.target);
         ZEPHYR.CreateImageViewer(scene, options.target,0);
 
         // Annotation tools
-        annotationTools(scene, camera, renderer, controls);
+        toolbar(scene, camera, renderer, controls);
 
         function animate() {
             controls.update();

diff --git a/Halcyon/src/main/java/com/ebremer/multiviewer/MultiViewerFoundation.java b/Halcyon/src/main/java/com/ebremer/multiviewer/MultiViewerFoundation.java
@@ -43,7 +43,7 @@ public static enum JS {
     public MultiViewerFoundation() {
         AddCSSResource(CSS.main,"css/main.min.css");
         AddCSSResource(CSS.colorpicker,"vendor/color-picker/index.min.css");
-        AddCSSResource(CSS.fontawesome,"vendor/fontawesome-free-5.15.3-web/css/all.min.css");
+        AddCSSResource(CSS.fontawesome,"vendor/fontawesome-free-6.5.1-web/css/all.min.css");
 
         AddJSResource(JS.openseadragon,"vendor/openseadragon/openseadragon.min.js");
         AddJSResource(JS.openseadragonfabricjsoverlay,"vendor/OpenseadragonFabricjsOverlay/osd-fabricjs-overlay.min.js");

diff --git a/Halcyon/src/main/resources/META-INF/public-web-resources/multi-viewer/README.md b/Halcyon/src/main/resources/META-INF/public-web-resources/multi-viewer/README.md
@@ -81,7 +81,7 @@ csscomb file.css
 
 [fabric.js](https://github.com/fabricjs/fabric.js/releases/tag/v521)
 
-[Font Awesome](https://use.fontawesome.com/releases/v5.15.3/fontawesome-free-5.15.3-web.zip)
+[Font Awesome](https://use.fontawesome.com/releases/v6.5.1/fontawesome-free-6.5.1-web.zip)
 
 [jQuery](https://github.com/jquery/jquery/archive/refs/tags/3.5.1.tar.gz)
 

diff --git a/...META-INF/public-web-resources/multi-viewer/vendor/fontawesome-free-5.15.3-web/LICENSE.txt b/...META-INF/public-web-resources/multi-viewer/vendor/fontawesome-free-5.15.3-web/LICENSE.txt
diff --git a/...A-INF/public-web-resources/multi-viewer/vendor/fontawesome-free-5.15.3-web/attribution.js b/...A-INF/public-web-resources/multi-viewer/vendor/fontawesome-free-5.15.3-web/attribution.js