@cornerstonejs/tools 2.0.0-beta.24 → 2.0.0-beta.26

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

@@ -3,24 +3,23 @@ import type * as Enums from '../enums';
 import type { ContourConfig, ContourRenderingConfig, ContourSegmentationData } from './ContourTypes';
 import type { LabelmapConfig, LabelmapRenderingConfig, LabelmapSegmentationData } from './LabelmapTypes';
 import type { SurfaceSegmentationData, SurfaceRenderingConfig } from './SurfaceTypes';
-export type SegmentRepresentationConfig = {
-    [key: number | string]: RepresentationConfig;
-};
 export type SurfaceConfig = {};
-export type RepresentationConfig = {
-    LABELMAP?: LabelmapConfig;
-    CONTOUR?: ContourConfig;
-    SURFACE?: SurfaceConfig;
+export type RepresentationsConfig = {
+    [Enums.SegmentationRepresentations.Labelmap]?: LabelmapConfig;
+    [Enums.SegmentationRepresentations.Contour]?: ContourConfig;
+    [Enums.SegmentationRepresentations.Surface]?: SurfaceConfig;
 };
-export type SegmentationRepresentationConfig = {
+export type RepresentationConfig = LabelmapConfig | ContourConfig | SurfaceConfig;
+export type GlobalConfig = {
     renderInactiveRepresentations: boolean;
-    representations: RepresentationConfig;
+    representations: RepresentationsConfig;
 };
-export type SegmentationRepresentationData = {
-    LABELMAP?: LabelmapSegmentationData;
-    CONTOUR?: ContourSegmentationData;
-    SURFACE?: SurfaceSegmentationData;
+export type RepresentationsData = {
+    [Enums.SegmentationRepresentations.Labelmap]?: LabelmapSegmentationData;
+    [Enums.SegmentationRepresentations.Contour]?: ContourSegmentationData;
+    [Enums.SegmentationRepresentations.Surface]?: SurfaceSegmentationData;
 };
+export type RepresentationData = LabelmapSegmentationData | ContourSegmentationData | SurfaceSegmentationData;
 export type Segmentation = {
     segmentationId: string;
     type: Enums.SegmentationRepresentations;
@@ -33,7 +32,7 @@ export type Segmentation = {
     segmentLabels: {
         [key: string]: string;
     };
-    representationData: SegmentationRepresentationData;
+    representationData: RepresentationsData;
 };
 export type BaseSegmentationRepresentation = {
     segmentationRepresentationUID: string;
@@ -46,7 +45,7 @@ export type BaseSegmentationRepresentation = {
     };
     config: {
         allSegments?: RepresentationConfig;
-        perSegment?: SegmentRepresentationConfig;
+        perSegment?: RepresentationConfig;
     };
 };
 export type LabelmapRepresentation = BaseSegmentationRepresentation & {
@@ -62,7 +61,7 @@ export type SegmentationRepresentation = LabelmapRepresentation | ContourReprese
 export type SegmentationState = {
     colorLUT: Types.ColorLUT[];
     segmentations: Segmentation[];
-    globalConfig: SegmentationRepresentationConfig;
+    globalConfig: GlobalConfig;
     representations: {
         [key: string]: SegmentationRepresentation;
     };
@@ -80,14 +79,9 @@ export type SegmentationPublicInput = {
     segmentationId: string;
     representation: {
         type: Enums.SegmentationRepresentations;
-        data?: LabelmapSegmentationData | ContourSegmentationData | SurfaceSegmentationData;
+        data?: RepresentationData;
     };
 };
-export type RepresentationPublicInput = {
-    segmentationId: string;
-    type: Enums.SegmentationRepresentations;
-    options?: RepresentationPublicInputOptions;
-};
 export type RepresentationPublicInputOptions = {
     segmentationRepresentationUID?: string;
     colorLUTOrIndex?: Types.ColorLUT | number;
@@ -96,3 +90,9 @@ export type RepresentationPublicInputOptions = {
         options?: unknown;
     };
 };
+export type RepresentationPublicInput = {
+    segmentationId: string;
+    type: Enums.SegmentationRepresentations;
+    options?: RepresentationPublicInputOptions;
+    config?: RepresentationConfig;
+};

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

@@ -22,7 +22,7 @@ import type ScrollOptions from './ScrollOptions';
 import type BoundsIJK from './BoundsIJK';
 import type SVGDrawingHelper from './SVGDrawingHelper';
 import type * as CINETypes from './CINETypes';
-import type { RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
+import type { RepresentationConfig, RepresentationData, RepresentationsData, GlobalConfig, Segmentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
 import type { ISculptToolShape } from './ISculptToolShape';
 import type ISynchronizerEventHandler from './ISynchronizerEventHandler';
 import type { FloodFillGetter, FloodFillOptions, FloodFillResult } from './FloodFillTypes';
@@ -46,4 +46,5 @@ import type { SplineLineSegment } from './SplineLineSegment';
 import type { SplineProps } from './SplineProps';
 import type { BidirectionalData } from '../utilities/segmentation/createBidirectionalToolData';
 import type { PolySegConversionOptions } from './PolySeg';
-export type { Annotation, Annotations, ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, RepresentationPublicInput, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, PolySegConversionOptions, };
+import type { IBaseTool } from './IBaseTool';
+export type { Annotation, Annotations, ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, RepresentationData, RepresentationsData, RepresentationConfig, RepresentationPublicInput, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, PolySegConversionOptions, IBaseTool, GlobalConfig, };

package/dist/esm/utilities/contourSegmentation/addContourSegmentationAnnotation.js

@@ -8,10 +8,10 @@ export function addContourSegmentationAnnotation(annotation) {
     }
     const { segmentationId, segmentIndex } = annotation.data.segmentation;
     const segmentation = getSegmentation(segmentationId);
-    if (!segmentation.representationData.CONTOUR) {
-        segmentation.representationData.CONTOUR = { annotationUIDsMap: new Map() };
+    if (!segmentation.representationData.Contour) {
+        segmentation.representationData.Contour = { annotationUIDsMap: new Map() };
     }
-    const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
+    const { annotationUIDsMap } = segmentation.representationData.Contour;
     let annotationsUIDsSet = annotationUIDsMap.get(segmentIndex);
     if (!annotationsUIDsSet) {
         annotationsUIDsSet = new Set();

package/dist/esm/utilities/contourSegmentation/removeContourSegmentationAnnotation.js

@@ -5,7 +5,7 @@ export function removeContourSegmentationAnnotation(annotation) {
     }
     const { segmentationId, segmentIndex } = annotation.data.segmentation;
     const segmentation = getSegmentation(segmentationId);
-    const { annotationUIDsMap } = segmentation?.representationData.CONTOUR || {};
+    const { annotationUIDsMap } = segmentation?.representationData.Contour || {};
     const annotationsUIDsSet = annotationUIDsMap?.get(segmentIndex);
     if (!annotationsUIDsSet) {
         return;

package/dist/esm/utilities/segmentation/getHoveredContourSegmentationAnnotation.js

@@ -2,7 +2,7 @@ import { getAnnotation } from '../../stateManagement';
 import { getSegmentation } from '../../stateManagement/segmentation/segmentationState';
 export function getHoveredContourSegmentationAnnotation(segmentationId) {
     const segmentation = getSegmentation(segmentationId);
-    const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
+    const { annotationUIDsMap } = segmentation.representationData.Contour;
     for (const [segmentIndex, annotationUIDs] of annotationUIDsMap.entries()) {
         const highlightedAnnotationUID = Array.from(annotationUIDs).find((annotationUID) => getAnnotation(annotationUID).highlighted);
         if (highlightedAnnotationUID) {

package/dist/esm/utilities/segmentation/getSegmentIndexAtLabelmapBorder.js

@@ -3,7 +3,7 @@ import { getSegmentation, getSegmentationRepresentationsForSegmentation, getCurr
 import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/stackVolumeCheck';
 export function getSegmentIndexAtLabelmapBorder(segmentationId, worldPoint, { viewport, searchRadius }) {
     const segmentation = getSegmentation(segmentationId);
-    const labelmapData = segmentation.representationData.LABELMAP;
+    const labelmapData = segmentation.representationData.Labelmap;
     if (isVolumeSegmentation(labelmapData, viewport)) {
         const { volumeId } = labelmapData;
         const segmentationVolume = cache.getVolume(volumeId);

package/dist/esm/utilities/segmentation/getSegmentIndexAtWorldPoint.js

@@ -21,7 +21,7 @@ export function getSegmentIndexAtWorldPoint(segmentationId, worldPoint, options
     }
 }
 export function getSegmentIndexAtWorldForLabelmap(segmentation, worldPoint, { viewport }) {
-    const labelmapData = segmentation.representationData.LABELMAP;
+    const labelmapData = segmentation.representationData.Labelmap;
     if (isVolumeSegmentation(labelmapData)) {
         const { volumeId } = labelmapData;
         const segmentationVolume = cache.getVolume(volumeId);
@@ -51,7 +51,7 @@ export function getSegmentIndexAtWorldForLabelmap(segmentation, worldPoint, { vi
     return segmentIndex;
 }
 export function getSegmentIndexAtWorldForContour(segmentation, worldPoint, { viewport }) {
-    const contourData = segmentation.representationData.CONTOUR;
+    const contourData = segmentation.representationData.Contour;
     const segmentIndices = Array.from(contourData.annotationUIDsMap.keys());
     const { viewPlaneNormal } = viewport.getCamera();
     for (const segmentIndex of segmentIndices) {

package/dist/esm/utilities/segmentation/getUniqueSegmentIndices.js

@@ -62,7 +62,7 @@ function addImageSegmentIndices(keySet, imageIds) {
     });
 }
 function handleContourSegmentation(segmentation) {
-    const { annotationUIDsMap, geometryIds } = segmentation.representationData.CONTOUR || {};
+    const { annotationUIDsMap, geometryIds } = segmentation.representationData.Contour || {};
     if (!geometryIds) {
         throw new Error(`No geometryIds found for segmentationId ${segmentation.segmentationId}`);
     }
@@ -74,7 +74,7 @@ function handleContourSegmentation(segmentation) {
     return Array.from(indices).sort((a, b) => a - b);
 }
 function handleSurfaceSegmentation(segmentation) {
-    const geometryIds = segmentation.representationData.SURFACE?.geometryIds ?? [];
+    const geometryIds = segmentation.representationData.Surface?.geometryIds ?? [];
     return Array.from(geometryIds.keys())
         .map(Number)
         .sort((a, b) => a - b);