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

package/dist/esm/types/ToolSpecificAnnotationTypes.js

@@ -1 +0,0 @@
-export {};

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, RepresentationData, RepresentationsData, GlobalConfig, Segmentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
+import type { RepresentationData, RepresentationsData, Segmentation, SegmentationState } from './SegmentationStateTypes';
 import type { ISculptToolShape } from './ISculptToolShape';
 import type ISynchronizerEventHandler from './ISynchronizerEventHandler';
 import type { FloodFillGetter, FloodFillOptions, FloodFillResult } from './FloodFillTypes';
@@ -47,4 +47,4 @@ import type { SplineProps } from './SplineProps';
 import type { BidirectionalData } from '../utilities/segmentation/createBidirectionalToolData';
 import type { PolySegConversionOptions } from './PolySeg';
 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, };
+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, 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, };

package/dist/esm/types/index.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/cine/playClip.js

@@ -213,7 +213,7 @@ function _stopClipWithData(playClipData) {
 function _getVolumesFromViewport(viewport) {
     return viewport
         .getActors()
-        .map((actor) => cache.getVolume(actor.uid))
+        .map((actor) => cache.getVolume(viewport.getVolumeId()))
         .filter((volume) => !!volume);
 }
 function _getVolumeFromViewport(viewport) {

package/dist/esm/utilities/contours/updateContourPolyline.js

@@ -31,6 +31,9 @@ export default function updateContourPolyline(annotation, polylineData, transfor
     if (windingDirection !== currentPolylineWindingDirection) {
         polyline.reverse();
     }
+    if (!data.handles?.points?.length) {
+        return;
+    }
     const handlePoints = data.handles.points.map((p) => worldToCanvas(p));
     if (handlePoints.length > 2) {
         const currentHandlesWindingDirection = math.polyline.getWindingDirection(handlePoints);

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

@@ -34,5 +34,6 @@ import * as dynamicVolume from './dynamicVolume';
 import * as polyDataUtils from './polyData/utils';
 import * as voi from './voi';
 import * as contourSegmentation from './contourSegmentation';
+import { pointInSurroundingSphereCallback } from './pointInSurroundingSphereCallback';
 declare const roundNumber: typeof utilities.roundNumber;
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, annotationFrameRange, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, };
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, annotationFrameRange, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, };

package/dist/esm/utilities/index.js

@@ -34,5 +34,6 @@ import * as dynamicVolume from './dynamicVolume';
 import * as polyDataUtils from './polyData/utils';
 import * as voi from './voi';
 import * as contourSegmentation from './contourSegmentation';
+import { pointInSurroundingSphereCallback } from './pointInSurroundingSphereCallback';
 const roundNumber = utilities.roundNumber;
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, annotationFrameRange, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, };
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, annotationFrameRange, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, };

package/dist/esm/utilities/math/circle/_types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.js

@@ -1 +0,0 @@
-export {};

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

@@ -0,0 +1,8 @@
+import type { Types } from '@cornerstonejs/core';
+import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
+export declare function pointInSurroundingSphereCallback(imageData: vtkImageData, circlePoints: [Types.Point3, Types.Point3], callback: (args: {
+    value: unknown;
+    index: number;
+    pointIJK: Types.Point3;
+    pointLPS: Types.Point3;
+}) => void, viewport?: Types.IVolumeViewport): void;

package/dist/esm/utilities/pointInSurroundingSphereCallback.js

