copper3d 2.0.4 → 2.0.6

package/dist/bundle.esm.js

@@ -69102,11 +69102,17 @@ function setupGui(configs) {
     };
     const updateGuiSphereState = () => {
         if (configs.gui_states.sphere) {
-            configs.drawingCanvas.removeEventListener("wheel", configs.drawingPrameters.handleZoomWheel);
+            // configs.drawingCanvas.removeEventListener(
+            //   "wheel",
+            //   configs.drawingPrameters.handleZoomWheel
+            // );
             configs.removeDragMode();
         }
         else {
-            configs.drawingCanvas.addEventListener("wheel", configs.drawingPrameters.handleZoomWheel);
+            // configs.drawingCanvas.addEventListener(
+            //   "wheel",
+            //   configs.drawingPrameters.handleZoomWheel
+            // );
             configs.configDragMode();
             // clear canvas
             configs.clearPaint();
@@ -69992,9 +69998,10 @@ class DrawToolCore extends CommToolsData {
                         e.offsetY / this.nrrd_states.sizeFoctor;
                     this.enableCrosshair();
                 }
-                else if (this.gui_states.sphere) {
-                    let mouseX = e.offsetX;
-                    let mouseY = e.offsetY;
+                else if (this.gui_states.sphere && !this.nrrd_states.enableCursorChoose) {
+                    this.protectedData.canvases.drawingCanvas.removeEventListener("wheel", this.drawingPrameters.handleZoomWheel);
+                    let mouseX = e.offsetX / this.nrrd_states.sizeFoctor;
+                    let mouseY = e.offsetY / this.nrrd_states.sizeFoctor;
                     //  record mouseX,Y, and enable crosshair function
                     this.nrrd_states.sphereOrigin[this.protectedData.axis] = [
                         mouseX,
@@ -70006,7 +70013,7 @@ class DrawToolCore extends CommToolsData {
                     this.nrrd_states.cursorPageY = mouseY;
                     this.enableCrosshair();
                     // draw circle setup width/height for sphere canvas
-                    this.drawSphere(mouseX, mouseY, this.nrrd_states.sphereRadius);
+                    this.drawSphere(e.offsetX, e.offsetY, this.nrrd_states.sphereRadius);
                     this.protectedData.canvases.drawingCanvas.addEventListener("wheel", this.drawingPrameters.handleSphereWheel, true);
                     this.protectedData.canvases.drawingCanvas.addEventListener("pointerup", this.drawingPrameters.handleOnDrawingMouseUp);
                 }
@@ -70128,9 +70135,14 @@ class DrawToolCore extends CommToolsData {
                         }
                     }
                     !!this.nrrd_states.getSphere &&
-                        this.nrrd_states.getSphere(this.nrrd_states.sphereOrigin.z, this.nrrd_states.sphereRadius);
+                        this.nrrd_states.getSphere(this.nrrd_states.sphereOrigin.z, this.nrrd_states.sphereRadius / this.nrrd_states.sizeFoctor);
+                    this.protectedData.canvases.drawingCanvas.addEventListener("wheel", this.drawingPrameters.handleZoomWheel);
                     this.protectedData.canvases.drawingCanvas.removeEventListener("wheel", this.drawingPrameters.handleSphereWheel, true);
                 }
+                else if (this.gui_states.sphere &&
+                    this.nrrd_states.enableCursorChoose) {
+                    this.protectedData.canvases.drawingCanvas.addEventListener("wheel", this.drawingPrameters.handleZoomWheel);
+                }
             }
             else if (e.button === 2) {
                 rightclicked = false;
@@ -70316,19 +70328,20 @@ class DrawToolCore extends CommToolsData {
             // this.nrrd_states.originWidth;
             const delta = e.detail ? e.detail > 0 : e.wheelDelta < 0;
             this.protectedData.Is_Draw = true;
-            const ratioL = (e.clientX -
+            var rect = this.container.getBoundingClientRect();
+            const ratioL = (e.clientX - rect.left -
                 this.mainAreaContainer.offsetLeft -
                 this.protectedData.canvases.drawingCanvas.offsetLeft) /
                 this.protectedData.canvases.drawingCanvas.offsetWidth;
-            const ratioT = (e.clientY -
+            const ratioT = (e.clientY - rect.top -
                 this.mainAreaContainer.offsetTop -
                 this.protectedData.canvases.drawingCanvas.offsetTop) /
                 this.protectedData.canvases.drawingCanvas.offsetHeight;
             const ratioDelta = !delta ? 1 + 0.1 : 1 - 0.1;
             const w = this.protectedData.canvases.drawingCanvas.offsetWidth * ratioDelta;
             const h = this.protectedData.canvases.drawingCanvas.offsetHeight * ratioDelta;
-            const l = Math.round(e.clientX - this.mainAreaContainer.offsetLeft - w * ratioL);
-            const t = Math.round(e.clientY - this.mainAreaContainer.offsetTop - h * ratioT);
+            const l = Math.round(e.clientX - this.mainAreaContainer.offsetLeft - w * ratioL - rect.left);
+            const t = Math.round(e.clientY - this.mainAreaContainer.offsetTop - h * ratioT - rect.top);
             moveDistance = w / this.nrrd_states.originWidth;
             if (moveDistance > 8) {
                 moveDistance = 8;
@@ -70386,17 +70399,12 @@ class DrawToolCore extends CommToolsData {
         const nextIndex = originIndex + decay;
         const ctx = this.protectedData.ctxes.drawingSphereCtx;
         const canvas = this.protectedData.canvases.drawingSphereCanvas;
-        // if (
-        //   preIndex < this.nrrd_states.minIndex ||
-        //   nextIndex > this.nrrd_states.maxIndex
-        // )
-        //   return;
         if (preIndex === nextIndex) {
-            this.drawSphereCore(ctx, mouseX, mouseY, this.nrrd_states.sphereRadius);
+            this.drawSphereCore(ctx, mouseX, mouseY, this.nrrd_states.sphereRadius / this.nrrd_states.sizeFoctor);
             this.storeSphereImages(preIndex, axis);
         }
         else {
-            this.drawSphereCore(ctx, mouseX, mouseY, this.nrrd_states.sphereRadius - decay);
+            this.drawSphereCore(ctx, mouseX, mouseY, (this.nrrd_states.sphereRadius - decay) / this.nrrd_states.sizeFoctor);
             this.drawImageOnEmptyImage(canvas);
             this.storeSphereImages(preIndex, axis);
             this.storeSphereImages(nextIndex, axis);
@@ -70405,7 +70413,7 @@ class DrawToolCore extends CommToolsData {
     }
     drawSphereCore(ctx, x, y, radius) {
         ctx.beginPath();
-        ctx.arc(x, y, radius * this.nrrd_states.sizeFoctor, 0, 2 * Math.PI);
+        ctx.arc(x, y, radius, 0, 2 * Math.PI);
         ctx.fillStyle = this.gui_states.fillColor;
         ctx.fill();
         ctx.closePath();
@@ -70445,8 +70453,8 @@ class DrawToolCore extends CommToolsData {
             // limited the radius max and min
             this.nrrd_states.sphereRadius = Math.max(1, Math.min(this.nrrd_states.sphereRadius, 50));
             // get mouse position
-            const mouseX = this.nrrd_states.sphereOrigin[this.protectedData.axis][0];
-            const mouseY = this.nrrd_states.sphereOrigin[this.protectedData.axis][1];
+            const mouseX = this.nrrd_states.sphereOrigin[this.protectedData.axis][0] * this.nrrd_states.sizeFoctor;
+            const mouseY = this.nrrd_states.sphereOrigin[this.protectedData.axis][1] * this.nrrd_states.sizeFoctor;
             this.drawSphere(mouseX, mouseY, this.nrrd_states.sphereRadius);
         };
         return sphereEvent;
@@ -70463,6 +70471,102 @@ class DrawToolCore extends CommToolsData {
         this.drawSphereCore(ctx, mouseX, mouseY, radius);
         this.protectedData.ctxes.drawingLayerMasterCtx.drawImage(canvas, 0, 0, this.nrrd_states.changedWidth, this.nrrd_states.changedHeight);
     }
+    /**
+    * We generate the MRI slice from threejs based on mm, but when we display it is based on pixel size/distance.
+    * So, the index munber on each axis (sagittal, axial, coronal) is the slice's depth in mm distance. And the width and height displayed on screen is the slice's width and height in pixel distance.
+    *
+    * When we switch into different axis' views, we need to convert current view's the depth to the pixel distance in other views width or height, and convert the current view's width or height from pixel distance to mm distance as other views' depth (slice index) in general.
+    *
+    * Then as for the crosshair (Cursor Inspector), we also need to convert the cursor point (x, y, z) to other views' (x, y, z).
+    *
+    * @param from "x" | "y" | "z", current view axis, "x: sagittle, y: coronal, z: axial".
+    * @param to "x" | "y" | "z", target view axis (where you want jump to), "x: sagittle, y: coronal, z: axial".
+    * @param cursorNumX number, cursor point x on current axis's slice. (pixel distance)
+    * @param cursorNumY number, cursor point y on current axis's slice. (pixel distance)
+    * @param currentSliceIndex number, current axis's slice's index/depth. (mm distance)
+    * @returns
+    */
+    convertCursorPoint(from, to, cursorNumX, cursorNumY, currentSliceIndex) {
+        const nrrd = this.nrrd_states;
+        const dimensions = nrrd.dimensions;
+        const ratios = nrrd.ratios;
+        const { nrrd_x_mm, nrrd_y_mm, nrrd_z_mm } = nrrd;
+        let currentIndex = 0;
+        let oldIndex = 0;
+        let convertCursorNumX = 0;
+        let convertCursorNumY = 0;
+        const convertIndex = {
+            x: {
+                y: (val) => Math.ceil((val / nrrd_x_mm) * dimensions[0]),
+                z: (val) => Math.ceil((val / nrrd_z_mm) * dimensions[2]),
+            },
+            y: {
+                x: (val) => Math.ceil((val / nrrd_y_mm) * dimensions[1]),
+                z: (val) => Math.ceil((val / nrrd_z_mm) * dimensions[2]),
+            },
+            z: {
+                x: (val) => Math.ceil((val / nrrd_x_mm) * dimensions[0]),
+                y: (val) => Math.ceil((val / nrrd_y_mm) * dimensions[1]),
+            },
+        };
+        const convertCursor = {
+            x: {
+                y: (sliceIndex) => Math.ceil((sliceIndex / dimensions[0]) * nrrd_x_mm),
+                z: (sliceIndex) => Math.ceil((sliceIndex / dimensions[0]) * nrrd_x_mm),
+            },
+            y: {
+                x: (sliceIndex) => Math.ceil((sliceIndex / dimensions[1]) * nrrd_y_mm),
+                z: (sliceIndex) => Math.ceil((sliceIndex / dimensions[1]) * nrrd_y_mm),
+            },
+            z: {
+                x: (sliceIndex) => Math.ceil((sliceIndex / dimensions[2]) * nrrd_z_mm),
+                y: (sliceIndex) => Math.ceil((sliceIndex / dimensions[2]) * nrrd_z_mm),
+            },
+        };
+        if (from === to) {
+            return;
+        }
+        if (from === "z" && to === "x") {
+            currentIndex = convertIndex[from][to](cursorNumX);
+            oldIndex = currentIndex * ratios[to];
+            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumY = cursorNumY;
+        }
+        else if (from === "y" && to === "x") {
+            currentIndex = convertIndex[from][to](cursorNumX);
+            oldIndex = currentIndex * ratios.x;
+            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumX = cursorNumY;
+        }
+        else if (from === "z" && to === "y") {
+            currentIndex = convertIndex[from][to](cursorNumY);
+            oldIndex = currentIndex * ratios[to];
+            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumX = cursorNumX;
+        }
+        else if (from === "x" && to === "y") {
+            currentIndex = convertIndex[from][to](cursorNumY);
+            oldIndex = currentIndex * ratios[to];
+            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumY = cursorNumX;
+        }
+        else if (from === "x" && to === "z") {
+            currentIndex = convertIndex[from][to](cursorNumX);
+            oldIndex = currentIndex * ratios[to];
+            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumY = cursorNumY;
+        }
+        else if (from === "y" && to === "z") {
+            currentIndex = convertIndex[from][to](cursorNumY);
+            oldIndex = currentIndex * ratios.z;
+            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
+            convertCursorNumX = cursorNumX;
+        }
+        else {
+            return;
+        }
+        return { currentIndex, oldIndex, convertCursorNumX, convertCursorNumY };
+    }
     setUpSphereOrigins(mouseX, mouseY) {
         const convertCursor = (from, to) => {
             const convertObj = this.convertCursorPoint(from, to, mouseX, mouseY, this.nrrd_states.currentIndex);
@@ -70943,6 +71047,22 @@ class NrrdTools extends DrawToolCore {
             flipDisplayImageByAxis: this.flipDisplayImageByAxis,
             filterDrawedImage: this.filterDrawedImage,
             setEmptyCanvasSize: this.setEmptyCanvasSize,
+            storeAllImages: this.storeAllImages,
+            drawImageOnEmptyImage: this.drawImageOnEmptyImage,
+            checkSharedPlaceSlice: this.checkSharedPlaceSlice,
+            replaceArray: this.replaceArray,
+            findSliceInSharedPlace: this.findSliceInSharedPlace,
+            sliceArrayH: this.sliceArrayH,
+            sliceArrayV: this.sliceArrayV,
+            storeImageToAxis: this.storeImageToAxis,
+            replaceVerticalColPixels: this.replaceVerticalColPixels,
+            replaceHorizontalRowPixels: this.replaceHorizontalRowPixels,
+            storeEachLayerImage: this.storeEachLayerImage,
+            storeImageToLabel: this.storeImageToLabel,
+            getRestLabel: this.getRestLabel,
+            setIsDrawFalse: this.setIsDrawFalse,
+            initPaintImages: this.initPaintImages,
+            createEmptyPaintImage: this.createEmptyPaintImage,
         };
         this.guiParameterSettings = setupGui(guiOptions);
     }
@@ -71127,102 +71247,6 @@ class NrrdTools extends DrawToolCore {
             paintImages.z.push(initMark_z);
         }
     }
-    /**
-     * We generate the MRI slice from threejs based on mm, but when we display it is based on pixel size/distance.
-     * So, the index munber on each axis (sagittal, axial, coronal) is the slice's depth in mm distance. And the width and height displayed on screen is the slice's width and height in pixel distance.
-     *
-     * When we switch into different axis' views, we need to convert current view's the depth to the pixel distance in other views width or height, and convert the current view's width or height from pixel distance to mm distance as other views' depth (slice index) in general.
-     *
-     * Then as for the crosshair (Cursor Inspector), we also need to convert the cursor point (x, y, z) to other views' (x, y, z).
-     *
-     * @param from "x" | "y" | "z", current view axis, "x: sagittle, y: coronal, z: axial".
-     * @param to "x" | "y" | "z", target view axis (where you want jump to), "x: sagittle, y: coronal, z: axial".
-     * @param cursorNumX number, cursor point x on current axis's slice. (pixel distance)
-     * @param cursorNumY number, cursor point y on current axis's slice. (pixel distance)
-     * @param currentSliceIndex number, current axis's slice's index/depth. (mm distance)
-     * @returns
-     */
-    convertCursorPoint(from, to, cursorNumX, cursorNumY, currentSliceIndex) {
-        const nrrd = this.nrrd_states;
-        const dimensions = nrrd.dimensions;
-        const ratios = nrrd.ratios;
-        const { nrrd_x_mm, nrrd_y_mm, nrrd_z_mm } = nrrd;
-        let currentIndex = 0;
-        let oldIndex = 0;
-        let convertCursorNumX = 0;
-        let convertCursorNumY = 0;
-        const convertIndex = {
-            x: {
-                y: (val) => Math.ceil((val / nrrd_x_mm) * dimensions[0]),
-                z: (val) => Math.ceil((val / nrrd_z_mm) * dimensions[2]),
-            },
-            y: {
-                x: (val) => Math.ceil((val / nrrd_y_mm) * dimensions[1]),
-                z: (val) => Math.ceil((val / nrrd_z_mm) * dimensions[2]),
-            },
-            z: {
-                x: (val) => Math.ceil((val / nrrd_x_mm) * dimensions[0]),
-                y: (val) => Math.ceil((val / nrrd_y_mm) * dimensions[1]),
-            },
-        };
-        const convertCursor = {
-            x: {
-                y: (sliceIndex) => Math.ceil((sliceIndex / dimensions[0]) * nrrd_x_mm),
-                z: (sliceIndex) => Math.ceil((sliceIndex / dimensions[0]) * nrrd_x_mm),
-            },
-            y: {
-                x: (sliceIndex) => Math.ceil((sliceIndex / dimensions[1]) * nrrd_y_mm),
-                z: (sliceIndex) => Math.ceil((sliceIndex / dimensions[1]) * nrrd_y_mm),
-            },
-            z: {
-                x: (sliceIndex) => Math.ceil((sliceIndex / dimensions[2]) * nrrd_z_mm),
-                y: (sliceIndex) => Math.ceil((sliceIndex / dimensions[2]) * nrrd_z_mm),
-            },
-        };
-        if (from === to) {
-            return;
-        }
-        if (from === "z" && to === "x") {
-            currentIndex = convertIndex[from][to](cursorNumX);
-            oldIndex = currentIndex * ratios[to];
-            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumY = cursorNumY;
-        }
-        else if (from === "y" && to === "x") {
-            currentIndex = convertIndex[from][to](cursorNumX);
-            oldIndex = currentIndex * ratios.x;
-            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumX = cursorNumY;
-        }
-        else if (from === "z" && to === "y") {
-            currentIndex = convertIndex[from][to](cursorNumY);
-            oldIndex = currentIndex * ratios[to];
-            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumX = cursorNumX;
-        }
-        else if (from === "x" && to === "y") {
-            currentIndex = convertIndex[from][to](cursorNumY);
-            oldIndex = currentIndex * ratios[to];
-            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumY = cursorNumX;
-        }
-        else if (from === "x" && to === "z") {
-            currentIndex = convertIndex[from][to](cursorNumX);
-            oldIndex = currentIndex * ratios[to];
-            convertCursorNumX = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumY = cursorNumY;
-        }
-        else if (from === "y" && to === "z") {
-            currentIndex = convertIndex[from][to](cursorNumY);
-            oldIndex = currentIndex * ratios.z;
-            convertCursorNumY = convertCursor[from][to](currentSliceIndex);
-            convertCursorNumX = cursorNumX;
-        }
-        else {
-            return;
-        }
-        return { currentIndex, oldIndex, convertCursorNumX, convertCursorNumY };
-    }
     /**
      * Switch all contrast slices' orientation
      * @param {string} aixs:"x" | "y" | "z"
@@ -71335,7 +71359,7 @@ class NrrdTools extends DrawToolCore {
         this.resetDisplaySlicesStatus();
         // for sphere plan a
         if (this.gui_states.sphere && !this.nrrd_states.spherePlanB) {
-            this.drawSphere(this.nrrd_states.sphereOrigin[axisTo][0], this.nrrd_states.sphereOrigin[axisTo][1], this.nrrd_states.sphereRadius);
+            this.drawSphere(this.nrrd_states.sphereOrigin[axisTo][0] * this.nrrd_states.sizeFoctor, this.nrrd_states.sphereOrigin[axisTo][1] * this.nrrd_states.sizeFoctor, this.nrrd_states.sphereRadius);
         }
     }
     addSkip(index) {
@@ -72030,7 +72054,7 @@ function evaluateElement(element, weights) {
 }
 
 // import * as kiwrious from "copper3d_plugin_heart_k";
-const REVISION = "v2.0.4";
-console.log("%cCopper3D Visualisation %cBeta:v2.0.4", "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
+const REVISION = "v2.0.6";
+console.log("%cCopper3D Visualisation %cBeta:v2.0.6", "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
 
 export { CameraViewPoint, Copper3dTrackballControls, MeshNodeTool, NrrdTools, REVISION, addBoxHelper, addLabelToScene, configKiwriousHeart, convert3DPostoScreenPos, convertScreenPosto3DPos, copperMScene, copperMSceneRenderer, copperRenderer, copperRendererOnDemond, copperScene, copperSceneOnDemond, createTexture2D_NRRD, fullScreenListenner, kiwrious, loading, removeGuiFolderChilden, setHDRFilePath, throttle };