@cornerstonejs/tools 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/esm/tools/annotation/CircleROITool.d.ts

@@ -1,14 +1,12 @@
 import { AnnotationTool } from '../base';
 import type { Types } from '@cornerstonejs/core';
-import { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper } from '../../types';
-import { CircleROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../../types';
+import type { CircleROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class CircleROITool extends AnnotationTool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
-    _throttledCalculateCachedStats: any;
+    _throttledCalculateCachedStats: Function;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: Array<string>;
         handleIndex?: number;
         movingTextBox?: boolean;
@@ -26,7 +24,7 @@ declare class CircleROITool extends AnnotationTool {
     _dragDrawCallback: (evt: EventTypes.InteractionEventType) => void;
     _dragModifyCallback: (evt: EventTypes.InteractionEventType) => void;
     _dragHandle: (evt: EventTypes.InteractionEventType) => void;
-    cancel: (element: HTMLDivElement) => any;
+    cancel: (element: HTMLDivElement) => string;
     _activateModify: (element: any) => void;
     _deactivateModify: (element: any) => void;
     _activateDraw: (element: any) => void;

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

@@ -15,7 +15,6 @@ import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import getWorldWidthAndHeightFromTwoPoints from '../../utilities/planar/getWorldWidthAndHeightFromTwoPoints';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
-import { pointInShapeCallback } from '../../utilities';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { getCanvasCircleCorners, getCanvasCircleRadius, } from '../../utilities/math/circle';
@@ -28,6 +27,7 @@ class CircleROITool extends AnnotationTool {
         configuration: {
             shadow: true,
             preventHandleOutsideImage: false,
+            storePointData: false,
             centerPointRadius: 0,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
@@ -473,7 +473,7 @@ class CircleROITool extends AnnotationTool {
                 if (!image) {
                     continue;
                 }
-                const { dimensions, imageData, metadata, hasPixelSpacing } = image;
+                const { dimensions, imageData, metadata, voxelManager } = image;
                 const pos1Index = transformWorldToIndex(imageData, worldPos1);
                 pos1Index[0] = Math.floor(pos1Index[0]);
                 pos1Index[1] = Math.floor(pos1Index[1]);
@@ -518,9 +518,12 @@ class CircleROITool extends AnnotationTool {
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                     };
                     const pixelValueUnits = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
-                    const pointsInShape = pointInShapeCallback(imageData, (pointLPS) => pointInEllipse(ellipseObj, pointLPS, {
-                        fast: true,
-                    }), this.configuration.statsCalculator.statsCallback, boundsIJK);
+                    const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                        isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
+                        boundsIJK,
+                        imageData,
+                        returnPoints: this.configuration.storePointData,
+                    });
                     const stats = this.configuration.statsCalculator.getStatistics();
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,

package/dist/esm/tools/annotation/CobbAngleTool.d.ts

@@ -1,15 +1,13 @@
 import type { Types } from '@cornerstonejs/core';
 import { AnnotationTool } from '../base';
-import { EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes, SVGDrawingHelper } from '../../types';
-import { CobbAngleAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes, SVGDrawingHelper, Annotation } from '../../types';
+import type { CobbAngleAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class CobbAngleTool extends AnnotationTool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
     angleStartedNotYetCompleted: boolean;
-    _throttledCalculateCachedStats: any;
+    _throttledCalculateCachedStats: Function;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: string[];
         handleIndex?: number;
         movingTextBox?: boolean;
@@ -28,7 +26,7 @@ declare class CobbAngleTool extends AnnotationTool {
     _mouseUpCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
     _mouseDownCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
     _mouseDragCallback: (evt: EventTypes.MouseDragEventType | EventTypes.MouseMoveEventType) => void;
-    cancel: (element: HTMLDivElement) => any;
+    cancel: (element: HTMLDivElement) => string;
     _activateModify: (element: HTMLDivElement) => void;
     _deactivateModify: (element: HTMLDivElement) => void;
     _activateDraw: (element: HTMLDivElement) => void;

package/dist/esm/tools/annotation/DragProbeTool.d.ts

@@ -1,13 +1,11 @@
 import type { Types } from '@cornerstonejs/core';
-import { EventTypes, PublicToolProps, SVGDrawingHelper, ToolProps } from '../../types';
+import type { Annotation, EventTypes, PublicToolProps, SVGDrawingHelper, ToolProps } from '../../types';
 import ProbeTool from './ProbeTool';
-import { ProbeAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { ProbeAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class DragProbeTool extends ProbeTool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: string[];
         newAnnotation?: boolean;
     } | null;

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

@@ -4,7 +4,6 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { hideElementCursor } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import ProbeTool from './ProbeTool';
-import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 class DragProbeTool extends ProbeTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -84,10 +83,6 @@ class DragProbeTool extends ProbeTool {
                 annotation,
                 styleSpecifier,
             });
-            const pixelUnitsOptions = {
-                isPreScaled: isViewportPreScaled(viewport, targetId),
-                isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
-            };
             if (!data.cachedStats[targetId] ||
                 data.cachedStats[targetId].value == null) {
                 data.cachedStats[targetId] = {

package/dist/esm/tools/annotation/EllipticalROITool.d.ts

@@ -1,14 +1,12 @@
 import { AnnotationTool } from '../base';
 import type { Types } from '@cornerstonejs/core';
-import { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper } from '../../types';
-import { EllipticalROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../../types';
+import type { EllipticalROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class EllipticalROITool extends AnnotationTool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
-    _throttledCalculateCachedStats: any;
+    _throttledCalculateCachedStats: Function;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: Array<string>;
         handleIndex?: number;
         movingTextBox?: boolean;
@@ -30,7 +28,7 @@ declare class EllipticalROITool extends AnnotationTool {
     _dragDrawCallback: (evt: EventTypes.InteractionEventType) => void;
     _dragModifyCallback: (evt: EventTypes.InteractionEventType) => void;
     _dragHandle: (evt: EventTypes.InteractionEventType) => void;
-    cancel: (element: HTMLDivElement) => any;
+    cancel: (element: HTMLDivElement) => string;
     _activateModify: (element: any) => void;
     _deactivateModify: (element: any) => void;
     _activateDraw: (element: any) => void;

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

@@ -16,7 +16,6 @@ import getWorldWidthAndHeightFromTwoPoints from '../../utilities/planar/getWorld
 import { pointInEllipse, getCanvasEllipseCorners, } from '../../utilities/math/ellipse';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
-import { pointInShapeCallback } from '../../utilities/';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
@@ -27,6 +26,7 @@ class EllipticalROITool extends AnnotationTool {
         configuration: {
             shadow: true,
             preventHandleOutsideImage: false,
+            storePointData: false,
             centerPointRadius: 0,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
@@ -553,7 +553,7 @@ class EllipticalROITool extends AnnotationTool {
                 if (!image) {
                     continue;
                 }
-                const { dimensions, imageData, metadata } = image;
+                const { dimensions, imageData, metadata, voxelManager } = image;
                 const pos1Index = transformWorldToIndex(imageData, worldPos1);
                 pos1Index[0] = Math.floor(pos1Index[0]);
                 pos1Index[1] = Math.floor(pos1Index[1]);
@@ -597,7 +597,12 @@ class EllipticalROITool extends AnnotationTool {
                     isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                 };
                 const pixelValueUnits = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
-                const pointsInShape = pointInShapeCallback(imageData, (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }), this.configuration.statsCalculator.statsCallback, boundsIJK);
+                const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                    boundsIJK,
+                    imageData,
+                    isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
+                    returnPoints: this.configuration.storePointData,
+                });
                 const stats = this.configuration.statsCalculator.getStatistics();
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,

package/dist/esm/tools/annotation/HeightTool.d.ts

@@ -0,0 +1,36 @@
+import type { Types } from '@cornerstonejs/core';
+import { AnnotationTool } from '../base';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../../types';
+import type { LengthAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+declare class HeightTool extends AnnotationTool {
+    static toolName: any;
+    _throttledCalculateCachedStats: Function;
+    editData: {
+        annotation: Annotation;
+        viewportIdsToRender: string[];
+        handleIndex?: number;
+        movingTextBox?: boolean;
+        newAnnotation?: boolean;
+        hasMoved?: boolean;
+    } | null;
+    isDrawing: boolean;
+    isHandleOutsideImage: boolean;
+    midX: number;
+    constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
+    addNewAnnotation: (evt: EventTypes.InteractionEventType) => LengthAnnotation;
+    isPointNearTool: (element: HTMLDivElement, annotation: LengthAnnotation, canvasCoords: Types.Point2, proximity: number) => boolean;
+    toolSelectedCallback: (evt: EventTypes.InteractionEventType, annotation: LengthAnnotation) => void;
+    handleSelectedCallback(evt: EventTypes.InteractionEventType, annotation: LengthAnnotation, handle: ToolHandle): void;
+    _endCallback: (evt: EventTypes.InteractionEventType) => void;
+    _dragCallback: (evt: EventTypes.InteractionEventType) => void;
+    cancel: (element: HTMLDivElement) => string;
+    _activateModify: (element: HTMLDivElement) => void;
+    _deactivateModify: (element: HTMLDivElement) => void;
+    _activateDraw: (element: HTMLDivElement) => void;
+    _deactivateDraw: (element: HTMLDivElement) => void;
+    renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
+    _calculateHeight(pos1: any, pos2: any): number;
+    _calculateCachedStats(annotation: any, renderingEngine: any, enabledElement: any): any;
+    _isInsideVolume(index1: any, index2: any, dimensions: any): boolean;
+}
+export default HeightTool;