@@ -0,0 +1,71 @@
+import { utilities as csUtils } from '@cornerstonejs/core';
+import { vec3 } from 'gl-matrix';
+import { pointInSphere } from './math/sphere';
+import { getBoundingBoxAroundShape } from './boundingBox';
+const { transformWorldToIndex } = csUtils;
+export function pointInSurroundingSphereCallback(imageData, circlePoints, callback, viewport) {
+    const { boundsIJK, centerWorld, radiusWorld } = _getBounds(circlePoints, imageData, viewport);
+    const sphereObj = {
+        center: centerWorld,
+        radius: radiusWorld,
+    };
+    const dimensions = imageData.getDimensions();
+    const voxelManager = csUtils.VoxelManager.createScalarVolumeVoxelManager({
+        dimensions: dimensions,
+        scalarData: imageData.getPointData().getScalars().getData(),
+    });
+    voxelManager.forEach(callback, {
+        boundsIJK,
+        isInObject: (pointLPS) => pointInSphere(sphereObj, pointLPS),
+        imageData,
+    });
+}
+function _getBounds(circlePoints, imageData, viewport) {
+    const [bottom, top] = circlePoints;
+    const centerWorld = vec3.fromValues((bottom[0] + top[0]) / 2, (bottom[1] + top[1]) / 2, (bottom[2] + top[2]) / 2);
+    const radiusWorld = vec3.distance(bottom, top) / 2;
+    let boundsIJK;
+    if (!viewport) {
+        const centerIJK = transformWorldToIndex(imageData, centerWorld);
+        const spacings = imageData.getSpacing();
+        const minSpacing = Math.min(...spacings);
+        const maxRadiusIJK = Math.ceil(radiusWorld / minSpacing);
+        boundsIJK = [
+            [centerIJK[0] - maxRadiusIJK, centerIJK[0] + maxRadiusIJK],
+            [centerIJK[1] - maxRadiusIJK, centerIJK[1] + maxRadiusIJK],
+            [centerIJK[2] - maxRadiusIJK, centerIJK[2] + maxRadiusIJK],
+        ];
+        return {
+            boundsIJK,
+            centerWorld: centerWorld,
+            radiusWorld,
+        };
+    }
+    boundsIJK = _computeBoundsIJKWithCamera(imageData, viewport, circlePoints, centerWorld, radiusWorld);
+    return {
+        boundsIJK,
+        centerWorld: centerWorld,
+        radiusWorld,
+    };
+}
+function _computeBoundsIJKWithCamera(imageData, viewport, circlePoints, centerWorld, radiusWorld) {
+    const [bottom, top] = circlePoints;
+    const dimensions = imageData.getDimensions();
+    const camera = viewport.getCamera();
+    const viewUp = vec3.fromValues(camera.viewUp[0], camera.viewUp[1], camera.viewUp[2]);
+    const viewPlaneNormal = vec3.fromValues(camera.viewPlaneNormal[0], camera.viewPlaneNormal[1], camera.viewPlaneNormal[2]);
+    const viewRight = vec3.create();
+    vec3.cross(viewRight, viewUp, viewPlaneNormal);
+    const topLeftWorld = vec3.create();
+    const bottomRightWorld = vec3.create();
+    vec3.scaleAndAdd(topLeftWorld, top, viewPlaneNormal, radiusWorld);
+    vec3.scaleAndAdd(bottomRightWorld, bottom, viewPlaneNormal, -radiusWorld);
+    vec3.scaleAndAdd(topLeftWorld, topLeftWorld, viewRight, -radiusWorld);
+    vec3.scaleAndAdd(bottomRightWorld, bottomRightWorld, viewRight, radiusWorld);
+    const sphereCornersIJK = [
+        transformWorldToIndex(imageData, topLeftWorld),
+        (transformWorldToIndex(imageData, bottomRightWorld)),
+    ];
+    const boundsIJK = getBoundingBoxAroundShape(sphereCornersIJK, dimensions);
+    return boundsIJK;
+}

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

