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

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';
@@ -609,13 +608,13 @@ class BidirectionalTool extends AnnotationTool {
                 const index4 = transformWorldToIndex(imageData, worldPos4);
                 const handles1 = [index1, index2];
                 const handles2 = [index3, index4];
-                const { scale: scale1, lengthUnits: units1 } = getCalibratedLengthUnitsAndScale(image, handles1);
-                const { scale: scale2, lengthUnits: units2 } = getCalibratedLengthUnitsAndScale(image, handles2);
+                const { scale: scale1, unit: units1 } = getCalibratedLengthUnitsAndScale(image, handles1);
+                const { scale: scale2, unit: units2 } = getCalibratedLengthUnitsAndScale(image, handles2);
                 const dist1 = this._calculateLength(worldPos1, worldPos2) / scale1;
                 const dist2 = this._calculateLength(worldPos3, worldPos4) / scale2;
                 const length = dist1 > dist2 ? dist1 : dist2;
                 const width = dist1 > dist2 ? dist2 : dist1;
-                const lengthUnits = dist1 > dist2 ? units1 : units2;
+                const unit = dist1 > dist2 ? units1 : units2;
                 const widthUnit = dist1 > dist2 ? units2 : units1;
                 this._isInsideVolume(index1, index2, index3, index4, dimensions)
                     ? (this.isHandleOutsideImage = false)
@@ -623,7 +622,7 @@ class BidirectionalTool extends AnnotationTool {
                 cachedStats[targetId] = {
                     length,
                     width,
-                    lengthUnits,
+                    unit,
                     widthUnit,
                 };
             }
@@ -713,7 +712,7 @@ class BidirectionalTool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const { cachedStats, label } = data;
-    const { length, width, unit, lengthUnits, widthUnit } = cachedStats[targetId];
+    const { length, width, unit } = cachedStats[targetId];
     const textLines = [];
     if (label) {
         textLines.push(label);
@@ -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)} ${unit || unit}`, `W: ${csUtils.roundNumber(width)} ${unit}`);
     return textLines;
 }
 BidirectionalTool.toolName = 'Bidirectional';

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

@@ -1,14 +1,13 @@
 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';
@@ -347,14 +346,14 @@ class CircleROITool extends AnnotationTool {
                 const canvasCorners = getCanvasCircleCorners(canvasCoordinates);
                 const { centerPointRadius } = this.configuration;
                 if (!data.cachedStats[targetId] ||
-                    data.cachedStats[targetId].areaUnits == null) {
+                    data.cachedStats[targetId].areaUnit == null) {
                     data.cachedStats[targetId] = {
                         Modality: null,
                         area: null,
                         max: null,
                         mean: null,
                         stdDev: null,
-                        areaUnits: null,
+                        areaUnit: null,
                         radius: null,
                         radiusUnit: null,
                         perimeter: null,
@@ -508,7 +507,7 @@ class CircleROITool extends AnnotationTool {
                     const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                     const isEmptyArea = worldWidth === 0 && worldHeight === 0;
                     const handles = [pos1Index, pos2Index];
-                    const { scale, lengthUnits, areaUnits } = getCalibratedLengthUnitsAndScale(image, handles);
+                    const { scale, unit, areaUnit } = getCalibratedLengthUnitsAndScale(image, handles);
                     const aspect = getCalibratedAspect(image);
                     const area = Math.abs(Math.PI *
                         (worldWidth / scale / 2) *
@@ -517,7 +516,7 @@ class CircleROITool extends AnnotationTool {
                         isPreScaled: isViewportPreScaled(viewport, targetId),
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                     };
-                    const pixelValueUnits = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
+                    const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                     const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
                         isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
                         boundsIJK,
@@ -534,11 +533,11 @@ class CircleROITool extends AnnotationTool {
                         statsArray: stats.array,
                         pointsInShape: pointsInShape,
                         isEmptyArea,
-                        areaUnits,
+                        areaUnit,
                         radius: worldWidth / 2 / scale,
-                        radiusUnit: lengthUnits,
+                        radiusUnit: unit,
                         perimeter: (2 * Math.PI * (worldWidth / 2)) / scale,
-                        pixelValueUnits,
+                        modalityUnit,
                     };
                 }
                 else {
@@ -561,28 +560,28 @@ class CircleROITool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { radius, radiusUnit, area, mean, stdDev, max, isEmptyArea, areaUnits, pixelValueUnits, } = cachedVolumeStats;
+    const { radius, radiusUnit, area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit, } = cachedVolumeStats;
     const textLines = [];
     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)} ${areaUnit}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
     return textLines;
 }

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

@@ -117,13 +117,13 @@ class DragProbeTool extends ProbeTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { index, value, pixelValueUnits } = cachedVolumeStats;
+    const { index, value, modalityUnit } = cachedVolumeStats;
     if (value === undefined) {
         return;
     }
     const textLines = [];
     textLines.push(`(${index[0]}, ${index[1]}, ${index[2]})`);
-    textLines.push(`${value.toFixed(2)} ${pixelValueUnits}`);
+    textLines.push(`${value.toFixed(2)} ${modalityUnit}`);
     return textLines;
 }
 DragProbeTool.toolName = 'DragProbe';

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';
@@ -428,14 +427,14 @@ class EllipticalROITool extends AnnotationTool {
                 const canvasCorners = (getCanvasEllipseCorners(canvasCoordinates));
                 const { centerPointRadius } = this.configuration;
                 if (!data.cachedStats[targetId] ||
-                    data.cachedStats[targetId].areaUnits == null) {
+                    data.cachedStats[targetId].areaUnit == null) {
                     data.cachedStats[targetId] = {
                         Modality: null,
                         area: null,
                         max: null,
                         mean: null,
                         stdDev: null,
-                        areaUnits: null,
+                        areaUnit: null,
                     };
                     this._calculateCachedStats(annotation, viewport, renderingEngine);
                 }
@@ -588,7 +587,7 @@ class EllipticalROITool extends AnnotationTool {
                 const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                 const isEmptyArea = worldWidth === 0 && worldHeight === 0;
                 const handles = [pos1Index, post2Index];
-                const { scale, areaUnits } = getCalibratedLengthUnitsAndScale(image, handles);
+                const { scale, areaUnit } = getCalibratedLengthUnitsAndScale(image, handles);
                 const area = Math.abs(Math.PI * (worldWidth / 2) * (worldHeight / 2)) /
                     scale /
                     scale;
@@ -596,7 +595,7 @@ class EllipticalROITool extends AnnotationTool {
                     isPreScaled: isViewportPreScaled(viewport, targetId),
                     isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                 };
-                const pixelValueUnits = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
+                const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                 const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
                     boundsIJK,
                     imageData,
@@ -613,8 +612,8 @@ class EllipticalROITool extends AnnotationTool {
                     statsArray: stats.array,
                     pointsInShape,
                     isEmptyArea,
-                    areaUnits,
-                    pixelValueUnits,
+                    areaUnit,
+                    modalityUnit,
                 };
             }
             annotation.invalidated = false;
@@ -652,22 +651,22 @@ class EllipticalROITool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { area, mean, stdDev, max, isEmptyArea, areaUnits, pixelValueUnits } = cachedVolumeStats;
+    const { area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit } = cachedVolumeStats;
     const textLines = [];
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
     return textLines;
 }

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

@@ -1,7 +1,6 @@
 import { Events } from '../../enums';
 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';
@@ -10,7 +9,7 @@ import { isAnnotationVisible } from '../../stateManagement/annotation/annotation
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import * as lineSegment from '../../utilities/math/line';
 import { drawHandles as drawHandlesSvg, drawHeight as drawHeightSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } 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';
@@ -404,13 +403,13 @@ class HeightTool extends AnnotationTool {
             const index1 = transformWorldToIndex(imageData, worldPos1);
             const index2 = transformWorldToIndex(imageData, worldPos2);
             const handles = [index1, index2];
-            const { scale, lengthUnits } = getCalibratedLengthUnitsAndScale(image, handles);
+            const { scale, unit } = getCalibratedLengthUnitsAndScale(image, handles);
             const height = this._calculateHeight(worldPos1, worldPos2) / scale;
             const outside = this._isInsideVolume(index1, index2, dimensions);
             this.isHandleOutsideImage = outside;
             cachedStats[targetId] = {
                 height,
-                lengthUnits,
+                unit,
             };
         }
         annotation.invalidated = false;
@@ -424,11 +423,11 @@ class HeightTool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { height, lengthUnits } = cachedVolumeStats;
+    const { height, unit } = cachedVolumeStats;
     if (height === undefined || height === null || isNaN(height)) {
         return;
     }
-    const textLines = [`${roundNumber(height)} ${lengthUnits}`];
+    const textLines = [`${csUtils.roundNumber(height)} ${unit}`];
     return textLines;
 }
 HeightTool.toolName = 'Height';

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

@@ -4,7 +4,7 @@ import { AnnotationTool } from '../base';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawArrow as drawArrowSvg } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor } from '../../cursors/elementCursor';

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

@@ -1,7 +1,6 @@
 import { Events } from '../../enums';
 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';
@@ -10,7 +9,7 @@ import { isAnnotationVisible } from '../../stateManagement/annotation/annotation
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import * as lineSegment from '../../utilities/math/line';
 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 { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
@@ -395,14 +394,14 @@ class LengthTool extends AnnotationTool {
             const index1 = transformWorldToIndex(imageData, worldPos1);
             const index2 = transformWorldToIndex(imageData, worldPos2);
             const handles = [index1, index2];
-            const { scale, lengthUnits } = getCalibratedLengthUnitsAndScale(image, handles);
+            const { scale, unit } = getCalibratedLengthUnitsAndScale(image, handles);
             const length = this._calculateLength(worldPos1, worldPos2) / scale;
             this._isInsideVolume(index1, index2, dimensions)
                 ? (this.isHandleOutsideImage = false)
                 : (this.isHandleOutsideImage = true);
             cachedStats[targetId] = {
                 length,
-                lengthUnits,
+                unit,
             };
         }
         annotation.invalidated = false;
@@ -416,11 +415,11 @@ class LengthTool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { length, lengthUnits } = cachedVolumeStats;
+    const { length, unit } = cachedVolumeStats;
     if (length === undefined || length === null || isNaN(length)) {
         return;
     }
-    const textLines = [`${roundNumber(length)} ${lengthUnits}`];
+    const textLines = [`${csUtils.roundNumber(length)} ${unit}`];
     return textLines;
 }
 LengthTool.toolName = 'Length';

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

@@ -2,11 +2,12 @@ import { vec3 } from 'gl-matrix';
 import { getEnabledElement, utilities as csUtils, VolumeViewport, } from '@cornerstonejs/core';
 import { removeAnnotation } from '../../stateManagement/annotation/annotationState';
 import { drawHandles as drawHandlesSvg } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events, KeyboardBindings, ChangeTypes } from '../../enums';
 import { resetElementCursor } from '../../cursors/elementCursor';
 import getMouseModifierKey from '../../eventDispatchers/shared/getMouseModifier';
-import { math, triggerAnnotationRenderForViewportIds } from '../../utilities';
+import * as math from '../../utilities/math';
+import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import findHandlePolylineIndex from '../../utilities/contours/findHandlePolylineIndex';
 import { ContourWindingDirection } from '../../types/ContourAnnotation';
 import { triggerAnnotationModified, triggerContourAnnotationCompleted, } from '../../stateManagement/annotation/helpers/state';

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

@@ -1,5 +1,4 @@
-import type { PublicToolProps } from '../../types';
-import type { AnnotationRenderContext } from '../../types';
+import type { AnnotationRenderContext, PublicToolProps } from '../../types';
 import PlanarFreehandROITool from './PlanarFreehandROITool';
 declare class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
     static toolName: any;

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

@@ -35,23 +35,23 @@ declare class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     protected renderAnnotationInstance(renderContext: AnnotationRenderContext): boolean;
     _calculateStatsIfActive(annotation: PlanarFreehandROIAnnotation, targetId: string, viewport: any, renderingEngine: any, enabledElement: any): void;
     private _calculateCachedStats;
-    protected updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, pixelValueUnits, canvasCoordinates, calibratedScale, }: {
+    protected updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, }: {
         viewport: any;
         points: any;
         imageData: any;
         metadata: any;
         cachedStats: any;
         targetId: any;
-        pixelValueUnits: any;
+        modalityUnit: any;
         canvasCoordinates: any;
         calibratedScale: any;
     }): void;
-    protected updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, pixelValueUnits, calibratedScale, }: {
+    protected updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, }: {
         targetId: any;
         metadata: any;
         canvasCoordinates: any;
         cachedStats: any;
-        pixelValueUnits: any;
+        modalityUnit: any;
         calibratedScale: any;
     }): void;
     private _renderStats;

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

@@ -1,7 +1,7 @@
 import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { math, roundNumber } from '../../utilities';
+import * as math from '../../utilities/math';
 import { polyline } from '../../utilities/math';
 import { filterAnnotationsForDisplay } from '../../utilities/planar';
 import throttle from '../../utilities/throttle';
@@ -148,7 +148,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                     isPreScaled: isViewportPreScaled(viewport, targetId),
                     isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                 };
-                const pixelValueUnits = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
+                const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                 const calibratedScale = getCalibratedLengthUnitsAndScale(image, () => {
                     const polyline = data.contour.polyline;
                     const numPoints = polyline.length;
@@ -175,7 +175,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                         imageData,
                         metadata,
                         cachedStats,
-                        pixelValueUnits,
+                        modalityUnit,
                         calibratedScale,
                     });
                 }
@@ -185,7 +185,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                         canvasCoordinates,
                         targetId,
                         cachedStats,
-                        pixelValueUnits,
+                        modalityUnit,
                         calibratedScale,
                     });
                 }
@@ -365,14 +365,14 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         if (!this.commonData?.movingTextBox) {
             const { data } = annotation;
             if (!data.cachedStats[targetId] ||
-                data.cachedStats[targetId].areaUnits == null) {
+                data.cachedStats[targetId].areaUnit == null) {
                 data.cachedStats[targetId] = {
                     Modality: null,
                     area: null,
                     max: null,
                     mean: null,
                     stdDev: null,
-                    areaUnits: null,
+                    areaUnit: null,
                 };
                 this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
             }
@@ -381,8 +381,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             }
         }
     }
-    updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, pixelValueUnits, canvasCoordinates, calibratedScale, }) {
-        const { scale, areaUnits, units } = calibratedScale;
+    updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, }) {
+        const { scale, areaUnit, units } = calibratedScale;
         const { voxelManager } = viewport.getImageData();
         const canvasPoint = canvasCoordinates[0];
         const originalWorldPoint = viewport.canvasToWorld(canvasPoint);
@@ -484,45 +484,45 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             stdDev: stats.stdDev?.value,
             statsArray: stats.array,
             pointsInShape: pointsInShape,
-            areaUnits,
-            pixelValueUnits,
-            lengthUnits: units,
+            areaUnit,
+            modalityUnit,
+            unit: units,
         };
     }
-    updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, pixelValueUnits, calibratedScale, }) {
+    updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, }) {
         const { scale, units } = calibratedScale;
         cachedStats[targetId] = {
             Modality: metadata.Modality,
             length: calculatePerimeter(canvasCoordinates, false) / scale,
-            pixelValueUnits,
+            modalityUnit,
             getPixelValueUnitunit: units,
         };
     }
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { area, mean, stdDev, length, perimeter, max, isEmptyArea, lengthUnits, areaUnits, pixelValueUnits, } = cachedVolumeStats || {};
+    const { area, mean, stdDev, length, perimeter, max, isEmptyArea, unit, areaUnit, modalityUnit, } = cachedVolumeStats || {};
     const textLines = [];
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
     if (Number.isFinite(max)) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
     if (perimeter) {
-        textLines.push(`Perimeter: ${roundNumber(perimeter)} ${lengthUnits}`);
+        textLines.push(`Perimeter: ${csUtils.roundNumber(perimeter)} ${unit}`);
     }
     if (length) {
-        textLines.push(`${roundNumber(length)} ${lengthUnits}`);
+        textLines.push(`${csUtils.roundNumber(length)} ${unit}`);
     }
     return textLines;
 }

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

@@ -5,10 +5,9 @@ import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateMan
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { getCalibratedProbeUnitsAndValue } from '../../utilities/getCalibratedUnits';
 import { drawHandles as drawHandlesSvg, drawTextBox as drawTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
-import { roundNumber } from '../../utilities';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
@@ -279,25 +278,25 @@ class ProbeTool extends AnnotationTool {
                     const viewport = viewports[0];
                     ijk[2] = viewport.getCurrentImageIdIndex();
                 }
-                let pixelValueUnits;
+                let modalityUnit;
                 if (modality === 'US') {
                     const calibratedResults = getCalibratedProbeUnitsAndValue(image, [
                         ijk,
                     ]);
                     const hasEnhancedRegionValues = calibratedResults.values.every((value) => value !== null);
                     value = (hasEnhancedRegionValues ? calibratedResults.values : value);
-                    pixelValueUnits = hasEnhancedRegionValues
+                    modalityUnit = hasEnhancedRegionValues
                         ? calibratedResults.units
                         : 'raw';
                 }
                 else {
-                    pixelValueUnits = getPixelValueUnits(modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
+                    modalityUnit = getPixelValueUnits(modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                 }
                 cachedStats[targetId] = {
                     index: ijk,
                     value,
                     Modality: modality,
-                    pixelValueUnits,
+                    modalityUnit,
                 };
             }
             else {
@@ -315,19 +314,19 @@ class ProbeTool extends AnnotationTool {
 }
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
-    const { index, value, pixelValueUnits } = cachedVolumeStats;
+    const { index, value, modalityUnit } = cachedVolumeStats;
     if (value === undefined) {
         return;
     }
     const textLines = [];
     textLines.push(`(${index[0]}, ${index[1]}, ${index[2]})`);
-    if (value instanceof Array && pixelValueUnits instanceof Array) {
+    if (value instanceof Array && modalityUnit instanceof Array) {
         for (let i = 0; i < value.length; i++) {
-            textLines.push(`${roundNumber(value[i])} ${pixelValueUnits[i]}`);
+            textLines.push(`${csUtils.roundNumber(value[i])} ${modalityUnit[i]}`);
         }
     }
     else {
-        textLines.push(`${roundNumber(value)} ${pixelValueUnits}`);
+        textLines.push(`${csUtils.roundNumber(value)} ${modalityUnit}`);
     }
     return textLines;
 }