@cornerstonejs/tools 4.8.4 → 4.9.0

package/dist/esm/eventListeners/segmentation/segmentationRemovedEventListener.d.ts

@@ -0,0 +1,3 @@
+import type { SegmentationRemovedEventType } from '../../types/EventTypes';
+declare const segmentationRemovedListener: (evt: SegmentationRemovedEventType) => void;
+export default segmentationRemovedListener;

package/dist/esm/eventListeners/segmentation/segmentationRemovedEventListener.js

@@ -0,0 +1,11 @@
+import { getAllAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
+const segmentationRemovedListener = function (evt) {
+    const { segmentationId } = evt.detail;
+    const annotationsToRemove = getAllAnnotations().filter((annotation) => segmentationId ===
+        annotation?.data?.segmentation
+            ?.segmentationId);
+    annotationsToRemove.forEach((annotation) => {
+        removeAnnotation(annotation.annotationUID);
+    });
+};
+export default segmentationRemovedListener;

package/dist/esm/init.js

@@ -9,6 +9,7 @@ import * as ToolGroupManager from './store/ToolGroupManager';
 import { defaultSegmentationStateManager } from './stateManagement/segmentation/SegmentationStateManager';
 import segmentationRepresentationModifiedListener from './eventListeners/segmentation/segmentationRepresentationModifiedListener';
 import { setConfig } from './config';
+import segmentationRemovedListener from './eventListeners/segmentation/segmentationRemovedEventListener';
 let csToolsInitialized = false;
 export function init(defaultConfiguration = {}) {
     if (csToolsInitialized) {
@@ -56,15 +57,18 @@ function _addCornerstoneToolsEventListeners() {
     eventTarget.addEventListener(TOOLS_EVENTS.SEGMENTATION_DATA_MODIFIED, segmentationDataModifiedEventListener);
     eventTarget.addEventListener(TOOLS_EVENTS.SEGMENTATION_REPRESENTATION_MODIFIED, segmentationRepresentationModifiedListener);
     eventTarget.addEventListener(TOOLS_EVENTS.SEGMENTATION_REPRESENTATION_ADDED, segmentationRepresentationModifiedListener);
+    eventTarget.addEventListener(TOOLS_EVENTS.SEGMENTATION_REMOVED, segmentationRemovedListener);
 }
 function _removeCornerstoneToolsEventListeners() {
     eventTarget.removeEventListener(TOOLS_EVENTS.ANNOTATION_COMPLETED, annotationCompletedListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.ANNOTATION_MODIFIED, annotationModifiedListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.ANNOTATION_SELECTION_CHANGE, annotationSelectionListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.ANNOTATION_SELECTION_CHANGE, annotationSelectionListener);
+    eventTarget.removeEventListener(TOOLS_EVENTS.ANNOTATION_REMOVED, annotationRemovedListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.SEGMENTATION_MODIFIED, segmentationModifiedListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.SEGMENTATION_DATA_MODIFIED, segmentationDataModifiedEventListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.SEGMENTATION_REPRESENTATION_MODIFIED, segmentationRepresentationModifiedListener);
     eventTarget.removeEventListener(TOOLS_EVENTS.SEGMENTATION_REPRESENTATION_ADDED, segmentationRepresentationModifiedListener);
+    eventTarget.removeEventListener(TOOLS_EVENTS.SEGMENTATION_REMOVED, segmentationRemovedListener);
 }
 export default init;

package/dist/esm/tools/annotation/PlanarFreehandROITool.js

@@ -259,13 +259,17 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         if (!annotations || !annotations.length) {
             return;
         }
+        const baseFilteredAnnotations = super.filterInteractableAnnotationsForElement(element, annotations);
+        if (!baseFilteredAnnotations || !baseFilteredAnnotations.length) {
+            return;
+        }
         const enabledElement = getEnabledElement(element);
         const { viewport } = enabledElement;
         let annotationsToDisplay;
         if (viewport instanceof VolumeViewport) {
             const camera = viewport.getCamera();
             const { spacingInNormalDirection } = csUtils.getTargetVolumeAndSpacingInNormalDir(viewport, camera);
-            annotationsToDisplay = this.filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection);
+            annotationsToDisplay = this.filterAnnotationsWithinSlice(baseFilteredAnnotations, camera, spacingInNormalDirection);
         }
         else {
             annotationsToDisplay = filterAnnotationsForDisplay(viewport, annotations);

package/dist/esm/tools/base/ContourSegmentationBaseTool.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, EventTypes, PublicToolProps, ToolProps, AnnotationRenderContext } from '../../types';
+import type { Annotation, EventTypes, PublicToolProps, ToolProps, AnnotationRenderContext, Annotations } from '../../types';
 import type { ContourAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 import type { StyleSpecifier } from '../../types/AnnotationStyle';
 import ContourBaseTool from './ContourBaseTool';
@@ -15,6 +15,7 @@ declare abstract class ContourSegmentationBaseTool extends ContourBaseTool {
         styleSpecifier: StyleSpecifier;
     }): any;
     protected renderAnnotationInstance(renderContext: AnnotationRenderContext): boolean;
+    filterInteractableAnnotationsForElement(element: HTMLDivElement, annotations: Annotations): Annotations;
     private _getContourSegmentationStyle;
 }
 export { ContourSegmentationBaseTool as default, ContourSegmentationBaseTool };

package/dist/esm/tools/base/ContourSegmentationBaseTool.js

@@ -12,6 +12,7 @@ import { getViewportIdsWithSegmentation } from '../../stateManagement/segmentati
 import { getActiveSegmentIndex } from '../../stateManagement/segmentation/getActiveSegmentIndex';
 import { getLockedSegmentIndices } from '../../stateManagement/segmentation/segmentLocking';
 import { getSVGStyleForSegment } from '../../utilities/segmentation/getSVGStyleForSegment';
+import { defaultSegmentationStateManager } from '../../stateManagement/segmentation/SegmentationStateManager';
 class ContourSegmentationBaseTool extends ContourBaseTool {
     static { this.PreviewSegmentIndex = 255; }
     constructor(toolProps, defaultToolProps) {
@@ -99,6 +100,28 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         }
         return renderResult;
     }
+    filterInteractableAnnotationsForElement(element, annotations) {
+        if (!annotations || !annotations.length) {
+            return;
+        }
+        const baseFilteredAnnotations = super.filterInteractableAnnotationsForElement(element, annotations);
+        if (!baseFilteredAnnotations || !baseFilteredAnnotations.length) {
+            return;
+        }
+        const enabledElement = getEnabledElement(element);
+        const { viewport } = enabledElement;
+        return baseFilteredAnnotations.filter((annotation) => {
+            const segmentationId = annotation?.data
+                ?.segmentation?.segmentationId;
+            if (!segmentationId) {
+                return true;
+            }
+            return !!defaultSegmentationStateManager.getSegmentationRepresentation(viewport.id, {
+                segmentationId,
+                type: SegmentationRepresentations.Contour,
+            });
+        });
+    }
     _getContourSegmentationStyle(context) {
         const annotation = context.annotation;
         const { segmentationId, segmentIndex } = annotation.data.segmentation;

package/dist/esm/tools/displayTools/Contour/contourDisplay.js

@@ -16,7 +16,6 @@ function removeRepresentation(viewportId, segmentationId, renderImmediate = fals
         return;
     }
     const { viewport } = enabledElement;
-    removeContourFromElement(viewportId, segmentationId);
     if (!renderImmediate) {
         return;
     }

package/dist/esm/utilities/planar/filterAnnotationsWithinSlice.js

@@ -58,7 +58,7 @@ export default function filterAnnotationsWithinSlice(annotations, camera, spacin
             continue;
         }
         const point = metadata.planeRestriction?.point ||
-            data.handles.points[0] ||
+            data.handles?.points?.[0] ||
             data.contour?.polyline[0];
         if (!point) {
             annotationsWithinSlice.push(annotation);

package/dist/esm/utilities/segmentation/brushSizeForToolGroup.d.ts

@@ -1,2 +1,2 @@
 export declare function setBrushSizeForToolGroup(toolGroupId: string, brushSize: number, toolName?: string): void;
-export declare function getBrushSizeForToolGroup(toolGroupId: string, toolName?: string): void;
+export declare function getBrushSizeForToolGroup(toolGroupId: string, toolName?: string): number;

package/dist/esm/utilities/segmentation/brushSizeForToolGroup.js

@@ -1,6 +1,5 @@
 import { getToolGroup } from '../../store/ToolGroupManager';
 import triggerAnnotationRenderForViewportIds from '../triggerAnnotationRenderForViewportIds';
-import { getRenderingEngine } from '@cornerstonejs/core';
 import { getBrushToolInstances } from './getBrushToolInstances';
 export function setBrushSizeForToolGroup(toolGroupId, brushSize, toolName) {
     const toolGroup = getToolGroup(toolGroupId);
@@ -9,17 +8,14 @@ export function setBrushSizeForToolGroup(toolGroupId, brushSize, toolName) {
     }
     const brushBasedToolInstances = getBrushToolInstances(toolGroupId, toolName);
     brushBasedToolInstances.forEach((tool) => {
-        tool.configuration.brushSize = brushSize;
+        const minRadius = tool.configuration.minRadius;
+        const maxRadius = tool.configuration.maxRadius;
+        let newBrushSize = minRadius ? Math.max(brushSize, minRadius) : brushSize;
+        newBrushSize = maxRadius ? Math.min(newBrushSize, maxRadius) : newBrushSize;
+        tool.configuration.brushSize = newBrushSize;
         tool.invalidateBrushCursor();
     });
-    const viewportsInfo = toolGroup.getViewportsInfo();
-    const viewportsInfoArray = Object.keys(viewportsInfo).map((key) => viewportsInfo[key]);
-    if (!viewportsInfoArray.length) {
-        return;
-    }
-    const { renderingEngineId } = viewportsInfoArray[0];
     const viewportIds = toolGroup.getViewportIds();
-    const renderingEngine = getRenderingEngine(renderingEngineId);
     triggerAnnotationRenderForViewportIds(viewportIds);
 }
 export function getBrushSizeForToolGroup(toolGroupId, toolName) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.8.4";
+export declare const version = "4.9.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.8.4';
+export const version = '4.9.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.8.4",
+  "version": "4.9.0",
   "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.8.4",
+    "@cornerstonejs/core": "4.9.0",
     "@kitware/vtk.js": "32.12.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": "b0f9014b28fdbc7cdeac242badef0c6c522fce7f"
+  "gitHead": "8f00d5d14582cd878595324d8480e3d00a5c92a6"
 }