@cornerstonejs/tools 5.5.1 → 5.6.0

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

@@ -1,4 +1,6 @@
 import BaseTool from './BaseTool.js';
 import AnnotationTool from './AnnotationTool.js';
 import AnnotationDisplayTool from './AnnotationDisplayTool.js';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool };
+import measurementTargetFilters from './measurementTargetFilters.js';
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, measurementTargetFilters, };
+export * from './measurementTargetFilters.js';

package/dist/esm/tools/base/measurementTargetFilters.d.ts

@@ -0,0 +1,19 @@
+import type { MeasurementTargetPredicate, MeasurementTargetsFilter } from '../../types/index.js';
+export declare const NON_PIXEL_DATA_MODALITIES: string[];
+export declare const isPixelData: MeasurementTargetPredicate;
+export declare const firstPixelData: MeasurementTargetsFilter;
+export declare const allPixelData: MeasurementTargetsFilter;
+export declare const first: MeasurementTargetsFilter;
+export declare const all: MeasurementTargetsFilter;
+export declare const forModality: (...modalities: string[]) => MeasurementTargetPredicate;
+export declare const forId: (id: string) => MeasurementTargetPredicate;
+export declare const measurementTargetFilters: {
+    isPixelData: MeasurementTargetPredicate;
+    firstPixelData: MeasurementTargetsFilter;
+    allPixelData: MeasurementTargetsFilter;
+    first: MeasurementTargetsFilter;
+    all: MeasurementTargetsFilter;
+    forModality: (...modalities: string[]) => MeasurementTargetPredicate;
+    forId: (id: string) => MeasurementTargetPredicate;
+};
+export default measurementTargetFilters;

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

@@ -0,0 +1,38 @@
+export const NON_PIXEL_DATA_MODALITIES = [
+    'SEG',
+    'RTSTRUCT',
+    'RTPLAN',
+    'SR',
+    'PR',
+    'KO',
+];
+export const isPixelData = ({ modality, representationUID, }) => !representationUID &&
+    (!modality || !NON_PIXEL_DATA_MODALITIES.includes(modality));
+function isEligible(candidate, options) {
+    if (!isPixelData(candidate, options)) {
+        return false;
+    }
+    const { targetPredicate } = options?.configuration ?? {};
+    return targetPredicate ? targetPredicate(candidate, options) : true;
+}
+export const firstPixelData = (candidates, options) => {
+    const match = candidates.find((candidate) => isEligible(candidate, options));
+    return match ? [match] : [];
+};
+export const allPixelData = (candidates, options) => candidates.filter((candidate) => isEligible(candidate, options));
+export const first = (candidates) => candidates.length ? [candidates[0]] : [];
+export const all = (candidates) => candidates;
+export const forModality = (...modalities) => ({ modality }) => modalities.includes(modality);
+export const forId = (id) => ({ displaySetUID, referencedId, targetId }) => displaySetUID?.includes(id) ||
+    referencedId?.includes(id) ||
+    targetId.includes(id);
+export const measurementTargetFilters = {
+    isPixelData,
+    firstPixelData,
+    allPixelData,
+    first,
+    all,
+    forModality,
+    forId,
+};
+export default measurementTargetFilters;

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

@@ -1,4 +1,4 @@
-import { BaseTool, AnnotationTool, AnnotationDisplayTool } from './base/index.js';
+import { BaseTool, AnnotationTool, AnnotationDisplayTool, measurementTargetFilters } from './base/index.js';
 import PanTool from './PanTool.js';
 import TrackballRotateTool from './TrackballRotateTool.js';
 import VolumeCroppingTool from './VolumeCroppingTool.js';
@@ -64,4 +64,4 @@ import SegmentBidirectionalTool from './segmentation/SegmentBidirectionalTool.js
 import * as strategies from './segmentation/strategies/index.js';
 import SegmentLabelTool from './segmentation/SegmentLabelTool.js';
 import LabelMapEditWithContourTool from './segmentation/LabelmapEditWithContour.js';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, VolumeCroppingTool, VolumeCroppingControlTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, WorldCrosshairTool, SliceIntersectionTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LabelTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, ETDRSGridTool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, UltrasoundPleuraBLineTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OrientationControllerTool, SculptorTool, SegmentSelectTool, VolumeRotateTool, RegionSegmentTool, RegionSegmentPlusTool, ClickSegmentTool, WholeBodySegmentTool, LabelmapBaseTool, SegmentBidirectionalTool, SegmentLabelTool, LabelMapEditWithContourTool, strategies, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, measurementTargetFilters, PanTool, TrackballRotateTool, VolumeCroppingTool, VolumeCroppingControlTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, WorldCrosshairTool, SliceIntersectionTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LabelTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, ETDRSGridTool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, UltrasoundPleuraBLineTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OrientationControllerTool, SculptorTool, SegmentSelectTool, VolumeRotateTool, RegionSegmentTool, RegionSegmentPlusTool, ClickSegmentTool, WholeBodySegmentTool, LabelmapBaseTool, SegmentBidirectionalTool, SegmentLabelTool, LabelMapEditWithContourTool, strategies, };

