@cornerstonejs/tools 3.7.1 → 3.7.3

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

@@ -11,6 +11,7 @@ import { distanceToPoint } from '../../utilities/math/point';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import { getCalibratedProbeUnitsAndValue } from '../../utilities/getCalibratedUnits';
+import { lineSegment } from '../../utilities/math';
 const { transformWorldToIndex } = csUtils;
 class UltrasoundDirectionalTool extends AnnotationTool {
     static { this.toolName = 'UltrasoundDirectionalTool'; }
@@ -88,6 +89,26 @@ class UltrasoundDirectionalTool extends AnnotationTool {
             return annotation;
         };
         this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
+            const enabledElement = getEnabledElement(element);
+            const { viewport } = enabledElement;
+            const { data } = annotation;
+            const [point1, point2] = data.handles.points;
+            const canvasPoint1 = viewport.worldToCanvas(point1);
+            const canvasPoint2 = viewport.worldToCanvas(point2);
+            const line = {
+                start: {
+                    x: canvasPoint1[0],
+                    y: canvasPoint1[1],
+                },
+                end: {
+                    x: canvasPoint2[0],
+                    y: canvasPoint2[1],
+                },
+            };
+            const distanceToPoint = lineSegment.distanceToPoint([line.start.x, line.start.y], [line.end.x, line.end.y], [canvasCoords[0], canvasCoords[1]]);
+            if (distanceToPoint <= proximity) {
+                return true;
+            }
             return false;
         };
         this._endCallback = (evt) => {

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

@@ -287,7 +287,7 @@ class AnnotationTool extends AnnotationDisplayTool {
         else {
             if (viewport instanceof StackViewport) {
                 const closestImageIndex = csUtils.getClosestStackImageIndexForPoint(points[0], viewport);
-                if (closestImageIndex) {
+                if (closestImageIndex !== undefined) {
                     referencedImageId = viewport.getImageIds()[closestImageIndex];
                 }
             }

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

@@ -148,19 +148,25 @@ export default class LabelmapBaseTool extends BaseTool {
         const { segmentIndex, segmentationId, brushCursor } = this._hoverData || this.createHoverData(element);
         const { data, metadata = {} } = brushCursor || {};
         const { viewPlaneNormal, viewUp } = metadata;
+        const configColor = this.configuration.preview?.previewColors?.[segmentIndex];
+        const { viewport } = getEnabledElement(element);
+        const segmentColor = getSegmentIndexColor(viewport.id, segmentationId, segmentIndex);
+        if (!configColor && !segmentColor) {
+            return;
+        }
         const operationData = {
             ...editData,
             points: data?.handles?.points,
             segmentIndex,
-            previewColors: this.configuration.preview?.enabled || this._previewData.preview
-                ? this.configuration.preview?.previewColors
-                : null,
             viewPlaneNormal,
             toolGroupId: this.toolGroupId,
             segmentationId,
             viewUp,
             activeStrategy: this.configuration.activeStrategy,
             configuration: this.configuration,
+            previewColor: this.configuration.preview.enabled
+                ? configColor || lightenColor(...segmentColor)
+                : null,
             preview: this._previewData?.preview,
             createMemo: this.createMemo.bind(this),
         };
@@ -287,3 +293,11 @@ export default class LabelmapBaseTool extends BaseTool {
         triggerSegmentationDataModified(segmentationId, slices);
     }
 }
+function lightenColor(r, g, b, a, factor = 0.4) {
+    return [
+        Math.round(r + (255 - r) * factor),
+        Math.round(g + (255 - g) * factor),
+        Math.round(b + (255 - b) * factor),
+        a,
+    ];
+}

package/dist/esm/tools/segmentation/strategies/BrushStrategy.d.ts

@@ -16,6 +16,7 @@ export type InitializedOperationData = LabelmapToolOperationDataAny & {
     segmentationImageData: vtkImageData;
     previewVoxelManager: Types.IVoxelManager<number>;
     previewSegmentIndex?: number;
+    previewColor?: [number, number, number, number];
     brushStrategy: BrushStrategy;
     activeStrategy: string;
     configuration?: {

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

@@ -100,7 +100,7 @@ export default class BrushStrategy {
         const { imageVoxelManager, segmentationVoxelManager, segmentationImageData, } = data;
         const previewVoxelManager = operationData.preview?.previewVoxelManager ||
             VoxelManager.createRLEHistoryVoxelManager(segmentationVoxelManager);
-        const previewEnabled = !!operationData.previewColors;
+        const previewEnabled = !!operationData.previewColor;
         const previewSegmentIndex = previewEnabled ? 255 : undefined;
         const initializedData = {
             operationName,

package/dist/esm/tools/segmentation/strategies/compositions/preview.js

@@ -2,18 +2,10 @@ import { triggerSegmentationDataModified } from '../../../../stateManagement/seg
 import StrategyCallbacks from '../../../../enums/StrategyCallbacks';
 import { getSegmentIndexColor, setSegmentIndexColor, } from '../../../../stateManagement/segmentation/config/segmentationColor';
 import { getViewportIdsWithSegmentation } from '../../../../stateManagement/segmentation/getViewportIdsWithSegmentation';
-function lightenColor(r, g, b, a, factor = 0.4) {
-    return [
-        Math.round(r + (255 - r) * factor),
-        Math.round(g + (255 - g) * factor),
-        Math.round(b + (255 - b) * factor),
-        a,
-    ];
-}
 export default {
     [StrategyCallbacks.Preview]: function (operationData) {
-        const { previewColors, configuration, enabledElement } = operationData;
-        if (!previewColors || !configuration) {
+        const { previewColor, configuration, enabledElement } = operationData;
+        if (!previewColor || !configuration) {
             return;
         }
         if (operationData.preview) {
@@ -30,8 +22,8 @@ export default {
         return preview;
     },
     [StrategyCallbacks.Initialize]: (operationData) => {
-        const { segmentIndex, previewSegmentIndex, previewColors, preview, segmentationId, segmentationVoxelManager, } = operationData;
-        if (previewColors === undefined || !previewSegmentIndex) {
+        const { segmentIndex, previewSegmentIndex, previewColor, preview, segmentationId, segmentationVoxelManager, } = operationData;
+        if (previewColor === undefined || !previewSegmentIndex) {
             operationData.memo = operationData.createMemo(segmentationId, segmentationVoxelManager);
             return;
         }
@@ -43,12 +35,6 @@ export default {
         if (segmentIndex === null) {
             return;
         }
-        const configColor = previewColors?.[segmentIndex];
-        const segmentColor = getSegmentIndexColor(operationData.viewport.id, operationData.segmentationId, segmentIndex);
-        if (!configColor && !segmentColor) {
-            return;
-        }
-        const previewColor = configColor || lightenColor(...segmentColor);
         const viewportIds = getViewportIdsWithSegmentation(operationData.segmentationId);
         viewportIds?.forEach((viewportId) => {
             setSegmentIndexColor(viewportId, operationData.segmentationId, previewSegmentIndex, previewColor);

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

@@ -5,7 +5,7 @@ import type { LabelmapMemo } from '../utilities/segmentation/createLabelmapMemo'
 type LabelmapToolOperationData = {
     segmentationId: string;
     segmentIndex: number;
-    previewColors?: Record<number, [number, number, number, number]>;
+    previewColor?: [number, number, number, number];
     segmentsLocked: number[];
     viewPlaneNormal: number[];
     viewUp: number[];

package/dist/esm/utilities/index.d.ts

@@ -38,4 +38,5 @@ import IslandRemoval from './segmentation/islandRemoval';
 import { getPixelValueUnits, getPixelValueUnitsImageId } from './getPixelValueUnits';
 import * as geometricSurfaceUtils from './geometricSurfaceUtils';
 import setAnnotationLabel from './setAnnotationLabel';
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, setAnnotationLabel, };
+import { moveAnnotationToViewPlane } from './moveAnnotationToViewPlane';
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, setAnnotationLabel, moveAnnotationToViewPlane, };

package/dist/esm/utilities/index.js

@@ -38,4 +38,5 @@ import IslandRemoval from './segmentation/islandRemoval';
 import { getPixelValueUnits, getPixelValueUnitsImageId, } from './getPixelValueUnits';
 import * as geometricSurfaceUtils from './geometricSurfaceUtils';
 import setAnnotationLabel from './setAnnotationLabel';
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, setAnnotationLabel, };
+import { moveAnnotationToViewPlane } from './moveAnnotationToViewPlane';
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, setAnnotationLabel, moveAnnotationToViewPlane, };

package/dist/esm/utilities/moveAnnotationToViewPlane.d.ts

@@ -0,0 +1,3 @@
+import type { Annotation } from '../types';
+import { type Types } from '@cornerstonejs/core';
+export declare function moveAnnotationToViewPlane(annotation: Annotation, viewport: Types.IViewport): Annotation;

package/dist/esm/utilities/moveAnnotationToViewPlane.js

@@ -0,0 +1,15 @@
+import { StackViewport } from '@cornerstonejs/core';
+import * as vec3 from 'gl-matrix/vec3';
+export function moveAnnotationToViewPlane(annotation, viewport) {
+    const { data } = annotation;
+    const { points } = data.handles;
+    const { focalPoint, viewPlaneNormal } = viewport.getCamera();
+    const projectedDistance = vec3.dot(vec3.sub(vec3.create(), points[0], focalPoint), viewPlaneNormal);
+    points.forEach((point) => {
+        vec3.add(point, point, vec3.scale(vec3.create(), [-viewPlaneNormal[0], -viewPlaneNormal[1], -viewPlaneNormal[2]], projectedDistance));
+    });
+    if (viewport instanceof StackViewport) {
+        annotation.metadata.referencedImageId = viewport.getCurrentImageId();
+    }
+    return annotation;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.7.1",
+    "@cornerstonejs/core": "^3.7.3",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "a4fe414ad0c938b9f842127dea4b0d12e334ac25"
+  "gitHead": "319a7741f4757201093d6b234a92dc6278d26f66"
 }