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

package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.d.ts

@@ -1,17 +1,10 @@
-import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction';
-import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
-import { Types } from '@cornerstonejs/core';
-import { LabelmapRepresentation } from '../../../types/SegmentationStateTypes';
-declare function getRepresentationRenderingConfig(): {
-    ofun: vtkPiecewiseFunction;
-    cfun: vtkColorTransferFunction;
-};
+import type { Types } from '@cornerstonejs/core';
+import type { LabelmapRepresentation } from '../../../types/SegmentationStateTypes';
 declare function removeRepresentation(viewportId: string, segmentationRepresentationUID: string, renderImmediate?: boolean): void;
 declare function render(viewport: Types.IStackViewport | Types.IVolumeViewport, representation: LabelmapRepresentation): Promise<void>;
 declare const _default: {
-    getRepresentationRenderingConfig: typeof getRepresentationRenderingConfig;
     render: typeof render;
     removeRepresentation: typeof removeRepresentation;
 };
 export default _default;
-export { getRepresentationRenderingConfig, render, removeRepresentation };
+export { render, removeRepresentation };

package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js

@@ -1,24 +1,19 @@
-import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction';
-import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
 import { cache, getEnabledElementByViewportId, StackViewport, VolumeViewport, } from '@cornerstonejs/core';
 import Representations from '../../../enums/SegmentationRepresentations';
-import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
 import addLabelmapToElement from './addLabelmapToElement';
 import removeLabelmapFromElement from './removeLabelmapFromElement';
 import { isVolumeSegmentation } from '../../segmentation/strategies/utils/stackVolumeCheck';
-import { polySeg } from '../../../stateManagement/segmentation';
-import { getSegmentsHidden } from '../../../stateManagement/segmentation/config/segmentationVisibility';
+import { getHiddenSegmentIndices } from '../../../stateManagement/segmentation/config/segmentationVisibility';
+import { removeRepresentation as _removeRepresentation } from '../../../stateManagement/segmentation/removeRepresentation';
+import { getActiveSegmentationRepresentation } from '../../../stateManagement/segmentation/getActiveSegmentationRepresentation';
+import { getColorLUT } from '../../../stateManagement/segmentation/getColorLUT';
+import { getCurrentLabelmapImageIdForViewport } from '../../../stateManagement/segmentation/getCurrentLabelmapImageIdForViewport';
+import { getGlobalConfig } from '../../../stateManagement/segmentation/getGlobalConfig';
+import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation';
+import { canComputeRequestedRepresentation } from '../../../stateManagement/segmentation/polySeg/canComputeRequestedRepresentation';
+import { computeAndAddLabelmapRepresentation } from '../../../stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation';
 const MAX_NUMBER_COLORS = 255;
 const labelMapConfigCache = new Map();