package/dist/esm/tools/index.js

@@ -1,4 +1,4 @@
-import { BaseTool, AnnotationTool, AnnotationDisplayTool } from './base/index.js';
+import { BaseTool, AnnotationTool, AnnotationDisplayTool, measurementTargetFilters, } from './base/index.js';
 import PanTool from './PanTool.js';
 import TrackballRotateTool from './TrackballRotateTool.js';
 import VolumeCroppingTool from './VolumeCroppingTool.js';
@@ -64,4 +64,4 @@ import SegmentBidirectionalTool from './segmentation/SegmentBidirectionalTool.js
 import * as strategies from './segmentation/strategies/index.js';
 import SegmentLabelTool from './segmentation/SegmentLabelTool.js';
 import LabelMapEditWithContourTool from './segmentation/LabelmapEditWithContour.js';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, VolumeCroppingTool, VolumeCroppingControlTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, WorldCrosshairTool, SliceIntersectionTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LabelTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, ETDRSGridTool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, UltrasoundPleuraBLineTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OrientationControllerTool, SculptorTool, SegmentSelectTool, VolumeRotateTool, RegionSegmentTool, RegionSegmentPlusTool, ClickSegmentTool, WholeBodySegmentTool, LabelmapBaseTool, SegmentBidirectionalTool, SegmentLabelTool, LabelMapEditWithContourTool, strategies, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, measurementTargetFilters, PanTool, TrackballRotateTool, VolumeCroppingTool, VolumeCroppingControlTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, WorldCrosshairTool, SliceIntersectionTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LabelTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, ETDRSGridTool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, UltrasoundPleuraBLineTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OrientationControllerTool, SculptorTool, SegmentSelectTool, VolumeRotateTool, RegionSegmentTool, RegionSegmentPlusTool, ClickSegmentTool, WholeBodySegmentTool, LabelmapBaseTool, SegmentBidirectionalTool, SegmentLabelTool, LabelMapEditWithContourTool, strategies, };

package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.d.ts

@@ -1,7 +1,7 @@
 import type { Types } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import type { PublicToolProps, ToolProps, EventTypes, SVGDrawingHelper, Annotation } from '../../types/index.js';
-import type { CircleROIStartEndThresholdAnnotation, ROICachedStats } from '../../types/ToolSpecificAnnotationTypes.js';
+import type { CircleROIStartEndThresholdAnnotation } from '../../types/ToolSpecificAnnotationTypes.js';
 import CircleROITool from '../annotation/CircleROITool.js';
 declare class CircleROIStartEndThresholdTool extends CircleROITool {
     static toolName: any;
@@ -16,45 +16,7 @@ declare class CircleROIStartEndThresholdTool extends CircleROITool {
     isDrawing: boolean;
     isHandleOutsideImage: boolean;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
-    addNewAnnotation: (evt: EventTypes.InteractionEventType) => {
-        highlighted: boolean;
-        invalidated: boolean;
-        metadata: {
-            toolName: string;
-            viewPlaneNormal: Types.Point3;
-            viewUp: Types.Point3;
-            FrameOfReferenceUID: string;
-            referencedImageId: any;
-            volumeId: any;
-            spacingInNormal: number;
-            enabledElement: Types.IEnabledElement;
-        };
-        data: {
-            label: string;
-            startCoordinate: number;
-            endCoordinate: number;
-            handles: {
-                textBox: {
-                    hasMoved: boolean;
-                    worldPosition: Types.Point3;
-                    worldBoundingBox: {
-                        topLeft: Types.Point3;
-                        topRight: Types.Point3;
-                        bottomLeft: Types.Point3;
-                        bottomRight: Types.Point3;
-                    };
-                };
-                points: any;
-                activeHandleIndex: any;
-            };
-            cachedStats: {
-                pointsInVolume: any[];
-                projectionPoints: any[];
-                statistics: ROICachedStats;
-            };
-            labelmapUID: any;
-        };
-    };
+    addNewAnnotation: (evt: EventTypes.InteractionEventType) => Annotation;
     _endCallback: (evt: EventTypes.InteractionEventType) => void;
     renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
     _computeProjectionPoints(annotation: CircleROIStartEndThresholdAnnotation, imageVolume: Types.IImageVolume): void;

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

@@ -41,7 +41,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
             const { currentPoints, element } = eventDetail;
             const worldPos = currentPoints.world;
             const enabledElement = getEnabledElement(element);
-            const { viewport, renderingEngine } = enabledElement;
+            const { viewport } = enabledElement;
             this.isDrawing = true;
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
@@ -108,7 +108,6 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
                         projectionPoints: [],
                         statistics: [],
                     },
-                    labelmapUID: null,
                 },
             };
             this._computeProjectionPoints(annotation, imageVolume);

