@cornerstonejs/tools 1.65.2 → 1.65.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.65.2",
+  "version": "1.65.4",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.65.2",
+    "@cornerstonejs/core": "^1.65.4",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "be39531d17ce98dba80029a869380f5d845e1f4d"
+  "gitHead": "9f0c1e30b8bf4cfca1ca04186f377e2a2f3a2b54"
 }

package/src/enums/StrategyCallbacks.ts

@@ -47,6 +47,9 @@ enum StrategyCallbacks {
 
   // Internal Details
   INTERNAL_setValue = 'setValue',
+
+  /** inner circle size  */
+  ComputeInnerCircleRadius = 'computeInnerCircleRadius',
 }
 
 export default StrategyCallbacks;

package/src/stateManagement/annotation/annotationSelection.ts

@@ -94,7 +94,7 @@ function getAnnotationsSelected(): Array<string> {
 function getAnnotationsSelectedByToolName(toolName: string): Array<string> {
   return getAnnotationsSelected().filter((annotationUID) => {
     const annotation = getAnnotation(annotationUID);
-    return annotation.metadata.toolName === toolName;
+    return annotation?.metadata?.toolName === toolName;
   });
 }
 

package/src/tools/MIPJumpToClickTool.ts

@@ -5,6 +5,7 @@ import { getPointInLineOfSightWithCriteria } from '../utilities/planar';
 import jumpToWorld from '../utilities/viewport/jumpToWorld';
 import { PublicToolProps, ToolProps } from '../types';
 import { getToolGroupForViewport } from '../store/ToolGroupManager';
+import { getVolumeId } from '../utilities/getVolumeId';
 
 /**
  * On a Maximum Intensity Projection (MIP) viewport, MIPJumpToClickTool allows the
@@ -54,7 +55,7 @@ class MIPJumpToClickTool extends BaseTool {
       );
     }
 
-    const volumeId = targetId.split(/volumeId:|\?/)[1];
+    const volumeId = getVolumeId(targetId);
 
     // 3. Criteria function to search for the point (maximum intensity)
     let maxIntensity = -Infinity;

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -2,6 +2,7 @@ import { getEnabledElement } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { MouseWheelEventType } from '../types/EventTypes';
 import scroll from '../utilities/scroll';
+import { getVolumeId } from '../utilities/getVolumeId';
 
 /**
  * The StackScrollMouseWheelTool is a tool that allows the user to scroll through a
@@ -35,7 +36,7 @@ class StackScrollMouseWheelTool extends BaseTool {
     const delta = direction * (invert ? -1 : 1);
 
     const targetId = this.getTargetId(viewport);
-    const volumeId = targetId.split(/volumeId:|\?/)[1];
+    const volumeId = getVolumeId(targetId);
 
     scroll(viewport, {
       delta,

package/src/tools/base/AnnotationDisplayTool.ts

@@ -15,6 +15,7 @@ import filterAnnotationsForDisplay from '../../utilities/planar/filterAnnotation
 import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 import { getState } from '../../stateManagement/annotation/config';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
+import { getVolumeId } from '../../utilities/getVolumeId';
 
 /**
  * Abstract class for tools which create and display annotations on the
@@ -137,7 +138,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
     } else if (viewport instanceof VideoViewport) {
       referencedImageId = targetId.split('videoId:')[1];
     } else {
-      const volumeId = targetId.split(/volumeId:|\?/)[1];
+      const volumeId = getVolumeId(targetId);
       const imageVolume = cache.getVolume(volumeId);
 
       referencedImageId = utilities.getClosestImageId(

package/src/tools/base/AnnotationTool.ts

@@ -24,6 +24,7 @@ import {
 import { addAnnotation } from '../../stateManagement/annotation/annotationState';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
 import { triggerAnnotationModified } from '../../stateManagement/annotation/helpers/state';
+import { getVolumeId } from '../../utilities/getVolumeId';
 
 /**
  * Abstract class for tools which create and display annotations on the
@@ -368,7 +369,7 @@ abstract class AnnotationTool extends AnnotationDisplayTool {
     imageId?: string
   ): boolean {
     if (viewport instanceof BaseVolumeViewport) {
-      const volumeId = targetId.split(/volumeId:|\?/)[1];
+      const volumeId = getVolumeId(targetId);
       const volume = cache.getVolume(volumeId);
       return volume.scaling?.PT !== undefined;
     }

package/src/tools/base/BaseTool.ts

@@ -3,6 +3,7 @@ import { Types } from '@cornerstonejs/core';
 import ToolModes from '../../enums/ToolModes';
 import StrategyCallbacks from '../../enums/StrategyCallbacks';
 import { InteractionTypes, ToolProps, PublicToolProps } from '../../types';
+import { getVolumeId } from '../../utilities/getVolumeId';
 
 export interface IBaseTool {
   /** ToolGroup ID the tool instance belongs to */
@@ -208,7 +209,7 @@ abstract class BaseTool implements IBaseTool {
 
       return viewports[0].getImageData();
     } else if (targetId.startsWith('volumeId:')) {
-      const volumeId = targetId.split(/volumeId:|\?/)[1];
+      const volumeId = getVolumeId(targetId);
       const viewports = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/segmentation/BrushTool.ts

@@ -108,6 +108,7 @@ class BrushTool extends BaseTool {
         strategySpecificConfiguration: {
           THRESHOLD: {
             threshold: [-150, -70], // E.g. CT Fat // Only used during threshold strategies.
+            dynamicRadius: 0, // in voxel counts in each direction, only used during dynamic threshold strategies.
           },
         },
         defaultStrategy: 'FILL_INSIDE_CIRCLE',
@@ -126,8 +127,6 @@ class BrushTool extends BaseTool {
           // The time to consider a mouse click a drag when moved less than dragMoveDistance
           dragTimeMs: 500,
         },
-        // Whether to show a center circle/position.  Set to null to not show
-        centerRadius: 2,
         actions: {
           [StrategyCallbacks.AcceptPreview]: {
             method: StrategyCallbacks.AcceptPreview,
@@ -584,6 +583,18 @@ class BrushTool extends BaseTool {
       rightCursorInWorld,
     ];
 
+    const activeStrategy = this.configuration.activeStrategy;
+    const strategy = this.configuration.strategies[activeStrategy];
+
+    // Note: i don't think this is the best way to implement this
+    // but don't think we have a better way to do it for now
+    if (typeof strategy.computeInnerCircleRadius === 'function') {
+      strategy.computeInnerCircleRadius({
+        configuration: this.configuration,
+        viewport,
+      });
+    }
+
     data.invalidated = false;
   }
 
@@ -776,15 +787,20 @@ class BrushTool extends BaseTool {
       }
     );
 
-    const { centerRadius } = this.configuration;
-    if (centerRadius >= 0) {
+    const activeStrategy = this.configuration.activeStrategy;
+    const { dynamicRadiusInCanvas } = this.configuration
+      .strategySpecificConfiguration[activeStrategy] || {
+      dynamicRadiusInCanvas: 0,
+    };
+
+    if (dynamicRadiusInCanvas) {
       const circleUID1 = '1';
       drawCircleSvg(
         svgDrawingHelper,
         annotationUID,
         circleUID1,
         center as Types.Point2,
-        2,
+        dynamicRadiusInCanvas,
         {
           color,
         }

package/src/tools/segmentation/strategies/BrushStrategy.ts

@@ -34,6 +34,7 @@ export type InitializedOperationData = LabelmapToolOperationDataAny & {
   previewSegmentIndex?: number;
 
   brushStrategy: BrushStrategy;
+  configuration?: Record<string, any>;
 };
 
 export type StrategyFunction = (
@@ -110,6 +111,9 @@ export default class BrushStrategy {
       StrategyCallbacks.Preview,
       false
     ),
+    [StrategyCallbacks.ComputeInnerCircleRadius]: addListMethod(
+      StrategyCallbacks.ComputeInnerCircleRadius
+    ),
     // Add other exposed fields below
     // initializers is exposed on the function to allow extension of the composition object
     compositions: null,

package/src/tools/segmentation/strategies/compositions/dynamicThreshold.ts

@@ -1,4 +1,5 @@
 import { vec3 } from 'gl-matrix';
+import type { Types } from '@cornerstonejs/core';
 import type { InitializedOperationData } from '../BrushStrategy';
 import type BoundsIJK from '../../../../types/BoundsIJK';
 import StrategyCallbacks from '../../../../enums/StrategyCallbacks';
@@ -65,4 +66,46 @@ export default {
     }
     strategySpecificConfiguration.THRESHOLD.threshold = null;
   },
+  /**
+   * It computes the inner circle radius in canvas coordinates and stores it
+   * in the strategySpecificConfiguration. This is used to show the user
+   * the area that is used to compute the threshold.
+   */
+  [StrategyCallbacks.ComputeInnerCircleRadius]: (
+    operationData: InitializedOperationData
+  ) => {
+    const { configuration, viewport } = operationData;
+    const { THRESHOLD: { dynamicRadius = 0 } = {} } =
+      configuration.strategySpecificConfiguration || {};
+    const { spacing } = (
+      viewport as Types.IStackViewport | Types.IVolumeViewport
+    ).getImageData();
+    const centerCanvas = [
+      viewport.element.clientWidth / 2,
+      viewport.element.clientHeight / 2,
+    ] as Types.Point2;
+    const radiusInWorld = dynamicRadius * spacing[0];
+    const centerCursorInWorld = viewport.canvasToWorld(centerCanvas);
+
+    const offSetCenterInWorld = centerCursorInWorld.map(
+      (coord) => coord + radiusInWorld
+    ) as Types.Point3;
+
+    const offSetCenterCanvas = viewport.worldToCanvas(offSetCenterInWorld);
+    const dynamicRadiusInCanvas = Math.abs(
+      centerCanvas[0] - offSetCenterCanvas[0]
+    );
+
+    // this is a bit of a hack, since we have switched to using THRESHOLD
+    // as strategy but really strategy names are CIRCLE_THRESHOLD and SPHERE_THRESHOLD
+    // and we can't really change the name of the strategy in the configuration
+    const { strategySpecificConfiguration, activeStrategy } = configuration;
+
+    if (!strategySpecificConfiguration[activeStrategy]) {
+      strategySpecificConfiguration[activeStrategy] = {};
+    }
+
+    strategySpecificConfiguration[activeStrategy].dynamicRadiusInCanvas =
+      dynamicRadiusInCanvas;
+  },
 };

package/src/utilities/getVolumeId.ts

@@ -0,0 +1,13 @@
+export const getVolumeId = (targetId: string) => {
+  const prefix = 'volumeId:';
+  const str = targetId.includes(prefix)
+    ? targetId.substring(prefix.length)
+    : targetId;
+
+  if (str.startsWith('nifti:')) {
+    return str;
+  }
+
+  const index = str.indexOf('?');
+  return index === -1 ? str : str.substring(0, index);
+};