@@ -19,8 +19,8 @@ export default async function createLabelmapVolumeForViewport(input) {
         await volumeLoader.createLocalVolume(segmentationId, properties);
     }
     else {
-        const { uid: volumeId } = viewport.getDefaultActor();
-        await volumeLoader.createAndCacheDerivedSegmentationVolume(volumeId, {
+        const volumeId = viewport.getVolumeId();
+        await volumeLoader.createAndCacheDerivedLabelmapVolume(volumeId, {
             volumeId: segmentationId,
         });
     }

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

@@ -1,10 +1,11 @@
-import { cache, utilities } from '@cornerstonejs/core';
-import { getSegmentation, getSegmentationRepresentationsForSegmentation, getCurrentLabelmapImageIdForViewport, } from '../../stateManagement/segmentation/segmentationState';
-import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/stackVolumeCheck';
+import { BaseVolumeViewport, cache, utilities } from '@cornerstonejs/core';
+import { getSegmentation, getCurrentLabelmapImageIdForViewport, } from '../../stateManagement/segmentation/segmentationState';
+import { getSegmentationActor } from '../../stateManagement/segmentation/helpers';
+import { SegmentationRepresentations } from '../../enums';
 export function getSegmentIndexAtLabelmapBorder(segmentationId, worldPoint, { viewport, searchRadius }) {
     const segmentation = getSegmentation(segmentationId);
     const labelmapData = segmentation.representationData.Labelmap;
-    if (isVolumeSegmentation(labelmapData, viewport)) {
+    if (viewport instanceof BaseVolumeViewport) {
         const { volumeId } = labelmapData;
         const segmentationVolume = cache.getVolume(volumeId);
         if (!segmentationVolume) {
@@ -19,15 +20,15 @@ export function getSegmentIndexAtLabelmapBorder(segmentationId, worldPoint, { vi
         return onEdge ? segmentIndex : undefined;
     }
     const segmentationImageId = getCurrentLabelmapImageIdForViewport(viewport.id, segmentationId);
-    const currentImageId = viewport.getCurrentImageId();
     const image = cache.getImage(segmentationImageId);
     if (!image) {
         return;
     }
-    const segmentationRepresentations = getSegmentationRepresentationsForSegmentation(segmentation.segmentationId);
-    const { segmentationRepresentationUID } = segmentationRepresentations[0];
-    const segmentationActor = viewport.getActor(segmentationRepresentationUID);
-    const imageData = segmentationActor?.actor.getMapper().getInputData();
+    const segmentationActor = getSegmentationActor(viewport.id, {
+        segmentationId,
+        type: SegmentationRepresentations.Labelmap,
+    });
+    const imageData = segmentationActor?.getMapper().getInputData();
     const indexIJK = utilities.transformWorldToIndex(imageData, worldPoint);
     const dimensions = imageData.getDimensions();
     const voxelManager = (imageData.voxelManager ||

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

@@ -1,9 +1,9 @@
-import { cache, utilities } from '@cornerstonejs/core';
+import { BaseVolumeViewport, cache, utilities } from '@cornerstonejs/core';
 import { SegmentationRepresentations } from '../../enums';
-import { getSegmentation, getSegmentationRepresentationsForSegmentation, getCurrentLabelmapImageIdForViewport, } from '../../stateManagement/segmentation/segmentationState';
-import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/stackVolumeCheck';
+import { getSegmentation, getCurrentLabelmapImageIdForViewport, } from '../../stateManagement/segmentation/segmentationState';
 import { getAnnotation } from '../../stateManagement';
 import { isPointInsidePolyline3D } from '../math/polyline';
+import { getSegmentationActor } from '../../stateManagement/segmentation/helpers';
 export function getSegmentIndexAtWorldPoint(segmentationId, worldPoint, options = {}) {
     const segmentation = getSegmentation(segmentationId);
     const representationData = segmentation.representationData;
@@ -22,7 +22,7 @@ export function getSegmentIndexAtWorldPoint(segmentationId, worldPoint, options
 }
 export function getSegmentIndexAtWorldForLabelmap(segmentation, worldPoint, { viewport }) {
     const labelmapData = segmentation.representationData.Labelmap;
-    if (isVolumeSegmentation(labelmapData)) {
+    if (viewport instanceof BaseVolumeViewport) {
         const { volumeId } = labelmapData;
         const segmentationVolume = cache.getVolume(volumeId);
         if (!segmentationVolume) {
@@ -36,10 +36,11 @@ export function getSegmentIndexAtWorldForLabelmap(segmentation, worldPoint, { vi
     if (!image) {
         return;
     }
-    const segmentationRepresentations = getSegmentationRepresentationsForSegmentation(segmentation.segmentationId);
-    const { segmentationRepresentationUID } = segmentationRepresentations[0];
-    const segmentationActor = viewport.getActor(segmentationRepresentationUID);
-    const imageData = segmentationActor?.actor.getMapper().getInputData();
+    const segmentationActor = getSegmentationActor(viewport.id, {
+        segmentationId: segmentation.segmentationId,
+        type: SegmentationRepresentations.Labelmap,
+    });
+    const imageData = segmentationActor?.getMapper().getInputData();
     const indexIJK = utilities.transformWorldToIndex(imageData, worldPoint);
     const dimensions = imageData.getDimensions();
     const voxelManager = (imageData.voxelManager ||

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

@@ -1,5 +1,4 @@
 import { cache } from '@cornerstonejs/core';
-import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/stackVolumeCheck';
 import { SegmentationRepresentations } from '../../enums';
 import { getCachedSegmentIndices, setCachedSegmentIndices } from './utilities';
 import { getSegmentation } from '../../stateManagement/segmentation/getSegmentation';
@@ -13,18 +12,17 @@ function getUniqueSegmentIndices(segmentationId) {
         throw new Error(`No segmentation found for segmentationId ${segmentationId}`);
     }
     let indices;
-    switch (segmentation.type) {
-        case SegmentationRepresentations.Labelmap:
-            indices = handleLabelmapSegmentation(segmentation, segmentationId);
-            break;
-        case SegmentationRepresentations.Contour:
-            indices = handleContourSegmentation(segmentation);
-            break;
-        case SegmentationRepresentations.Surface:
-            indices = handleSurfaceSegmentation(segmentation);
-            break;
-        default:
-            throw new Error(`Unsupported segmentation type: ${segmentation.type}`);
+    if (segmentation.representationData.Labelmap) {
+        indices = handleLabelmapSegmentation(segmentation, segmentationId);
+    }
+    else if (segmentation.representationData.Contour) {
+        indices = handleContourSegmentation(segmentation);
+    }
+    else if (segmentation.representationData.Surface) {
+        indices = handleSurfaceSegmentation(segmentation);
+    }
+    else {
+        throw new Error(`Unsupported segmentation type: ${segmentation.representationData}`);
     }
     setCachedSegmentIndices(segmentationId, indices);
     return indices;
@@ -32,11 +30,11 @@ function getUniqueSegmentIndices(segmentationId) {
 function handleLabelmapSegmentation(segmentation, segmentationId) {
     const labelmapData = segmentation.representationData[SegmentationRepresentations.Labelmap];
     const keySet = new Set();
-    if (isVolumeSegmentation(labelmapData)) {
-        addVolumeSegmentIndices(keySet, segmentationId);
+    if (labelmapData.imageIds) {
+        addImageSegmentIndices(keySet, labelmapData.imageIds);
     }
     else {
-        addImageSegmentIndices(keySet, labelmapData.imageIds);
+        addVolumeSegmentIndices(keySet, segmentationId);
     }
     return Array.from(keySet)
         .map(Number)

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

@@ -1,8 +1,6 @@
 import thresholdVolumeByRange from './thresholdVolumeByRange';
 import rectangleROIThresholdVolumeByRange from './rectangleROIThresholdVolumeByRange';
 import createMergedLabelmapForIndex from './createMergedLabelmapForIndex';
-import isValidRepresentationConfig from './isValidRepresentationConfig';
-import getDefaultRepresentationConfig from './getDefaultRepresentationConfig';
 import createLabelmapVolumeForViewport from './createLabelmapVolumeForViewport';
 import { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId } from '../../stateManagement/segmentation/SegmentationRenderingEngine';
 import floodFill from './floodFill';
@@ -18,4 +16,4 @@ import { getSegmentIndexAtWorldPoint } from './getSegmentIndexAtWorldPoint';
 import { getSegmentIndexAtLabelmapBorder } from './getSegmentIndexAtLabelmapBorder';
 import { getHoveredContourSegmentationAnnotation } from './getHoveredContourSegmentationAnnotation';
 import { getBrushToolInstances } from './getBrushToolInstances';
-export { thresholdVolumeByRange, createMergedLabelmapForIndex, isValidRepresentationConfig, getDefaultRepresentationConfig, createLabelmapVolumeForViewport, rectangleROIThresholdVolumeByRange, triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, floodFill, getBrushSizeForToolGroup, setBrushSizeForToolGroup, getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, contourAndFindLargestBidirectional, createBidirectionalToolData, segmentContourAction, invalidateBrushCursor, getUniqueSegmentIndices, getSegmentIndexAtWorldPoint, getSegmentIndexAtLabelmapBorder, getHoveredContourSegmentationAnnotation, getBrushToolInstances, };
+export { thresholdVolumeByRange, createMergedLabelmapForIndex, createLabelmapVolumeForViewport, rectangleROIThresholdVolumeByRange, triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, floodFill, getBrushSizeForToolGroup, setBrushSizeForToolGroup, getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, contourAndFindLargestBidirectional, createBidirectionalToolData, segmentContourAction, invalidateBrushCursor, getUniqueSegmentIndices, getSegmentIndexAtWorldPoint, getSegmentIndexAtLabelmapBorder, getHoveredContourSegmentationAnnotation, getBrushToolInstances, };

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

@@ -1,8 +1,6 @@
 import thresholdVolumeByRange from './thresholdVolumeByRange';
 import rectangleROIThresholdVolumeByRange from './rectangleROIThresholdVolumeByRange';
 import createMergedLabelmapForIndex from './createMergedLabelmapForIndex';
-import isValidRepresentationConfig from './isValidRepresentationConfig';
-import getDefaultRepresentationConfig from './getDefaultRepresentationConfig';
 import createLabelmapVolumeForViewport from './createLabelmapVolumeForViewport';
 import { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, } from '../../stateManagement/segmentation/SegmentationRenderingEngine';
 import floodFill from './floodFill';
@@ -18,4 +16,4 @@ import { getSegmentIndexAtWorldPoint } from './getSegmentIndexAtWorldPoint';
 import { getSegmentIndexAtLabelmapBorder } from './getSegmentIndexAtLabelmapBorder';
 import { getHoveredContourSegmentationAnnotation } from './getHoveredContourSegmentationAnnotation';
 import { getBrushToolInstances } from './getBrushToolInstances';
-export { thresholdVolumeByRange, createMergedLabelmapForIndex, isValidRepresentationConfig, getDefaultRepresentationConfig, createLabelmapVolumeForViewport, rectangleROIThresholdVolumeByRange, triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, floodFill, getBrushSizeForToolGroup, setBrushSizeForToolGroup, getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, contourAndFindLargestBidirectional, createBidirectionalToolData, segmentContourAction, invalidateBrushCursor, getUniqueSegmentIndices, getSegmentIndexAtWorldPoint, getSegmentIndexAtLabelmapBorder, getHoveredContourSegmentationAnnotation, getBrushToolInstances, };
+export { thresholdVolumeByRange, createMergedLabelmapForIndex, createLabelmapVolumeForViewport, rectangleROIThresholdVolumeByRange, triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, floodFill, getBrushSizeForToolGroup, setBrushSizeForToolGroup, getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, contourAndFindLargestBidirectional, createBidirectionalToolData, segmentContourAction, invalidateBrushCursor, getUniqueSegmentIndices, getSegmentIndexAtWorldPoint, getSegmentIndexAtLabelmapBorder, getHoveredContourSegmentationAnnotation, getBrushToolInstances, };

package/dist/esm/utilities/voi/colorbar/ColorbarCanvas.js

@@ -132,6 +132,9 @@ class ColorbarCanvas {
         };
         const { width, height } = this._canvas;
         const canvasContext = this._canvas.getContext('2d');
+        if (!canvasContext) {
+            return;
+        }
         const isHorizontal = width > height;
         const maxValue = isHorizontal ? width : height;
         const { _voiRange: voiRange } = this;

package/dist/esm/utilities/voi/colorbar/ViewportColorbar.js

@@ -80,7 +80,7 @@ class ViewportColorbar extends Colorbar {
         }
         else if (viewport instanceof VolumeViewport) {
             const { _volumeId: volumeId } = this;
-            const viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId, viewport.renderingEngineId);
+            const viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId);
             viewport.setProperties({ voiRange }, volumeId);
             viewportsContainingVolumeUID.forEach((vp) => vp.render());
         }

package/dist/esm/utilities/voi/colorbar/types/ColorbarCanvasProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarCommonProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarImageRange.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarSize.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarTicksProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarTicksStyle.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ColorbarVOIRange.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/ViewportColorbarProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/utilities/voi/colorbar/types/index.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/widgets/types/WidgetProps.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/widgets/types/WidgetSize.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/widgets/types/index.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/workers/polySegConverters.js

@@ -176,8 +176,9 @@ const polySegConverters = {
                 });
                 const firstDim = (sharedDimensionIndex + 1) % 3;
                 const secondDim = (sharedDimensionIndex + 2) % 3;
-                const voxels = utilities.VoxelManager.createScalarVolumeVoxelManager({
-                    dimensions: imageData.getDimensions(),
+                const voxels = utilities.VoxelManager.createImageVoxelManager({
+                    width: imageData.getDimensions()[0],
+                    height: imageData.getDimensions()[1],
                     scalarData: imageData.getPointData().getScalars().getData(),
                 });
                 voxels.forEach(({ pointIJK }) => {
@@ -319,7 +320,7 @@ const polySegConverters = {
                 const { sliceIndex, planes } = planeInfo;
                 const polyDataResults = new Map();
                 for (const polyDataInfo of surfacesInfo) {
-                    const { points, polys, id } = polyDataInfo;
+                    const { points, polys, id, segmentIndex } = polyDataInfo;
                     const aabb3 = surfacesAABB.get(id) || getAABB(points, { numDimensions: 3 });
                     if (!surfacesAABB.has(id)) {
                         surfacesAABB.set(id, aabb3);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.0.0-beta.26",
+  "version": "2.0.0-beta.28",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -14,29 +14,82 @@
   },
   "sideEffects": false,
   "exports": {
-    ".": "./dist/esm/index.js",
-    "./utilities/*": "./dist/esm/utilities/*.js",
-    "./utilities": "./dist/esm/utilities/index.js",
-    "./constants/*": "./dist/esm/constants/*.js",
-    "./constants": "./dist/esm/constants/index.js",
-    "./enums/*": "./dist/esm/enums/*.js",
-    "./enums": "./dist/esm/enums/index.js",
-    "./tools/*": "./dist/esm/tools/*.js",
-    "./tools": "./dist/esm/tools/index.js",
-    "./synchronizers/*": "./dist/esm/synchronizers/*.js",
-    "./synchronizers": "./dist/esm/synchronizers/index.js",
-    "./types/*": "./dist/esm/types/*.d.ts",
-    "./types": "./dist/esm/types/index.d.ts"
+    ".": {
+      "import": "./dist/esm/index.js",
+      "types": "./dist/esm/index.d.ts"
+    },
+    "./utilities": {
+      "import": "./dist/esm/utilities/index.js",
+      "types": "./dist/esm/utilities/index.d.ts"
+    },
+    "./utilities/*": {
+      "import": "./dist/esm/utilities/*.js",
+      "types": "./dist/esm/utilities/*.d.ts"
+    },
+    "./constants": {
+      "import": "./dist/esm/constants/index.js",
+      "types": "./dist/esm/constants/index.d.ts"
+    },
+    "./constants/*": {
+      "import": "./dist/esm/constants/*.js",
+      "types": "./dist/esm/constants/*.d.ts"
+    },
+    "./enums": {
+      "import": "./dist/esm/enums/index.js",
+      "types": "./dist/esm/enums/index.d.ts"
+    },
+    "./enums/*": {
+      "import": "./dist/esm/enums/*.js",
+      "types": "./dist/esm/enums/*.d.ts"
+    },
+    "./tools": {
+      "import": "./dist/esm/tools/index.js",
+      "types": "./dist/esm/tools/index.d.ts"
+    },
+    "./tools/*": {
+      "import": "./dist/esm/tools/*.js",
+      "types": "./dist/esm/tools/*.d.ts"
+    },
+    "./segmentation": {
+      "import": "./dist/esm/stateManagement/segmentation/index.js",
+      "types": "./dist/esm/stateManagement/segmentation/index.d.ts"
+    },
+    "./segmentation/*": {
+      "import": "./dist/esm/stateManagement/segmentation/*.js",
+      "types": "./dist/esm/stateManagement/segmentation/*.d.ts"
+    },
+    "./annotation": {
+      "import": "./dist/esm/stateManagement/annotation/index.js",
+      "types": "./dist/esm/stateManagement/annotation/index.d.ts"
+    },
+    "./annotation/*": {
+      "import": "./dist/esm/stateManagement/annotation/*.js",
+      "types": "./dist/esm/stateManagement/annotation/*.d.ts"
+    },
+    "./synchronizers": {
+      "import": "./dist/esm/synchronizers/index.js",
+      "types": "./dist/esm/synchronizers/index.d.ts"
+    },
+    "./synchronizers/*": {
+      "import": "./dist/esm/synchronizers/*.js",
+      "types": "./dist/esm/synchronizers/*.d.ts"
+    },
+    "./types": {
+      "types": "./dist/esm/types/index.d.ts"
+    },
+    "./types/*": {
+      "types": "./dist/esm/types/*.d.ts"
+    }
   },
   "scripts": {
-    "build:esm": "tsc --project ./tsconfig.esm.json",
-    "build:esm:watch": "tsc --project ./tsconfig.esm.json --watch",
+    "build:esm": "tsc --project ./tsconfig.json",
+    "build:esm:watch": "tsc --project ./tsconfig.json --watch",
     "build:umd": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:all": "yarn run build:umd && yarn run build:esm",
-    "build": "yarn run build:all",
+    "build": "yarn run build:esm",
     "clean": "rm -rf node_modules/.cache/storybook && shx rm -rf dist",
     "clean:deep": "yarn run clean && shx rm -rf node_modules",
-    "dev": "tsc --project ./tsconfig.esm.json --watch",
+    "dev": "tsc --project ./tsconfig.json --watch",
     "build:update-api": "yarn run build:esm && api-extractor run --local",
     "format-check": "npx eslint ./src --quiet",
     "api-check": "api-extractor --debug run ",
@@ -44,7 +97,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^2.0.0-beta.26",
+    "@cornerstonejs/core": "^2.0.0-beta.28",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
     "lodash.get": "^4.4.2"
@@ -71,5 +124,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "0057ad13cf215a53e567dbdbab71404f234969e4"
+  "gitHead": "f07f340e5b63d3afdda66bfe35c9cef729a5b69d"
 }

package/dist/esm/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.d.ts

@@ -1,3 +0,0 @@
-import type { SegmentationRepresentationModifiedEventType } from '../../types/EventTypes';
-declare const segmentationRepresentationModifiedListener: (evt: SegmentationRepresentationModifiedEventType) => void;
-export default segmentationRepresentationModifiedListener;

package/dist/esm/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.js

@@ -1,14 +0,0 @@
-import { getSegmentationRepresentation } from '../../stateManagement/segmentation/segmentationState';
-import { triggerSegmentationRenderBySegmentationId } from '../../stateManagement/segmentation/SegmentationRenderingEngine';
-const segmentationRepresentationModifiedListener = function (evt) {
-    const { segmentationRepresentationUID } = evt.detail;
-    const segmentationRepresentation = getSegmentationRepresentation
-        ? getSegmentationRepresentation(segmentationRepresentationUID)
-        : null;
-    if (!segmentationRepresentation) {
-        return;
-    }
-    const segmentationId = segmentationRepresentation?.segmentationId;
-    triggerSegmentationRenderBySegmentationId(segmentationId);
-};
-export default segmentationRepresentationModifiedListener;

package/dist/esm/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.d.ts

@@ -1,3 +0,0 @@
-import type { SegmentationRepresentationRemovedEventType } from '../../types/EventTypes';
-declare const segmentationRepresentationRemovedEventListener: (evt: SegmentationRepresentationRemovedEventType) => void;
-export default segmentationRepresentationRemovedEventListener;

package/dist/esm/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.js

@@ -1,8 +0,0 @@
-import { getSegmentationRepresentation } from '../../stateManagement/segmentation/segmentationState';
-import { triggerSegmentationRenderBySegmentationId } from '../../stateManagement/segmentation/SegmentationRenderingEngine';
-const segmentationRepresentationRemovedEventListener = function (evt) {
-    const { segmentationRepresentationUID } = evt.detail;
-    const segmentation = getSegmentationRepresentation(segmentationRepresentationUID);
-    triggerSegmentationRenderBySegmentationId(segmentation.segmentationId);
-};
-export default segmentationRepresentationRemovedEventListener;

package/dist/esm/stateManagement/segmentation/addSegmentation.d.ts

@@ -1,2 +0,0 @@
-import type { SegmentationPublicInput } from '../../types/SegmentationStateTypes';
-export declare function addSegmentation(segmentationInput: SegmentationPublicInput, suppressEvents?: boolean): void;

package/dist/esm/stateManagement/segmentation/addSegmentation.js

@@ -1,11 +0,0 @@
-import normalizeSegmentationInput from './helpers/normalizeSegmentationInput';
-import { defaultSegmentationStateManager } from './SegmentationStateManager';
-import { triggerSegmentationModified } from './triggerSegmentationEvents';
-export function addSegmentation(segmentationInput, suppressEvents) {
-    const segmentationStateManager = defaultSegmentationStateManager;
-    const segmentation = normalizeSegmentationInput(segmentationInput);
-    segmentationStateManager.addSegmentation(segmentation);
-    if (!suppressEvents) {
-        triggerSegmentationModified(segmentation.segmentationId);
-    }
-}

package/dist/esm/stateManagement/segmentation/addSegmentationRepresentationState.d.ts

@@ -1,2 +0,0 @@
-import type { SegmentationRepresentation } from '../../types/SegmentationStateTypes';
-export declare function addSegmentationRepresentationState(viewportId: string, segmentationRepresentation: SegmentationRepresentation, suppressEvents?: boolean): void;

package/dist/esm/stateManagement/segmentation/addSegmentationRepresentationState.js

@@ -1,10 +0,0 @@
-import { defaultSegmentationStateManager } from './SegmentationStateManager';
-import { triggerSegmentationRepresentationModified } from './triggerSegmentationEvents';
-export function addSegmentationRepresentationState(viewportId, segmentationRepresentation, suppressEvents) {
-    const segmentationStateManager = defaultSegmentationStateManager;
-    segmentationStateManager.addSegmentationRepresentationState(segmentationRepresentation);
-    segmentationStateManager.addSegmentationRepresentationToViewport(viewportId, segmentationRepresentation.segmentationRepresentationUID);
-    if (!suppressEvents) {
-        triggerSegmentationRepresentationModified(segmentationRepresentation.segmentationRepresentationUID);
-    }
-}