package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts

@@ -55,7 +55,6 @@ declare class RectangleROIStartEndThresholdTool extends RectangleROITool {
                 points: Types.Point3[];
                 activeHandleIndex: any;
             };
-            labelmapUID: any;
         };
     };
     _endCallback: (evt: EventTypes.InteractionEventType) => void;

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

@@ -96,7 +96,6 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
                         ],
                         activeHandleIndex: null,
                     },
-                    labelmapUID: null,
                 },
             };
             this._computeProjectionPoints(annotation, imageVolume);

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

@@ -6,14 +6,47 @@ export type AnnotationMetadata = Types.ViewReference & {
     segmentColor?: any;
     enabledElement?: Types.IEnabledElement;
 };
+export type StatItem = {
+    name: string;
+    label: string;
+    value: number | number[];
+    unit?: string;
+    pointIJK?: Types.Point3;
+    pointLPS?: Types.Point3;
+};
+export interface CachedStats {
+    Modality?: string;
+    area?: number | number[];
+    length?: number | number[];
+    width?: number | number[];
+    unit?: string;
+    areaUnit?: string;
+    max?: number | number[];
+    mean?: number | number[];
+    min?: number | number[];
+    radius?: number;
+    radiusUnit?: string;
+    perimeter?: number;
+    statsArray?: StatItem[];
+    [key: string]: unknown;
+}
+export interface VolumeStats {
+    pointsInVolume: Types.Point3[];
+    projectionPoints: Types.Point3[] | Types.Point3[][];
+    projectionPointsImageIds?: string[];
+    statistics?: unknown;
+}
 export type AnnotationData = {
     handles?: Handles;
-    cachedStats?: Record<string, unknown>;
+    cachedStats?: Record<string, CachedStats> | VolumeStats;
     label?: string;
     contour?: Contour;
     isOpenUShapeContour?: boolean | 'farthestT' | 'lineSegment' | 'orthogonalT';
     [key: string]: unknown;
 };