-function getRepresentationRenderingConfig() {
-    const cfun = vtkColorTransferFunction.newInstance();
-    const ofun = vtkPiecewiseFunction.newInstance();
-    ofun.addPoint(0, 0);
-    return {
-        ofun,
-        cfun,
-    };
-}
 let polySegConversionInProgress = false;
 function removeRepresentation(viewportId, segmentationRepresentationUID, renderImmediate = false) {
     const enabledElement = getEnabledElementByViewportId(viewportId);
@@ -27,7 +22,7 @@ function removeRepresentation(viewportId, segmentationRepresentationUID, renderI
     }
     const { viewport } = enabledElement;
     removeLabelmapFromElement(viewport.element, segmentationRepresentationUID);
-    SegmentationState.removeRepresentation(segmentationRepresentationUID);
+    _removeRepresentation(segmentationRepresentationUID);
     if (!renderImmediate) {
         return;
     }
@@ -55,7 +50,7 @@ function isSameFrameOfReference(viewport, referencedVolumeId) {
 }
 async function render(viewport, representation) {
     const { segmentationId, segmentationRepresentationUID } = representation;
-    const segmentation = SegmentationState.getSegmentation(segmentationId);
+    const segmentation = getSegmentation(segmentationId);
     if (!segmentation) {
         console.warn('No segmentation found for segmentationId: ', segmentationId);
         return;
@@ -63,10 +58,10 @@ async function render(viewport, representation) {
     let labelmapData = segmentation.representationData[Representations.Labelmap];
     let actorEntry = viewport.getActor(segmentationRepresentationUID);
     if (!labelmapData &&
-        polySeg.canComputeRequestedRepresentation(segmentationRepresentationUID) &&
+        canComputeRequestedRepresentation(segmentationRepresentationUID) &&
         !polySegConversionInProgress) {
         polySegConversionInProgress = true;
-        labelmapData = await polySeg.computeAndAddLabelmapRepresentation(segmentationId, {
+        labelmapData = await computeAndAddLabelmapRepresentation(segmentationId, {
             segmentationRepresentationUID,
             viewport,
         });
@@ -99,7 +94,7 @@ async function render(viewport, representation) {
         if (viewport instanceof VolumeViewport) {
             return;
         }
-        const labelmapImageId = SegmentationState.getLabelmapImageIdsForViewport(viewport.id, segmentationId);
+        const labelmapImageId = getCurrentLabelmapImageIdForViewport(viewport.id, segmentationId);
         if (!labelmapImageId) {
             return;
         }
@@ -115,23 +110,23 @@ async function render(viewport, representation) {
 }
 function _setLabelmapColorAndOpacity(viewportId, actorEntry, segmentationRepresentation) {
     const { rendering, config, colorLUTIndex } = segmentationRepresentation;
-    const activeSegRep = SegmentationState.getActiveRepresentation(viewportId);
+    const activeSegRep = getActiveSegmentationRepresentation(viewportId);
     const isActiveLabelmap = activeSegRep === segmentationRepresentation;
     const { cfun, ofun } = rendering;
     const { allSegments, perSegment } = config;
-    const globalLabelmapConfig = SegmentationState.getGlobalConfig().representations[Representations.Labelmap];
-    const globalConfig = SegmentationState.getGlobalConfig();
+    const globalLabelmapConfig = getGlobalConfig().representations[Representations.Labelmap];
+    const globalConfig = getGlobalConfig();
     const renderInactiveRepresentations = globalConfig.renderInactiveRepresentations;
     const configToUse = {
         ...globalLabelmapConfig,
         ...allSegments[Representations.Labelmap],
     };
     const labelmapConfig = configToUse;
-    const colorLUT = SegmentationState.getColorLUT(colorLUTIndex);
+    const colorLUT = getColorLUT(colorLUTIndex);
     const numColors = Math.min(256, colorLUT.length);
     const { uid: actorUID } = actorEntry;
     const { outlineWidth, renderOutline, outlineOpacity, activeSegmentOutlineWidthDelta, } = _getLabelmapConfig(labelmapConfig, isActiveLabelmap);
-    const segmentsHidden = getSegmentsHidden(viewportId, segmentationRepresentation.segmentationRepresentationUID);
+    const segmentsHidden = getHiddenSegmentIndices(viewportId, segmentationRepresentation.segmentationRepresentationUID);
     for (let i = 0; i < numColors; i++) {
         const segmentIndex = i;
         const segmentColor = colorLUT[segmentIndex];
@@ -167,7 +162,7 @@ function _setLabelmapColorAndOpacity(viewportId, actorEntry, segmentationReprese
     actor.getProperty().setInterpolationTypeToNearest();
     actor.getProperty().setUseLabelOutline(renderOutline);
     actor.getProperty().setLabelOutlineOpacity(outlineOpacity);
-    const { activeSegmentIndex } = SegmentationState.getSegmentation(segmentationRepresentation.segmentationId);
+    const { activeSegmentIndex } = getSegmentation(segmentationRepresentation.segmentationId);
     const outlineWidths = new Array(numColors - 1);
     for (let i = 1; i < numColors; i++) {
         const isHidden = segmentsHidden.has(i);
@@ -237,7 +232,8 @@ function _needsTransferFunctionUpdate(viewportId, actorUID, segmentIndex, { fill
         oldFillAlpha !== fillAlpha ||
         oldRenderFill !== renderFill ||
         oldRenderOutline !== renderOutline ||
-        oldOutlineWidth !== outlineWidth ||
+        oldOutlineWidth !== outlineWidth;
+    if (forceOpacityUpdate || forceColorUpdate) {
         labelMapConfigCache.set(cacheUID, {
             fillAlpha,
             renderFill,
@@ -245,6 +241,7 @@ function _needsTransferFunctionUpdate(viewportId, actorUID, segmentIndex, { fill
             outlineWidth,
             segmentColor: segmentColor.slice(),
         });
+    }
     return {
         forceOpacityUpdate,
         forceColorUpdate,
@@ -254,8 +251,7 @@ async function _addLabelmapToViewport(viewport, labelmapData, segmentationRepres
     await addLabelmapToElement(viewport.element, labelmapData, segmentationRepresentationUID);
 }
 export default {
-    getRepresentationRenderingConfig,
     render,
     removeRepresentation,
 };
-export { getRepresentationRenderingConfig, render, removeRepresentation };
+export { render, removeRepresentation };

package/dist/esm/tools/displayTools/Labelmap/validateLabelmap.d.ts

@@ -1,4 +1,4 @@
-import { SegmentationPublicInput } from '../../../types/SegmentationStateTypes';
-import { LabelmapSegmentationData } from '../../../types/LabelmapTypes';
+import type { SegmentationPublicInput } from '../../../types/SegmentationStateTypes';
+import type { LabelmapSegmentationData } from '../../../types/LabelmapTypes';
 export declare function validatePublic(segmentationInput: SegmentationPublicInput): void;
 export declare function validate(segmentationRepresentationData: LabelmapSegmentationData): void;

package/dist/esm/tools/displayTools/Surface/surfaceConfig.d.ts

@@ -1,3 +1,3 @@
-import { SurfaceRenderingConfig } from '../../../types/SurfaceTypes';
+import type { SurfaceRenderingConfig } from '../../../types/SurfaceTypes';
 declare function getDefaultSurfaceConfig(): SurfaceRenderingConfig;
 export default getDefaultSurfaceConfig;

package/dist/esm/tools/displayTools/Surface/surfaceDisplay.d.ts

@@ -1,5 +1,5 @@
-import { Types } from '@cornerstonejs/core';
-import { SegmentationRepresentation } from '../../../types/SegmentationStateTypes';
+import type { Types } from '@cornerstonejs/core';
+import type { SegmentationRepresentation } from '../../../types/SegmentationStateTypes';
 declare function removeRepresentation(viewportId: string, segmentationRepresentationUID: string, renderImmediate?: boolean): void;
 declare function render(viewport: Types.IVolumeViewport | Types.IStackViewport, representation: SegmentationRepresentation): Promise<void>;
 declare const _default: {

package/dist/esm/tools/displayTools/Surface/surfaceDisplay.js

@@ -1,9 +1,12 @@
 import { cache, getEnabledElementByViewportId, VolumeViewport3D, } from '@cornerstonejs/core';
-import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
 import Representations from '../../../enums/SegmentationRepresentations';
+import { removeRepresentation as _removeRepresentation } from '../../../stateManagement/segmentation/removeRepresentation';
 import removeSurfaceFromElement from './removeSurfaceFromElement';
 import addOrUpdateSurfaceToElement from './addOrUpdateSurfaceToElement';
-import { polySeg } from '../../../stateManagement/segmentation';
+import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation';
+import { getColorLUT } from '../../../stateManagement/segmentation/getColorLUT';
+import { canComputeRequestedRepresentation } from '../../../stateManagement/segmentation/polySeg/canComputeRequestedRepresentation';
+import { computeAndAddSurfaceRepresentation } from '../../../stateManagement/segmentation/polySeg';
 function removeRepresentation(viewportId, segmentationRepresentationUID, renderImmediate = false) {
     const enabledElement = getEnabledElementByViewportId(viewportId);
     if (!enabledElement) {
@@ -11,7 +14,7 @@ function removeRepresentation(viewportId, segmentationRepresentationUID, renderI
     }
     const { viewport } = enabledElement;
     removeSurfaceFromElement(viewport.element, segmentationRepresentationUID);
-    SegmentationState.removeRepresentation(segmentationRepresentationUID);
+    _removeRepresentation(segmentationRepresentationUID);
     if (!renderImmediate) {
         return;
     }
@@ -19,7 +22,7 @@ function removeRepresentation(viewportId, segmentationRepresentationUID, renderI
 }
 async function render(viewport, representation) {
     const { colorLUTIndex, segmentationId, segmentationRepresentationUID } = representation;
-    const segmentation = SegmentationState.getSegmentation(segmentationId);
+    const segmentation = getSegmentation(segmentationId);
     if (!segmentation) {
         return;
     }
@@ -28,8 +31,8 @@ async function render(viewport, representation) {
     }
     let SurfaceData = segmentation.representationData[Representations.Surface];
     if (!SurfaceData &&
-        polySeg.canComputeRequestedRepresentation(segmentationRepresentationUID)) {
-        SurfaceData = await polySeg.computeAndAddSurfaceRepresentation(segmentationId, {
+        canComputeRequestedRepresentation(segmentationRepresentationUID)) {
+        SurfaceData = await computeAndAddSurfaceRepresentation(segmentationId, {
             segmentationRepresentationUID,
         });
         if (!SurfaceData) {
@@ -40,7 +43,7 @@ async function render(viewport, representation) {
     if (!geometryIds?.size) {
         console.warn(`No Surfaces found for segmentationId ${segmentationId}. Skipping render.`);
     }
-    const colorLUT = SegmentationState.getColorLUT(colorLUTIndex);
+    const colorLUT = getColorLUT(colorLUTIndex);
     const surfaces = [];
     geometryIds.forEach((geometryId, segmentIndex) => {
         const geometry = cache.getGeometry(geometryId);

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

@@ -1,3 +1,3 @@
 import type { Types } from '@cornerstonejs/core';
-import { ContourAnnotationData } from '../types';
+import type { ContourAnnotationData } from '../types';
 export declare const distancePointToContour: (viewport: Types.IViewport, annotation: ContourAnnotationData, coords: Types.Point2) => number;

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

@@ -21,6 +21,7 @@ import ScaleOverlayTool from './ScaleOverlayTool';
 import SculptorTool from './SculptorTool';
 import BidirectionalTool from './annotation/BidirectionalTool';
 import LengthTool from './annotation/LengthTool';
+import HeightTool from './annotation/HeightTool';
 import ProbeTool from './annotation/ProbeTool';
 import DragProbeTool from './annotation/DragProbeTool';
 import RectangleROITool from './annotation/RectangleROITool';
@@ -48,4 +49,4 @@ import BrushTool from './segmentation/BrushTool';
 import PaintFillTool from './segmentation/PaintFillTool';
 import OrientationMarkerTool from './OrientationMarkerTool';
 import SegmentSelectTool from './segmentation/SegmentSelectTool';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };

package/dist/esm/tools/index.js

@@ -21,6 +21,7 @@ import ScaleOverlayTool from './ScaleOverlayTool';
 import SculptorTool from './SculptorTool';
 import BidirectionalTool from './annotation/BidirectionalTool';
 import LengthTool from './annotation/LengthTool';
+import HeightTool from './annotation/HeightTool';
 import ProbeTool from './annotation/ProbeTool';
 import DragProbeTool from './annotation/DragProbeTool';
 import RectangleROITool from './annotation/RectangleROITool';
@@ -48,4 +49,4 @@ import BrushTool from './segmentation/BrushTool';
 import PaintFillTool from './segmentation/PaintFillTool';
 import OrientationMarkerTool from './OrientationMarkerTool';
 import SegmentSelectTool from './segmentation/SegmentSelectTool';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };

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

@@ -9,9 +9,11 @@ import { Events, ToolModes, SegmentationRepresentations, StrategyCallbacks, } fr
 import { drawCircle as drawCircleSvg } from '../../drawingSvg';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportUIDs from '../../utilities/triggerAnnotationRenderForViewportIds';
-import { config as segmentationConfig, segmentLocking, segmentIndex as segmentIndexController, state as segmentationState, activeSegmentation, } from '../../stateManagement/segmentation';
 import { isVolumeSegmentation } from './strategies/utils/stackVolumeCheck';
-import { getLabelmapImageIdsForViewport } from '../../stateManagement/segmentation/segmentationState';
+import { getActiveSegmentationRepresentation, getCurrentLabelmapImageIdForViewport, getSegmentation, } from '../../stateManagement/segmentation/segmentationState';
+import { getLockedSegmentIndices } from '../../stateManagement/segmentation/segmentLocking';
+import { getActiveSegmentIndex } from '../../stateManagement/segmentation/getActiveSegmentIndex';
+import { getSegmentIndexColor } from '../../stateManagement/segmentation/config/segmentationColor';
 class BrushTool extends BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -192,7 +194,7 @@ class BrushTool extends BaseTool {
     createEditData(element) {
         const enabledElement = getEnabledElement(element);
         const { viewport } = enabledElement;
-        const activeRepresentation = activeSegmentation.getActiveRepresentation(viewport.id);
+        const activeRepresentation = getActiveSegmentationRepresentation(viewport.id);
         if (!activeRepresentation) {
             throw new Error('No active segmentation detected, create a segmentation representation before using the brush tool');
         }
@@ -200,8 +202,8 @@ class BrushTool extends BaseTool {
         if (type === SegmentationRepresentations.Contour) {
             throw new Error('Not implemented yet');
         }
-        const segmentsLocked = segmentLocking.getLockedSegments(segmentationId);
-        const { representationData } = segmentationState.getSegmentation(segmentationId);
+        const segmentsLocked = getLockedSegmentIndices(segmentationId);
+        const { representationData } = getSegmentation(segmentationId);
         const labelmapData = representationData[SegmentationRepresentations.Labelmap];
         if (isVolumeSegmentation(labelmapData, viewport)) {
             const { volumeId } = representationData[type];
@@ -228,7 +230,7 @@ class BrushTool extends BaseTool {
             };
         }
         else {
-            const segmentationImageId = getLabelmapImageIdsForViewport(viewport.id, segmentationId);
+            const segmentationImageId = getCurrentLabelmapImageIdForViewport(viewport.id, segmentationId);
             if (!segmentationImageId) {
                 return;
             }
@@ -272,14 +274,14 @@ class BrushTool extends BaseTool {
     }
     getActiveSegmentationData(viewport) {
         const viewportId = viewport.id;
-        const activeRepresentation = activeSegmentation.getActiveRepresentation(viewportId);
+        const activeRepresentation = getActiveSegmentationRepresentation(viewportId);
         if (!activeRepresentation) {
             console.warn('No active segmentation detected, create one before using the brush tool');
             return;
         }
         const { segmentationId, segmentationRepresentationUID } = activeRepresentation;
-        const segmentIndex = segmentIndexController.getActiveSegmentIndex(segmentationId);
-        const segmentColor = segmentationConfig.color.getSegmentIndexColor(segmentationRepresentationUID, segmentIndex);
+        const segmentIndex = getActiveSegmentIndex(segmentationId);
+        const segmentColor = getSegmentIndexColor(segmentationRepresentationUID, segmentIndex);
         return {
             segmentIndex,
             segmentationId,

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

@@ -1,15 +1,13 @@
-import { Types } from '@cornerstonejs/core';
+import type { Types } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
-import { PublicToolProps, ToolProps, EventTypes, SVGDrawingHelper } from '../../types';
-import { CircleROIStartEndThresholdAnnotation } from '../../types/ToolSpecificAnnotationTypes';
+import type { PublicToolProps, ToolProps, EventTypes, SVGDrawingHelper, Annotation } from '../../types';
+import type { CircleROIStartEndThresholdAnnotation, ROICachedStats } from '../../types/ToolSpecificAnnotationTypes';
 import CircleROITool from '../annotation/CircleROITool';
 declare class CircleROIStartEndThresholdTool extends CircleROITool {
     static toolName: any;
-    touchDragCallback: any;
-    mouseDragCallback: any;
-    _throttledCalculateCachedStats: any;
+    _throttledCalculateCachedStats: Function;
     editData: {
-        annotation: any;
+        annotation: Annotation;
         viewportIdsToRender: Array<string>;
         handleIndex?: number;
         newAnnotation?: boolean;
@@ -33,13 +31,18 @@ declare class CircleROIStartEndThresholdTool extends CircleROITool {
         };
         data: {
             label: string;
-            startSlice: number;
-            endSlice: number;
+            startCoordinate: number;
+            endCoordinate: number;
             handles: {
                 textBox: {
                     hasMoved: boolean;
-                    worldPosition: any;
-                    worldBoundingBox: any;
+                    worldPosition: Types.Point3;
+                    worldBoundingBox: {
+                        topLeft: Types.Point3;
+                        topRight: Types.Point3;
+                        bottomLeft: Types.Point3;
+                        bottomRight: Types.Point3;
+                    };
                 };
                 points: [Types.Point3, Types.Point3];
                 activeHandleIndex: any;
@@ -47,6 +50,7 @@ declare class CircleROIStartEndThresholdTool extends CircleROITool {
             cachedStats: {
                 pointsInVolume: any[];
                 projectionPoints: any[];
+                statistics: ROICachedStats;
             };
             labelmapUID: any;
         };
@@ -54,10 +58,11 @@ declare class CircleROIStartEndThresholdTool extends CircleROITool {
     _endCallback: (evt: EventTypes.InteractionEventType) => void;
     renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
     _computeProjectionPoints(annotation: CircleROIStartEndThresholdAnnotation, imageVolume: Types.IImageVolume): void;
-    _computePointsInsideVolume(annotation: any, imageVolume: any, enabledElement: any): void;
+    _computePointsInsideVolume(annotation: any, imageVolume: any, targetId: any, enabledElement: any): void;
     _calculateCachedStatsTool(annotation: any, enabledElement: any): any;
-    _getStartSliceIndex(imageVolume: Types.IImageVolume, worldPos: Types.Point3, spacingInNormal: number, viewPlaneNormal: Types.Point3): number | undefined;
-    _getEndSliceIndex(imageVolume: Types.IImageVolume, worldPos: Types.Point3, spacingInNormal: number, viewPlaneNormal: Types.Point3): number | undefined;
-    _getImageIdIndex(imageVolume: Types.IImageVolume, pos: vec3, spacingInNormal: number, viewPlaneNormal: Types.Point3): number | undefined;
+    _getStartCoordinate(worldPos: Types.Point3, spacingInNormal: number, viewPlaneNormal: Types.Point3): number | undefined;
+    _getEndCoordinate(worldPos: Types.Point3, spacingInNormal: number, viewPlaneNormal: Types.Point3): number | undefined;
+    _getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal: Types.Point3): number;
+    _getCoordinateForViewplaneNormal(pos: vec3 | number, viewPlaneNormal: Types.Point3): number | undefined;
 }
 export default CircleROIStartEndThresholdTool;