@cornerstonejs/tools 1.65.1 → 1.65.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.65.1",
+  "version": "1.65.3",
   "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.1",
+    "@cornerstonejs/core": "^1.65.3",
     "@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": "b8cf31075c8069d9124c2d12e9360baf9bae267e"
+  "gitHead": "7059912b7d083525acdc48af7d0d38eec27efa64"
 }

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/tools/annotation/PlanarFreehandROITool.ts

@@ -847,7 +847,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
 
     triggerAnnotationModified(
       annotation,
-      enabledElement.element,
+      enabledElement.viewport.element,
       ChangeTypes.StatsUpdated
     );
 

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;
+  },
 };