+export type AnnotationDataStatsByTargetId = Omit<AnnotationData, 'cachedStats'> & {
+    cachedStats: Record<string, CachedStats>;
+};
 export type Annotation = {
     annotationUID?: string;
     parentAnnotationUID?: string;

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

@@ -1,9 +1,31 @@
+import type { Types } from '@cornerstonejs/core';
 import type BaseTool from '../tools/base/BaseTool.js';
+import type { AnnotationData } from './AnnotationTypes.js';
+export type MeasurementTargetCandidate = {
+    displaySet?: unknown;
+    displaySetUID?: string;
+    instance?: any;
+    index: number;
+    referencedId?: string;
+    representationUID?: string;
+    modality?: string;
+    imageIds?: string[];
+    targetId: string;
+};
+export type MeasurementTargetOptions = {
+    viewport: Types.IViewport;
+    configuration: ToolConfiguration;
+    data?: AnnotationData;
+};
+export type MeasurementTargetPredicate = (candidate: MeasurementTargetCandidate, options: MeasurementTargetOptions) => boolean;
+export type MeasurementTargetsFilter = (candidates: MeasurementTargetCandidate[], options: MeasurementTargetOptions) => MeasurementTargetCandidate[];
 export interface ToolConfiguration {
     strategies: any;
     defaultStrategy?: string;
     activeStrategy?: string;
     strategyOptions: any;
+    targetsFilter?: MeasurementTargetsFilter;
+    targetPredicate?: MeasurementTargetPredicate;
     isPreferredTargetId?: (viewport: any, targetInfo: {
         imageId: string;
         cachedStat: any;

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

@@ -1,19 +1,19 @@
 import type { Types } from '@cornerstonejs/core';
-import type { Annotation, AnnotationData } from './AnnotationTypes.js';
+import type { Annotation, AnnotationData, CachedStats, VolumeStats } from './AnnotationTypes.js';
 import type { ISpline } from './index.js';
 import type { ContourSegmentationAnnotationData } from './ContourSegmentationAnnotation.js';
 import type { ContourAnnotation } from './ContourAnnotation.js';
-export interface ROICachedStats {
-    [targetId: string]: {
-        Modality: string;
-        area: number;
-        areaUnit: string;
-        max: number;
-        mean: number;
-        stdDev: number;
-        unit?: number;
-    };
+export interface ROICachedStatsByTargetId {
+    [targetId: string]: ROICachedStats;
 }
+export type ROICachedStats = CachedStats & {
+    Modality: string;
+    area: number | number[];
+    areaUnit: string;
+    max: number | number[];
+    mean: number | number[];
+    stdDev: number;
+};
 export interface RectangleROIAnnotation extends Annotation {
     data: {
         handles: {
@@ -31,11 +31,7 @@ export interface RectangleROIAnnotation extends Annotation {
             };
         };
         label: string;
-        cachedStats?: ROICachedStats | {
-            pointsInVolume?: Types.Point3[];
-            projectionPoints?: Types.Point3[];
-            projectionPointsImageIds?: string[];
-        };
+        cachedStats: ROICachedStatsByTargetId;
     };
 }
 export interface ProbeAnnotation extends Annotation {
@@ -44,7 +40,7 @@ export interface ProbeAnnotation extends Annotation {
             points: Types.Point3[];
         };
         cachedStats: {
-            [targetId: string]: {
+            [targetId: string]: CachedStats & {
                 Modality: string;
                 index: Types.Point3;
                 value: number;
@@ -77,7 +73,7 @@ export interface LengthAnnotation extends Annotation {
         };
         label: string;
         cachedStats: {
-            [targetId: string]: {
+            [targetId: string]: CachedStats & {
                 length: number;
                 unit: string;
             };
@@ -109,13 +105,7 @@ export interface AdvancedMagnifyAnnotation extends Annotation {
 export interface CircleROIAnnotation extends Annotation {
     data: {
         handles: {
-            points: [
-                Types.Point3,
-                Types.Point3,
-                Types.Point3,
-                Types.Point3,
-                Types.Point3
-            ];
+            points: Types.Point3[];
             activeHandleIndex: number | null;
             textBox?: {
                 hasMoved: boolean;
@@ -129,16 +119,7 @@ export interface CircleROIAnnotation extends Annotation {
             };
         };
         label: string;
-        cachedStats?: (ROICachedStats & {
-            [targetId: string]: {
-                radius: number;
-                radiusUnit: string;
-                perimeter: number;
-            };
-        }) | {
-            pointsInVolume: Types.Point3[];
-            projectionPoints: Types.Point3[][];
-        };
+        cachedStats?: ROICachedStatsByTargetId;
     };
 }
 export type SplineROIAnnotation = ContourAnnotation & {
@@ -150,7 +131,7 @@ export type SplineROIAnnotation = ContourAnnotation & {
             resolution: number;
         };
         cachedStats?: {
-            [targetId: string]: {
+            [targetId: string]: CachedStats & {
                 Modality: string;
                 area: number;
                 areaUnit: string;
@@ -178,7 +159,7 @@ export interface EllipticalROIAnnotation extends Annotation {
             };
         };
         label: string;
-        cachedStats?: ROICachedStats;
+        cachedStats?: ROICachedStatsByTargetId;
         initialRotation: number;
     };
 }
@@ -198,14 +179,14 @@ export interface BidirectionalAnnotation extends Annotation {
                 };
             };
         };
-        label?: string;
         cachedStats: {
-            [targetId: string]: {
+            [targetId: string]: CachedStats & {
                 length: number;
                 width: number;
                 unit: string;
             };
         };
+        label?: string;
     };
 }
 export interface RectangleROIThresholdAnnotation extends Annotation {
@@ -247,12 +228,7 @@ export interface RectangleROIStartEndThresholdAnnotation extends Annotation {
         label: string;
         startCoordinate: number;
         endCoordinate: number;
-        cachedStats: {
-            pointsInVolume: Types.Point3[];
-            projectionPoints: Types.Point3[][];
-            projectionPointsImageIds: string[];
-            statistics?: ROICachedStats;
-        };
+        cachedStats: VolumeStats;
         handles: {
             points: Types.Point3[];
             activeHandleIndex: number | null;
@@ -287,11 +263,8 @@ export interface CircleROIStartEndThresholdAnnotation extends Annotation {
         label: string;
         startCoordinate: number;
         endCoordinate: number;
-        cachedStats?: {
-            pointsInVolume: Types.Point3[];
-            projectionPoints: Types.Point3[][];
-            statistics?: ROICachedStats;
-        };
+        cachedStats?: VolumeStats;
+        labelmapUID?: string;
         handles: {
             points: Types.Point3[];
             activeHandleIndex: number | null;
@@ -313,7 +286,7 @@ export type PlanarFreehandROIAnnotation = ContourAnnotation & {
         label?: string;
         isOpenUShapeContour?: boolean | 'lineSegment' | 'orthogonalT';
         openUShapeContourVectorToPeak?: Types.Point3[];
-        cachedStats?: ROICachedStats;
+        cachedStats?: ROICachedStatsByTargetId;
     };
 };
 export type PlanarFreehandContourSegmentationAnnotation = PlanarFreehandROIAnnotation & ContourSegmentationAnnotationData;
@@ -519,8 +492,8 @@ export interface VideoRedactionAnnotation extends Annotation {
             points: Types.Point3[];
             activeHandleIndex: number | null;
         };
-        cachedStats: {
-            [key: string]: unknown;
+        cachedStats?: {
+            [targetId: string]: CachedStats;
         };
         active: boolean;
     };

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

@@ -42,9 +42,9 @@ import type { SplineCurveSegment } from './SplineCurveSegment.js';
 import type { SplineLineSegment } from './SplineLineSegment.js';
 import type { SplineProps } from './SplineProps.js';
 import type { BidirectionalData } from '../utilities/segmentation/createBidirectionalToolData.js';
-import type { IBaseTool } from './IBaseTool.js';
+import type { IBaseTool, MeasurementTargetCandidate, MeasurementTargetOptions, MeasurementTargetPredicate, MeasurementTargetsFilter } from './IBaseTool.js';
 import type { RepresentationStyle } from './../stateManagement/segmentation/SegmentationStyle.js';
 import type { LogicalOperation } from '../utilities/contourSegmentation/index.js';
 import type { LabelmapStyle, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle } from './LabelmapTypes.js';
 import type { SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles } from './SurfaceTypes.js';
-export type { ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, AnnotationStyle, ToolSpecificAnnotationTypes, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationRepresentation, SegmentationState, RepresentationData, RepresentationsData, SVGCursorDescriptor, SVGPoint, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, IBaseTool, RepresentationStyle, Segment, SegmentationPublicInput, LabelmapStyle, ContourStyle, SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle, LogicalOperation, };
+export type { ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, AnnotationStyle, ToolSpecificAnnotationTypes, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationRepresentation, SegmentationState, RepresentationData, RepresentationsData, SVGCursorDescriptor, SVGPoint, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, IBaseTool, MeasurementTargetCandidate, MeasurementTargetOptions, MeasurementTargetPredicate, MeasurementTargetsFilter, RepresentationStyle, Segment, SegmentationPublicInput, LabelmapStyle, ContourStyle, SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle, LogicalOperation, };

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

@@ -0,0 +1,9 @@
+export interface MetricDefinition {
+    name: string;
+    attribute: string;
+    unitAttribute: string;
+}
+export declare const AREA_METRICS: MetricDefinition[];
+export declare function createGetTextLines(metrics: MetricDefinition[]): (data: any, targetId: string | string[]) => string[];
+export declare const defaultAreaGetTextLines: (data: any, targetId: string | string[]) => string[];
+export declare function createMultiResultLine(cachedVolumeStats: any, targetIds: string[], name: string, attribute: string, unitAttribute: string): string;

package/dist/esm/utilities/defaultGetTextLines.js

@@ -0,0 +1,53 @@
+import { utilities as csUtils } from '@cornerstonejs/core';
+const { isEqual } = csUtils;
+export const AREA_METRICS = [
+    { name: 'Area', attribute: 'area', unitAttribute: 'areaUnit' },
+    { name: 'Mean', attribute: 'mean', unitAttribute: 'modalityUnit' },
+    { name: 'Max', attribute: 'max', unitAttribute: 'modalityUnit' },
+    { name: 'Min', attribute: 'min', unitAttribute: 'modalityUnit' },
+    { name: 'Std Dev', attribute: 'stdDev', unitAttribute: 'modalityUnit' },
+];
+export function createGetTextLines(metrics) {
+    return function (data, targetId) {
+        const targetIds = Array.isArray(targetId) ? targetId : [targetId];
+        const cachedVolumeStats = targetIds
+            .map((id) => data.cachedStats[id])
+            .filter((stats) => metrics.some(({ attribute }) => stats?.[attribute] !== undefined && stats?.[attribute] !== null));
+        if (!cachedVolumeStats.length) {
+            return;
+        }
+        const textLines = [];
+        for (const metric of metrics) {
+            pushResult(textLines, createMultiResultLine(cachedVolumeStats, targetIds, metric.name, metric.attribute, metric.unitAttribute));
+        }
+        return textLines;
+    };
+}
+export const defaultAreaGetTextLines = createGetTextLines(AREA_METRICS);
+function pushResult(textLines, value) {
+    if (value) {
+        textLines.push(value);
+    }
+}
+export function createMultiResultLine(cachedVolumeStats, targetIds, name, attribute, unitAttribute) {
+    const result = [`${name}:`];
+    let lastValue = null;
+    let lastUnit = null;
+    for (const stats of cachedVolumeStats) {
+        if (!csUtils.isNumber(stats?.[attribute])) {
+            continue;
+        }
+        const attributeValue = stats[attribute];
+        const unitValue = stats[unitAttribute];
+        if (isEqual(lastValue, attributeValue) && lastUnit === unitValue) {
+            continue;
+        }
+        result.push(`${csUtils.roundNumber(attributeValue)} ${unitValue}`);
+        lastValue = attributeValue;
+        lastUnit = unitValue;
+    }
+    if (result.length <= 1) {
+        return;
+    }
+    return result.join(' ');
+}

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

@@ -1,2 +1,2 @@
-import type { VolumeViewport, Types } from '@cornerstonejs/core';
-export default function getEllipseWorldCoordinates(points: [Types.Point3, Types.Point3], viewport: Types.IStackViewport | VolumeViewport): Types.Point3[];
+import type { Types } from '@cornerstonejs/core';
+export default function getEllipseWorldCoordinates(points: [Types.Point3, Types.Point3], viewport: Types.IViewport): Types.Point3[];

package/dist/esm/utilities/getEllipseWorldCoordinates.js

@@ -1,7 +1,7 @@
 import { vec3 } from 'gl-matrix';
+import getViewportICamera from './getViewportICamera.js';
 export default function getEllipseWorldCoordinates(points, viewport) {
-    const camera = viewport.getCamera();
-    const { viewUp, viewPlaneNormal } = camera;
+    const { viewUp, viewPlaneNormal } = getViewportICamera(viewport);
     const viewRight = vec3.create();
     vec3.cross(viewRight, viewUp, viewPlaneNormal);
     const [centerWorld, endWorld] = points;

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

@@ -46,4 +46,5 @@ import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume.js';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction.js';
 import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
 import pickIntensityPointInSlab, { getSlabIntensityPickContext } from './pickIntensityPointInSlab.js';
+export * from './defaultGetTextLines.js';
 export { math, planar, spatial, 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, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };

package/dist/esm/utilities/index.js

@@ -46,4 +46,5 @@ import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume.js';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction.js';
 import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
 import pickIntensityPointInSlab, { getSlabIntensityPickContext, } from './pickIntensityPointInSlab.js';
+export * from './defaultGetTextLines.js';
 export { math, planar, spatial, 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, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };

package/dist/esm/utilities/planar/filterAnnotationsWithinSlice.js

@@ -49,7 +49,7 @@ export default function filterAnnotationsWithinSlice(annotations, camera, spacin
     if (!annotationsWithParallelNormals.length) {
         return [];
     }
-    const halfSpacingInNormalDirection = spacingInNormalDirection / 2;
+    const halfSpacingInNormalDirection = spacingInNormalDirection / 2 + EPSILON;
     const { focalPoint } = camera;
     const annotationsWithinSlice = [];
     for (const annotation of annotationsWithParallelNormals) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.5.1";
+export declare const version = "5.6.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.5.1';
+export const version = '5.6.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.5.1",
+    "@cornerstonejs/core": "5.6.0",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.5.1",
+    "@cornerstonejs/core": "5.6.0",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -149,5 +149,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "af9742045c8c7ab454f5edbdc46b0a9fdc493b8f"
+  "gitHead": "bca909b8af25305cc850f52b43d5834b55fcf011"
 }