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

package/dist/esm/tools/WindowLevelTool.js

@@ -47,8 +47,7 @@ class WindowLevelTool extends BaseTool {
         let isPreScaled = false;
         const properties = viewport.getProperties();
         if (viewport instanceof VolumeViewport) {
-            const targetId = this.getTargetId(viewport);
-            volumeId = utilities.getVolumeId(targetId);
+            volumeId = this.getTargetVolumeId(viewport);
             viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
             ({ lower, upper } = properties.voiRange);
             const volume = cache.getVolume(volumeId);
@@ -135,9 +134,11 @@ class WindowLevelTool extends BaseTool {
         let imageDynamicRange;
         if (volumeId) {
             const imageVolume = cache.getVolume(volumeId);
-            const { dimensions } = imageVolume;
-            const scalarData = imageVolume.getScalarData();
-            const calculatedDynamicRange = this._getImageDynamicRangeFromMiddleSlice(scalarData, dimensions);
+            const { voxelManager } = viewport.getImageData();
+            const middleSlicePixelData = voxelManager.getMiddleSliceData();
+            const calculatedDynamicRange = middleSlicePixelData.reduce((acc, pixel) => {
+                return [Math.min(acc[0], pixel), Math.max(acc[1], pixel)];
+            }, [Infinity, -Infinity]);
             const BitsStored = imageVolume?.metadata?.BitsStored;
             const metadataDynamicRange = BitsStored ? 2 ** BitsStored : Infinity;
             imageDynamicRange = Math.min(calculatedDynamicRange, metadataDynamicRange);
@@ -149,7 +150,11 @@ class WindowLevelTool extends BaseTool {
         return ratio > 1 ? Math.round(ratio) : ratio;
     }
     _getImageDynamicRangeFromViewport(viewport) {
-        const { imageData } = viewport.getImageData();
+        const { imageData, voxelManager } = viewport.getImageData();
+        if (voxelManager?.getRange) {
+            const range = voxelManager.getRange();
+            return range[1] - range[0];
+        }
         const dimensions = imageData.getDimensions();
         if (imageData.getRange) {
             const imageDataRange = imageData.getRange();
@@ -160,7 +165,7 @@ class WindowLevelTool extends BaseTool {
             scalarData = imageData.getScalarData();
         }
         else {
-            scalarData = imageData.getPointData().getScalars();
+            scalarData = imageData.getPointData().getScalars().getData();
         }
         if (dimensions[2] !== 1) {
             return this._getImageDynamicRangeFromMiddleSlice(scalarData, dimensions);

package/dist/esm/tools/ZoomTool.d.ts

@@ -1,6 +1,6 @@
-import { Types } from '@cornerstonejs/core';
+import type { Types } from '@cornerstonejs/core';
 import { BaseTool } from './base';
-import { EventTypes, PublicToolProps, ToolProps } from '../types';
+import type { EventTypes, PublicToolProps, ToolProps } from '../types';
 declare class ZoomTool extends BaseTool {
     static toolName: any;
     touchDragCallback: (evt: EventTypes.InteractionEventType) => void;

package/dist/esm/tools/ZoomTool.js

@@ -7,8 +7,8 @@ class ZoomTool extends BaseTool {
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
             zoomToCenter: false,
-            minZoomScale: 0.1,
-            maxZoomScale: 30,
+            minZoomScale: 0.001,
+            maxZoomScale: 3000,
             pinchToZoom: true,
             pan: true,
             invert: false,

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

@@ -1,15 +1,13 @@
 import type { Types } from '@cornerstonejs/core';
 import { AnnotationTool } from '../base';
-import { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper } from '../../types';
-import { AngleAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../../types';
+import type { AngleAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class AngleTool 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;
@@ -25,7 +23,7 @@ declare class AngleTool extends AnnotationTool {
     handleSelectedCallback(evt: EventTypes.InteractionEventType, annotation: AngleAnnotation, handle: ToolHandle): void;
     _endCallback: (evt: EventTypes.InteractionEventType) => void;
     _dragCallback: (evt: EventTypes.InteractionEventType) => 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/AngleTool.js

@@ -6,9 +6,8 @@ import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateMan
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import * as lineSegment from '../../utilities/math/line';
 import angleBetweenLines from '../../utilities/math/angle/angleBetweenLines';
-import { roundNumber } from '../../utilities';
 import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
@@ -441,7 +440,9 @@ function defaultGetTextLines(data, targetId) {
     if (isNaN(angle)) {
         return [`${angle}`];
     }
-    const textLines = [`${roundNumber(angle)} ${String.fromCharCode(176)}`];
+    const textLines = [
+        `${csUtils.roundNumber(angle)} ${String.fromCharCode(176)}`,
+    ];
     return textLines;
 }
 AngleTool.toolName = 'Angle';

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

@@ -1,14 +1,12 @@
 import type { Types } from '@cornerstonejs/core';
 import { AnnotationTool } from '../base';
-import { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper } from '../../types';
-import { ArrowAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../../types';
+import type { ArrowAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 declare class ArrowAnnotateTool extends AnnotationTool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
-    _throttledCalculateCachedStats: any;
+    _throttledCalculateCachedStats: Function;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: string[];
         handleIndex?: number;
         movingTextBox?: boolean;
@@ -27,7 +25,7 @@ declare class ArrowAnnotateTool extends AnnotationTool {
     touchTapCallback: (evt: EventTypes.TouchTapEventType) => void;
     doubleClickCallback: (evt: EventTypes.TouchTapEventType) => void;
     _doneChangingTextCallback(element: any, annotation: any, updatedText: any): 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/ArrowAnnotateTool.js

@@ -5,7 +5,7 @@ import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateMan
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import * as lineSegment from '../../utilities/math/line';
 import { drawHandles as drawHandlesSvg, drawArrow as drawArrowSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';

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

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

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

@@ -1,7 +1,6 @@
 import { vec2, vec3 } from 'gl-matrix';
 import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
@@ -9,7 +8,7 @@ import { isAnnotationLocked } from '../../stateManagement/annotation/annotationL
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawLine as drawLineSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import * as lineSegment from '../../utilities/math/line';
@@ -721,7 +720,7 @@ function defaultGetTextLines(data, targetId) {
     if (length === undefined) {
         return textLines;
     }
-    textLines.push(`L: ${roundNumber(length)} ${lengthUnits || unit}`, `W: ${roundNumber(width)} ${widthUnit || unit}`);
+    textLines.push(`L: ${csUtils.roundNumber(length)} ${lengthUnits || unit}`, `W: ${csUtils.roundNumber(width)} ${widthUnit || unit}`);
     return textLines;
 }
 BidirectionalTool.toolName = 'Bidirectional';

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

@@ -1,21 +1,19 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
-import { getCalibratedAspect } from '../../utilities/getCalibratedUnits';
-import { getCalibratedLengthUnitsAndScale, roundNumber } from '../../utilities';
+import { getCalibratedAspect, getCalibratedLengthUnitsAndScale, } from '../../utilities/getCalibratedUnits';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawCircle as drawCircleSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 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 +26,7 @@ class CircleROITool extends AnnotationTool {
         configuration: {
             shadow: true,
             preventHandleOutsideImage: false,
+            storePointData: false,
             centerPointRadius: 0,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
@@ -473,7 +472,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 +517,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,
@@ -563,23 +565,23 @@ function defaultGetTextLines(data, targetId) {
     if (radius) {
         const radiusLine = isEmptyArea
             ? `Radius: Oblique not supported`
-            : `Radius: ${roundNumber(radius)} ${radiusUnit}`;
+            : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`;
         textLines.push(radiusLine);
     }
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     }
     return textLines;
 }

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/CobbAngleTool.js

@@ -10,7 +10,7 @@ import * as lineSegment from '../../utilities/math/line';
 import angleBetweenLines from '../../utilities/math/angle/angleBetweenLines';
 import { midPoint2 } from '../../utilities/math/midPoint';
 import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, drawTextBox as drawTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';

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

@@ -1,14 +1,13 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawCircle as drawCircleSvg, drawEllipseByCoordinates as drawEllipseSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
@@ -16,7 +15,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 +25,7 @@ class EllipticalROITool extends AnnotationTool {
         configuration: {
             shadow: true,
             preventHandleOutsideImage: false,
+            storePointData: false,
             centerPointRadius: 0,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
@@ -553,7 +552,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 +596,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,
@@ -652,17 +656,17 @@ function defaultGetTextLines(data, targetId) {
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     }
     return textLines;
 }

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;