@cornerstonejs/tools 4.15.4 → 4.15.6

package/dist/esm/stateManagement/segmentation/segmentIndex.js

@@ -42,6 +42,9 @@ function setActiveSegmentIndex(segmentationId, segmentIndex) {
     });
     viewportIds.forEach((viewportId) => {
         const toolGroup = getToolGroupForViewport(viewportId);
+        if (!toolGroup) {
+            return;
+        }
         invalidateBrushCursor(toolGroup.id);
     });
 }

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

@@ -331,7 +331,6 @@ class CircleROITool extends AnnotationTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -343,6 +342,7 @@ class CircleROITool extends AnnotationTool {
                 const { annotationUID, data } = annotation;
                 const { handles } = data;
                 const { points, activeHandleIndex } = handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,

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

@@ -291,7 +291,6 @@ class CobbAngleTool extends AnnotationTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -302,6 +301,7 @@ class CobbAngleTool extends AnnotationTool {
                 const annotation = annotations[i];
                 const { annotationUID, data } = annotation;
                 const { points, activeHandleIndex } = data.handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,

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

@@ -67,7 +67,6 @@ class DragProbeTool extends ProbeTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -79,6 +78,7 @@ class DragProbeTool extends ProbeTool {
             const data = annotation.data;
             const point = data.handles.points[0];
             const canvasCoordinates = viewport.worldToCanvas(point);
+            const targetId = this.getTargetId(viewport, data);
             styleSpecifier.annotationUID = annotationUID;
             const { color } = this.getAnnotationStyle({
                 annotation,

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

@@ -380,7 +380,6 @@ class EllipticalROITool extends AnnotationTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -392,6 +391,7 @@ class EllipticalROITool extends AnnotationTool {
                 const { annotationUID, data } = annotation;
                 const { handles } = data;
                 const { points, activeHandleIndex } = handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,

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

@@ -206,7 +206,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         };
         this._renderStats = (annotation, viewport, enabledElement, svgDrawingHelper) => {
             const { data } = annotation;
-            const targetId = this.getTargetId(viewport);
+            const targetId = this.getTargetId(viewport, data);
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
                 toolName: this.getToolName(),

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

@@ -141,7 +141,6 @@ class ProbeTool extends AnnotationTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -154,6 +153,7 @@ class ProbeTool extends AnnotationTool {
                 const data = annotation.data;
                 const point = data.handles.points[0];
                 const canvasCoordinates = viewport.worldToCanvas(point);
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth } = this.getAnnotationStyle({
                     annotation,

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

@@ -317,7 +317,6 @@ class RectangleROITool extends AnnotationTool {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -329,6 +328,7 @@ class RectangleROITool extends AnnotationTool {
                 const { annotationUID, data } = annotation;
                 const { points, activeHandleIndex } = data.handles;
                 const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,

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

@@ -2,12 +2,13 @@ import { utilities as csUtils } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import ToolModes from '../../enums/ToolModes';
 import type StrategyCallbacks from '../../enums/StrategyCallbacks';
-import type { InteractionTypes, ToolProps, PublicToolProps } from '../../types';
+import type { InteractionTypes, ToolProps, PublicToolProps, ToolConfiguration } from '../../types';
 declare abstract class BaseTool {
     static toolName: any;
     static activeCursorTool: any;
     supportedInteractionTypes: InteractionTypes[];
     configuration: Record<string, any>;
+    get configurationTyped(): ToolConfiguration;
     toolGroupId: string;
     mode: ToolModes;
     isPrimary: boolean;
@@ -22,6 +23,9 @@ declare abstract class BaseTool {
     };
     constructor(toolProps: PublicToolProps, defaultToolProps: ToolProps);
     static mergeDefaultProps(defaultProps?: {}, additionalProps?: any): any;
+    static isSpecifiedTargetId(desiredVolumeId: string): (_viewport: any, { targetId }: {
+        targetId: any;
+    }) => any;
     get toolName(): string;
     getToolName(): string;
     applyActiveStrategy(enabledElement: Types.IEnabledElement, operationData: unknown): any;
@@ -29,7 +33,9 @@ declare abstract class BaseTool {
     setConfiguration(newConfiguration: Record<string, any>): void;
     setActiveStrategy(strategyName: string): void;
     protected getTargetImageData(targetId: string): Types.IImageData | Types.CPUIImageData;
-    protected getTargetId(viewport: Types.IViewport): string | undefined;
+    protected getTargetId(viewport: Types.IViewport, data?: unknown & {
+        cachedStats?: Record<string, unknown>;
+    }): string | undefined;
     undo(): void;
     redo(): void;
     static createZoomPanMemo(viewport: any): {

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

@@ -2,6 +2,9 @@ import { utilities as csUtils } from '@cornerstonejs/core';
 import ToolModes from '../../enums/ToolModes';
 const { DefaultHistoryMemo } = csUtils.HistoryMemo;
 class BaseTool {
+    get configurationTyped() {
+        return this.configuration;
+    }
     static { this.defaults = {
         configuration: {
             strategies: {},
@@ -26,6 +29,11 @@ class BaseTool {
         }
         return csUtils.deepMerge(defaultProps, additionalProps);
     }
+    static isSpecifiedTargetId(desiredVolumeId) {
+        return (_viewport, { targetId }) => {
+            return targetId.includes(desiredVolumeId);
+        };
+    }
     get toolName() {
         return this.getToolName();
     }
@@ -85,10 +93,18 @@ class BaseTool {
             throw new Error('getTargetIdImage: targetId must start with "imageId:" or "volumeId:"');
         }
     }
-    getTargetId(viewport) {
-        const targetId = viewport.getViewReferenceId?.();
-        if (targetId) {
-            return targetId;
+    getTargetId(viewport, data) {
+        const { isPreferredTargetId } = this.configurationTyped;
+        if (isPreferredTargetId && data?.cachedStats) {
+            for (const [targetId, cachedStat] of Object.entries(data.cachedStats)) {
+                if (isPreferredTargetId(viewport, { targetId, cachedStat })) {
+                    return targetId;
+                }
+            }
+        }
+        const defaultTargetId = viewport.getViewReferenceId?.();
+        if (defaultTargetId) {
+            return defaultTargetId;
         }
         throw new Error('getTargetId: viewport must have a getViewReferenceId method');
     }

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

@@ -92,10 +92,12 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
             const { segmentationId } = (annotation).data.segmentation;
             triggerSegmentationDataModified(segmentationId);
             const viewportIds = getViewportIdsWithSegmentation(segmentationId);
-            const toolGroupIds = viewportIds.map((viewportId) => {
+            const toolGroupIds = viewportIds
+                .map((viewportId) => {
                 const toolGroup = getToolGroupForViewport(viewportId);
-                return toolGroup.id;
-            });
+                return toolGroup?.id;
+            })
+                .filter((toolGroupId) => toolGroupId != null);
             triggerAnnotationRenderForToolGroupIds(toolGroupIds);
         }
         return renderResult;

package/dist/esm/tools/segmentation/strategies/BrushStrategy.js

@@ -54,16 +54,16 @@ export default class BrushStrategy {
             return initializedData;
         };
         this.configurationName = name;
-        const cursorGeometryInitializer = initializers.find(init => init.hasOwnProperty(StrategyCallbacks.CalculateCursorGeometry));
-        const renderCursorInitializer = initializers.find(init => init.hasOwnProperty(StrategyCallbacks.RenderCursor));
+        const cursorGeometryInitializer = initializers.find((init) => init.hasOwnProperty(StrategyCallbacks.CalculateCursorGeometry));
+        const renderCursorInitializer = initializers.find((init) => init.hasOwnProperty(StrategyCallbacks.RenderCursor));
         if (!cursorGeometryInitializer) {
             initializers.push({
-                [StrategyCallbacks.CalculateCursorGeometry]: compositions.circularCursor.calculateCursorGeometry
+                [StrategyCallbacks.CalculateCursorGeometry]: compositions.circularCursor.calculateCursorGeometry,
             });
         }
         if (!renderCursorInitializer) {
             initializers.push({
-                [StrategyCallbacks.RenderCursor]: compositions.circularCursor.renderCursor
+                [StrategyCallbacks.RenderCursor]: compositions.circularCursor.renderCursor,
             });
         }
         this.compositions = initializers;
@@ -89,7 +89,10 @@ export default class BrushStrategy {
     initialize(enabledElement, operationData, operationName) {
         const { viewport } = enabledElement;
         const data = getStrategyData({ operationData, viewport, strategy: this });
-        if (!data) {
+        if (!data ||
+            !data.imageVoxelManager ||
+            !data.segmentationVoxelManager ||
+            !data.segmentationImageData) {
             return null;
         }
         const { imageVoxelManager, segmentationVoxelManager, segmentationImageData, } = data;

package/dist/esm/types/IBaseTool.d.ts

@@ -1,2 +1,12 @@
 import type BaseTool from '../tools/base/BaseTool';
+export interface ToolConfiguration {
+    strategies: any;
+    defaultStrategy?: string;
+    activeStrategy?: string;
+    strategyOptions: any;
+    isPreferredTargetId?: (viewport: any, targetInfo: {
+        imageId: string;
+        cachedStat: any;
+    }) => boolean;
+}
 export type IBaseTool = BaseTool;

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

@@ -2,6 +2,9 @@ import { cache, volumeLoader, utilities, ImageVolume, } from '@cornerstonejs/cor
 import { getSegmentation } from '../../stateManagement/segmentation/getSegmentation';
 function getOrCreateSegmentationVolume(segmentationId) {
     const { representationData } = getSegmentation(segmentationId);
+    if (!representationData.Labelmap) {
+        return;
+    }
     let { volumeId } = representationData.Labelmap;
     let segVolume;
     if (volumeId) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.4";
+export declare const version = "4.15.6";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.4';
+export const version = '4.15.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.4",
+  "version": "4.15.6",
   "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.15.4",
+    "@cornerstonejs/core": "4.15.6",
     "@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": "1aea9ba6a06fab190274cbe46ea709031f78af13"
+  "gitHead": "91ce6d8dbb2cc3e2c6afe10510a5e04ad5c6ebc3"
 }