@cornerstonejs/tools 4.20.1 → 4.20.3

package/dist/esm/tools/segmentation/BrushTool.js

@@ -1,4 +1,4 @@
-import { getEnabledElement, eventTarget } from '@cornerstonejs/core';
+import { getEnabledElement, eventTarget, Enums } from '@cornerstonejs/core';
 import { vec3, vec2 } from 'gl-matrix';
 import { Events, ToolModes, StrategyCallbacks } from '../../enums';
 import { fillInsideSphere, thresholdInsideSphere, thresholdInsideSphereIsland, } from './strategies/fillSphere';
@@ -9,6 +9,7 @@ import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCur
 import triggerAnnotationRenderForViewportUIDs from '../../utilities/triggerAnnotationRenderForViewportIds';
 import LabelmapBaseTool from './LabelmapBaseTool';
 import { getStrategyData } from './strategies/utils/getStrategyData';
+import { getActiveSegmentation } from '../../stateManagement/segmentation/getActiveSegmentation';
 class BrushTool extends LabelmapBaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -94,6 +95,18 @@ class BrushTool extends LabelmapBaseTool {
             const { element, currentPoints } = eventData;
             const enabledElement = getEnabledElement(element);
             const { viewport } = enabledElement;
+            const activeSegmentation = getActiveSegmentation(viewport.id);
+            if (!activeSegmentation) {
+                const event = new CustomEvent(Enums.Events.ERROR_EVENT, {
+                    detail: {
+                        type: 'Segmentation',
+                        message: 'No active segmentation detected, create a segmentation representation before using the brush tool',
+                    },
+                    cancelable: true,
+                });
+                eventTarget.dispatchEvent(event);
+                return false;
+            }
             this._editData = this.createEditData(element);
             this._activateDraw(element);
             hideElementCursor(element);

package/dist/esm/tools/segmentation/LabelmapBaseTool.js

@@ -86,14 +86,6 @@ export default class LabelmapBaseTool extends BaseTool {
         const { viewport } = enabledElement;
         const activeSegmentation = getActiveSegmentation(viewport.id);
         if (!activeSegmentation) {
-            const event = new CustomEvent(Enums.Events.ERROR_EVENT, {
-                detail: {
-                    type: 'Segmentation',
-                    message: 'No active segmentation detected, create a segmentation representation before using the brush tool',
-                },
-                cancelable: true,
-            });
-            eventTarget.dispatchEvent(event);
             return null;
         }
         const { segmentationId } = activeSegmentation;

package/dist/esm/utilities/drawing/getTextBoxCoordsCanvas.js

@@ -99,28 +99,36 @@ function _findSvgLayer(element) {
     return internalDiv?.querySelector(':scope > .svg-layer') || null;
 }
 function _determineCorners(canvasPoints) {
-    const p0 = canvasPoints[0];
-    if (!p0 || canvasPoints.length < 2) {
+    const validPoints = canvasPoints.filter(Boolean);
+    const p0 = validPoints[0];
+    if (!p0 || validPoints.length < 2) {
         return { left: p0, right: p0, top: p0, bottom: p0 };
     }
-    const handlesLeftToRight = [canvasPoints[0], canvasPoints[1]].sort(_compareX);
-    const handlesTopToBottom = [canvasPoints[0], canvasPoints[1]].sort(_compareY);
-    const left = handlesLeftToRight[0];
-    const right = handlesLeftToRight[handlesLeftToRight.length - 1];
-    const top = handlesTopToBottom[0];
-    const bottom = handlesTopToBottom[handlesTopToBottom.length - 1];
+    let left = p0;
+    let right = p0;
+    let top = p0;
+    let bottom = p0;
+    for (let i = 1; i < validPoints.length; i++) {
+        const point = validPoints[i];
+        if (point[0] < left[0]) {
+            left = point;
+        }
+        if (point[0] > right[0]) {
+            right = point;
+        }
+        if (point[1] < top[1]) {
+            top = point;
+        }
+        if (point[1] > bottom[1]) {
+            bottom = point;
+        }
+    }
     return {
         left,
         top,
         bottom,
         right,
     };
-    function _compareX(a, b) {
-        return a[0] < b[0] ? -1 : 1;
-    }
-    function _compareY(a, b) {
-        return a[1] < b[1] ? -1 : 1;
-    }
 }
 function _estimateTextBoxSize(textLines) {
     const estimatedPadding = 25;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.20.1";
+export declare const version = "4.20.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.20.1';
+export const version = '4.20.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.20.1",
+  "version": "4.20.3",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.20.1",
+    "@cornerstonejs/core": "4.20.3",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "67fb3a5cec834cdac65dec315c6d25553e935cce"
+  "gitHead": "43df78bf93b86d67b0c546661d327d1d14ae13eb"
 }