@cornerstonejs/tools 2.0.0-beta.27 → 2.0.0-beta.29

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

@@ -87,4 +87,3 @@ class LivewireContourSegmentationTool extends LivewireContourTool {
 }
 LivewireContourSegmentationTool.toolName = 'LivewireContourSegmentationTool';
 export default LivewireContourSegmentationTool;
-//# sourceMappingURL=LivewireContourSegmentationTool.js.map

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

@@ -319,7 +319,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -414,8 +414,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
         let width;
         let height;
         let scalarData;
-        if (!(viewport instanceof VolumeViewport) && scalarData) {
-            ({ scalarData } = viewportImageData);
+        if (!(viewport instanceof VolumeViewport)) {
             width = viewportImageData.dimensions[0];
             height = viewportImageData.dimensions[1];
             worldToSlice = (point) => {
@@ -423,6 +422,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 return [ijkPoint[0], ijkPoint[1]];
             };
             sliceToWorld = (point) => csUtils.transformIndexToWorld(vtkImageData, [point[0], point[1], 0]);
+            scalarData = viewportImageData.scalarData;
         }
         else if (viewport instanceof VolumeViewport) {
             const sliceImageData = csUtils.getCurrentVolumeViewportSlice(viewport);
@@ -650,4 +650,3 @@ function defaultGetTextLines(data, targetId) {
     }
     return textLines;
 }
-//# sourceMappingURL=LivewireContourTool.js.map

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

@@ -28,4 +28,3 @@ class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
 PlanarFreehandContourSegmentationTool.toolName =
     'PlanarFreehandContourSegmentationTool';
 export default PlanarFreehandContourSegmentationTool;
-//# sourceMappingURL=PlanarFreehandContourSegmentationTool.js.map

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

@@ -138,7 +138,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -528,4 +528,3 @@ function defaultGetTextLines(data, targetId) {
 }
 PlanarFreehandROITool.toolName = 'PlanarFreehandROI';
 export default PlanarFreehandROITool;
-//# sourceMappingURL=PlanarFreehandROITool.js.map

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

@@ -260,7 +260,7 @@ class ProbeTool extends AnnotationTool {
                 isPreScaled: isViewportPreScaled(viewport, targetId),
                 isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
             };
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -274,7 +274,7 @@ class ProbeTool extends AnnotationTool {
                 if (targetId.startsWith('imageId:')) {
                     const imageId = targetId.split('imageId:')[1];
                     const imageURI = csUtils.imageIdToURI(imageId);
-                    const viewports = csUtils.getViewportsWithImageURI(imageURI, renderingEngineId);
+                    const viewports = csUtils.getViewportsWithImageURI(imageURI);
                     const viewport = viewports[0];
                     ijk[2] = viewport.getCurrentImageIdIndex();
                 }
@@ -332,4 +332,3 @@ function defaultGetTextLines(data, targetId) {
 }
 ProbeTool.toolName = 'Probe';
 export default ProbeTool;
-//# sourceMappingURL=ProbeTool.js.map

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

@@ -459,7 +459,7 @@ class RectangleROITool extends AnnotationTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -545,4 +545,3 @@ function defaultGetTextLines(data, targetId) {
 }
 RectangleROITool.toolName = 'RectangleROI';
 export default RectangleROITool;
-//# sourceMappingURL=RectangleROITool.js.map

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

@@ -15,4 +15,3 @@ class SplineContourSegmentationTool extends SplineROITool {
 }
 SplineContourSegmentationTool.toolName = 'SplineContourSegmentationTool';
 export default SplineContourSegmentationTool;
-//# sourceMappingURL=SplineContourSegmentationTool.js.map

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

@@ -160,8 +160,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
             this._deactivateDraw(element);
             resetElementCursor(element);
             const enabledElement = getEnabledElement(element);
-            const { renderingEngine } = enabledElement;
-            const image = this.getTargetIdImage(this.getTargetId(enabledElement.viewport), enabledElement.renderingEngine);
+            const image = this.getTargetImageData(this.getTargetId(enabledElement.viewport));
             const { imageData, dimensions } = image;
             this.isHandleOutsideImage = data.handles.points
                 .map((p) => utilities.transformWorldToIndex(imageData, p))
@@ -433,7 +432,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -727,4 +726,3 @@ function defaultGetTextLines(data, targetId) {
 }
 SplineROITool.toolName = 'SplineROI';
 export default SplineROITool;
-//# sourceMappingURL=SplineROITool.js.map

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

@@ -389,7 +389,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
         const targetIds = Object.keys(cachedStats);
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -459,4 +459,3 @@ function defaultGetTextLines(data, targetId, configuration) {
 }
 UltrasoundDirectionalTool.toolName = 'UltrasoundDirectionalTool';
 export default UltrasoundDirectionalTool;
-//# sourceMappingURL=UltrasoundDirectionalTool.js.map

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

@@ -456,4 +456,3 @@ class VideoRedactionTool extends AnnotationTool {
 }
 VideoRedactionTool.toolName = 'VideoRedaction';
 export default VideoRedactionTool;
-//# sourceMappingURL=VideoRedactionTool.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js

@@ -254,4 +254,3 @@ function registerClosedContourEditLoop(toolInstance) {
         completeClosedContourEdit.bind(toolInstance);
 }
 export default registerClosedContourEditLoop;
-//# sourceMappingURL=closedContourEditLoop.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js

@@ -280,4 +280,3 @@ function registerDrawLoop(toolInstance) {
     toolInstance.haltDrawing = haltDrawing.bind(toolInstance);
 }
 export default registerDrawLoop;
-//# sourceMappingURL=drawLoop.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.js

@@ -144,4 +144,3 @@ function registerEditLoopCommon(toolInstance) {
         checkAndRemoveCrossesOnEditLine.bind(toolInstance);
 }
 export default registerEditLoopCommon;
-//# sourceMappingURL=editLoopCommon.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/findOpenUShapedContourVectorToPeak.js

@@ -37,4 +37,3 @@ export function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annot
     const canvasPoints = annotation.data.contour.polyline.map(viewport.worldToCanvas);
     return findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
 }
-//# sourceMappingURL=findOpenUShapedContourVectorToPeak.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js

@@ -323,4 +323,3 @@ function registerOpenContourEditLoop(toolInstance) {
         completeOpenContourEdit.bind(toolInstance);
 }
 export default registerOpenContourEditLoop;
-//# sourceMappingURL=openContourEditLoop.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js

@@ -46,4 +46,3 @@ function registerOpenContourEndEditLoop(toolInstance) {
         activateOpenContourEndEdit.bind(toolInstance);
 }
 export default registerOpenContourEndEditLoop;
-//# sourceMappingURL=openContourEndEditLoop.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js

@@ -214,4 +214,3 @@ function registerRenderMethods(toolInstance) {
     toolInstance._getRenderingOptions = _getRenderingOptions.bind(toolInstance);
 }
 export default registerRenderMethods;
-//# sourceMappingURL=renderMethods.js.map

package/dist/esm/tools/annotation/splines/BSpline.js

@@ -7,4 +7,3 @@ class BSpline extends CubicSpline {
     }
 }
 export { BSpline as default, BSpline };
-//# sourceMappingURL=BSpline.js.map

package/dist/esm/tools/annotation/splines/CardinalSpline.js

@@ -30,4 +30,3 @@ class CardinalSpline extends CubicSpline {
     }
 }
 export { CardinalSpline as default, CardinalSpline };
-//# sourceMappingURL=CardinalSpline.js.map

package/dist/esm/tools/annotation/splines/CatmullRomSpline.js

@@ -5,4 +5,3 @@ class CatmullRomSpline extends CardinalSpline {
     }
 }
 export { CatmullRomSpline as default, CatmullRomSpline };
-//# sourceMappingURL=CatmullRomSpline.js.map

package/dist/esm/tools/annotation/splines/CubicSpline.js

@@ -162,4 +162,3 @@ class CubicSpline extends Spline {
     }
 }
 export { CubicSpline as default, CubicSpline };
-//# sourceMappingURL=CubicSpline.js.map

package/dist/esm/tools/annotation/splines/LinearSpline.js

@@ -5,4 +5,3 @@ class LinearSpline extends CardinalSpline {
     }
 }
 export { LinearSpline as default, LinearSpline };
-//# sourceMappingURL=LinearSpline.js.map

package/dist/esm/tools/annotation/splines/QuadraticBezier.js

@@ -13,4 +13,3 @@ class QuadraticBezier extends QuadraticSpline {
     }
 }
 export { QuadraticBezier as default, QuadraticBezier };
-//# sourceMappingURL=QuadraticBezier.js.map

package/dist/esm/tools/annotation/splines/QuadraticSpline.js

@@ -11,4 +11,3 @@ class QuadraticSpline extends Spline {
     }
 }
 export { QuadraticSpline as default, QuadraticSpline };
-//# sourceMappingURL=QuadraticSpline.js.map

package/dist/esm/tools/annotation/splines/Spline.js

@@ -393,4 +393,3 @@ class Spline {
     }
 }
 export { Spline as default, Spline };
-//# sourceMappingURL=Spline.js.map

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

@@ -57,4 +57,3 @@ class AnnotationDisplayTool extends BaseTool {
 }
 AnnotationDisplayTool.toolName = 'AnnotationDisplayTool';
 export default AnnotationDisplayTool;
-//# sourceMappingURL=AnnotationDisplayTool.js.map

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

@@ -180,4 +180,3 @@ class AnnotationTool extends AnnotationDisplayTool {
 }
 AnnotationTool.toolName = 'AnnotationTool';
 export default AnnotationTool;
-//# sourceMappingURL=AnnotationTool.js.map

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

@@ -14,8 +14,7 @@ declare abstract class BaseTool {
     applyActiveStrategyCallback(enabledElement: Types.IEnabledElement, operationData: unknown, callbackType: StrategyCallbacks | string): any;
     setConfiguration(newConfiguration: Record<string, any>): void;
     setActiveStrategy(strategyName: string): void;
-    protected getTargetVolumeId(viewport: Types.IViewport): string | undefined;
-    protected getTargetIdImage(targetId: string, renderingEngine: Types.IRenderingEngine): Types.IImageData | Types.CPUIImageData | Types.IImageVolume;
+    protected getTargetImageData(targetId: string): Types.IImageData | Types.CPUIImageData;
     protected getTargetId(viewport: Types.IViewport): string | undefined;
 }
 export default BaseTool;

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

@@ -35,21 +35,11 @@ class BaseTool {
     setActiveStrategy(strategyName) {
         this.setConfiguration({ activeStrategy: strategyName });
     }
-    getTargetVolumeId(viewport) {
-        if (this.configuration.volumeId) {
-            return this.configuration.volumeId;
-        }
-        const actorEntries = viewport.getActors();
-        if (!actorEntries) {
-            return;
-        }
-        return actorEntries.find((actorEntry) => actorEntry.actor.getClassName() === 'vtkVolume')?.uid;
-    }
-    getTargetIdImage(targetId, renderingEngine) {
+    getTargetImageData(targetId) {
         if (targetId.startsWith('imageId:')) {
             const imageId = targetId.split('imageId:')[1];
             const imageURI = utilities.imageIdToURI(imageId);
-            let viewports = utilities.getViewportsWithImageURI(imageURI, renderingEngine.id);
+            let viewports = utilities.getViewportsWithImageURI(imageURI);
             if (!viewports || !viewports.length) {
                 return;
             }
@@ -63,7 +53,7 @@ class BaseTool {
         }
         else if (targetId.startsWith('volumeId:')) {
             const volumeId = utilities.getVolumeId(targetId);
-            const viewports = utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
+            const viewports = utilities.getViewportsWithVolumeId(volumeId);
             if (!viewports || !viewports.length) {
                 return;
             }
@@ -71,7 +61,7 @@ class BaseTool {
         }
         else if (targetId.startsWith('videoId:')) {
             const imageURI = utilities.imageIdToURI(targetId);
-            const viewports = utilities.getViewportsWithImageURI(imageURI, renderingEngine.id);
+            const viewports = utilities.getViewportsWithImageURI(imageURI);
             if (!viewports || !viewports.length) {
                 return;
             }
@@ -86,12 +76,8 @@ class BaseTool {
         if (targetId) {
             return targetId;
         }
-        if (viewport instanceof BaseVolumeViewport) {
-            return `volumeId:${this.getTargetVolumeId(viewport)}`;
-        }
-        throw new Error('getTargetId: viewport must have a getReferenceId method');
+        throw new Error('getTargetId: viewport must have a getViewReferenceId method');
     }
 }
 BaseTool.toolName = 'BaseTool';
 export default BaseTool;
-//# sourceMappingURL=BaseTool.js.map

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

@@ -148,4 +148,3 @@ class ContourBaseTool extends AnnotationTool {
     }
 }
 export { ContourBaseTool as default, ContourBaseTool };
-//# sourceMappingURL=ContourBaseTool.js.map

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

@@ -1,5 +1,4 @@
 import { getEnabledElement, utilities } from '@cornerstonejs/core';
-import { getGlobalConfig, getSegmentationRepresentationConfig, getSegmentIndexConfig, } from '../../stateManagement/segmentation/config/segmentationConfig';
 import { getSegmentation } from '../../stateManagement/segmentation/getSegmentation';
 import { SegmentationRepresentations } from '../../enums';
 import ContourBaseTool from './ContourBaseTool';
@@ -9,14 +8,14 @@ import { addContourSegmentationAnnotation, removeContourSegmentationAnnotation,
 import { triggerAnnotationRenderForToolGroupIds } from '../../utilities/triggerAnnotationRenderForToolGroupIds';
 import { getToolGroupForViewport } from '../../store/ToolGroupManager';
 import { getSegmentIndexColor } from '../../stateManagement/segmentation/config/segmentationColor';
-import { getSegmentationRepresentations } from '../../stateManagement/segmentation/getSegmentationRepresentations';
-import { getSegmentationRepresentationsForSegmentation } from '../../stateManagement/segmentation/getSegmentationRepresentationsForSegmentation';
-import { getActiveSegmentationRepresentation } from '../../stateManagement/segmentation/getActiveSegmentationRepresentation';
+import { getSegmentationRepresentations } from '../../stateManagement/segmentation/getSegmentationRepresentation';
+import { getActiveSegmentation } from '../../stateManagement/segmentation/getActiveSegmentation';
 import { getSegmentationRepresentationVisibility } from '../../stateManagement/segmentation/getSegmentationRepresentationVisibility';
 import { getViewportIdsWithSegmentation } from '../../stateManagement/segmentation/getViewportIdsWithSegmentation';
 import { getActiveSegmentIndex } from '../../stateManagement/segmentation/getActiveSegmentIndex';
 import { getLockedSegmentIndices } from '../../stateManagement/segmentation/segmentLocking';
-import { getSegmentIndexVisibility } from '../../stateManagement/segmentation/config/segmentationVisibility';
+import { segmentationStyle } from '../../stateManagement/segmentation/SegmentationStyle';
+import { internalGetHiddenSegmentIndices } from '../../stateManagement/segmentation/helpers/internalGetHiddenSegmentIndices';
 class ContourSegmentationBaseTool extends ContourBaseTool {
     constructor(toolProps, defaultToolProps) {
         super(toolProps, defaultToolProps);
@@ -39,12 +38,11 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         if (!this.isContourSegmentationTool()) {
             return contourAnnotation;
         }
-        const activeSeg = getActiveSegmentationRepresentation(viewport.id);
+        const activeSeg = getActiveSegmentation(viewport.id);
         if (!activeSeg) {
             throw new Error('No active segmentation detected, create one before using scissors tool');
         }
-        const { type: segmentationType } = activeSeg;
-        if (segmentationType !== SegmentationRepresentations.Contour) {
+        if (!activeSeg.representationData.Contour) {
             throw new Error(`A contour segmentation must be active`);
         }
         const { segmentationId } = activeSeg;
@@ -100,35 +98,36 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         const annotation = context.annotation;
         const { segmentationId, segmentIndex } = annotation.data.segmentation;
         const segmentation = getSegmentation(segmentationId);
-        const segmentationRepresentations = getSegmentationRepresentationsForSegmentation(segmentationId);
+        const { viewportId } = context.styleSpecifier;
+        const segmentationRepresentations = getSegmentationRepresentations(viewportId, { segmentationId });
         if (!segmentationRepresentations?.length) {
             return {};
         }
-        const allUIDs = segmentationRepresentations.map((rep) => rep.segmentationRepresentationUID);
         let segmentationRepresentation;
         if (segmentationRepresentations.length > 1) {
-            const viewportReps = getSegmentationRepresentations(context.styleSpecifier.viewportId);
-            segmentationRepresentation = viewportReps.find((rep) => rep.segmentationId === segmentationId &&
-                allUIDs.includes(rep.segmentationRepresentationUID));
+            segmentationRepresentation = segmentationRepresentations.find((rep) => rep.segmentationId === segmentationId &&
+                rep.type === SegmentationRepresentations.Contour);
         }
         else {
             segmentationRepresentation = segmentationRepresentations[0];
         }
-        const { segmentationRepresentationUID } = segmentationRepresentation;
         const { autoGenerated } = annotation;
         const segmentsLocked = getLockedSegmentIndices(segmentationId);
         const annotationLocked = segmentsLocked.includes(segmentIndex);
-        const segmentColor = getSegmentIndexColor(segmentationRepresentationUID, segmentIndex);
-        const viewportId = context.styleSpecifier.viewportId;
-        const segmentationVisible = getSegmentationRepresentationVisibility(viewportId, segmentationRepresentationUID);
-        const globalConfig = getGlobalConfig();
-        const segmentationRepresentationConfig = getSegmentationRepresentationConfig(segmentationRepresentationUID);
-        const segmentConfig = getSegmentIndexConfig(segmentationRepresentationUID, segmentIndex);
-        const segmentVisible = getSegmentIndexVisibility(viewportId, segmentationRepresentationUID, segmentIndex);
-        const activeSegRep = getActiveSegmentationRepresentation(viewportId);
-        const isActive = activeSegRep.segmentationRepresentationUID ===
-            segmentationRepresentationUID;
-        const mergedConfig = Object.assign({}, globalConfig?.representations?.Contour ?? {}, segmentationRepresentationConfig ?? {}, segmentConfig ?? {});
+        const segmentColor = getSegmentIndexColor(context.styleSpecifier.viewportId, segmentationId, segmentIndex);
+        const segmentationVisible = getSegmentationRepresentationVisibility(viewportId, {
+            segmentationId,
+            type: SegmentationRepresentations.Contour,
+        });
+        const activeSegmentation = getActiveSegmentation(viewportId);
+        const isActive = activeSegmentation?.segmentationId === segmentationId;
+        const style = segmentationStyle.getStyle({
+            viewportId,
+            segmentationId,
+            type: SegmentationRepresentations.Contour,
+            segmentIndex,
+        });
+        const mergedConfig = style;
         let lineWidth = 1;
         let lineDash = undefined;
         let lineOpacity = 1;
@@ -140,8 +139,8 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
             fillOpacity = mergedConfig.fillAlphaAutoGenerated ?? fillOpacity;
         }
         else if (isActive) {
-            lineWidth = mergedConfig.outlineWidthActive ?? lineWidth;
-            lineDash = mergedConfig.outlineDashActive ?? lineDash;
+            lineWidth = mergedConfig.outlineWidth ?? lineWidth;
+            lineDash = mergedConfig.outlineDash ?? lineDash;
             lineOpacity = mergedConfig.outlineOpacity ?? lineOpacity;
             fillOpacity = mergedConfig.fillAlpha ?? fillOpacity;
         }
@@ -151,13 +150,18 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
             lineOpacity = mergedConfig.outlineOpacityInactive ?? lineOpacity;
             fillOpacity = mergedConfig.fillAlphaInactive ?? fillOpacity;
         }
-        if (segmentation.activeSegmentIndex === segmentIndex) {
+        if (getActiveSegmentIndex(segmentationId) === segmentIndex) {
             lineWidth += mergedConfig.activeSegmentOutlineWidthDelta;
         }
         lineWidth = mergedConfig.renderOutline ? lineWidth : 0;
         fillOpacity = mergedConfig.renderFill ? fillOpacity : 0;
         const color = `rgba(${segmentColor[0]}, ${segmentColor[1]}, ${segmentColor[2]}, ${lineOpacity})`;
         const fillColor = `rgb(${segmentColor[0]}, ${segmentColor[1]}, ${segmentColor[2]})`;
+        const hiddenSegments = internalGetHiddenSegmentIndices(viewportId, {
+            segmentationId,
+            type: SegmentationRepresentations.Contour,
+        });
+        const isVisible = !hiddenSegments.has(segmentIndex);
         return {
             color,
             fillColor,
@@ -167,10 +171,9 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
             textbox: {
                 color,
             },
-            visibility: segmentationVisible && segmentVisible,
+            visibility: segmentationVisible && isVisible,
             locked: annotationLocked,
         };
     }
 }
 export { ContourSegmentationBaseTool as default, ContourSegmentationBaseTool };
-//# sourceMappingURL=ContourSegmentationBaseTool.js.map

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

@@ -2,4 +2,3 @@ import BaseTool from './BaseTool';
 import AnnotationTool from './AnnotationTool';
 import AnnotationDisplayTool from './AnnotationDisplayTool';
 export { BaseTool, AnnotationTool, AnnotationDisplayTool };
-//# sourceMappingURL=index.js.map

package/dist/esm/tools/displayTools/Contour/contourConfig.d.ts

@@ -1,3 +1,3 @@
-import type { ContourConfig } from '../../../types/ContourTypes';
-declare function getDefaultContourConfig(): ContourConfig;
-export default getDefaultContourConfig;
+import type { ContourStyle } from '../../../types/ContourTypes';
+declare function getDefaultContourStyle(): ContourStyle;
+export default getDefaultContourStyle;

package/dist/esm/tools/displayTools/Contour/contourConfig.js

@@ -1,11 +1,11 @@
 const defaultContourConfig = {
     renderOutline: true,
     outlineWidthAutoGenerated: 3,
-    outlineWidthActive: 1,
+    outlineWidth: 1,
     outlineWidthInactive: 1,
     outlineOpacity: 1,
     outlineOpacityInactive: 0.85,
-    outlineDashActive: undefined,
+    outlineDash: undefined,
     outlineDashInactive: undefined,
     outlineDashAutoGenerated: '5,3',
     activeSegmentOutlineWidthDelta: 0,
@@ -14,8 +14,7 @@ const defaultContourConfig = {
     fillAlphaInactive: 0.3,
     fillAlphaAutoGenerated: 0.3,
 };
-function getDefaultContourConfig() {
+function getDefaultContourStyle() {
     return defaultContourConfig;
 }
-export default getDefaultContourConfig;
-//# sourceMappingURL=contourConfig.js.map
+export default getDefaultContourStyle;

package/dist/esm/tools/displayTools/Contour/contourDisplay.d.ts

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

package/dist/esm/tools/displayTools/Contour/contourDisplay.js

@@ -1,23 +1,21 @@
 import { getEnabledElementByViewportId } from '@cornerstonejs/core';
 import Representations from '../../../enums/SegmentationRepresentations';
-import { deleteConfigCache } from './contourHandler/contourConfigCache';
 import { handleContourSegmentation } from './contourHandler/handleContourSegmentation';
-import { removeRepresentation as _removeRepresentation } from '../../../stateManagement/segmentation/removeRepresentation';
 import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation';
 import { canComputeRequestedRepresentation } from '../../../stateManagement/segmentation/polySeg/canComputeRequestedRepresentation';
 import { computeAndAddContourRepresentation } from '../../../stateManagement/segmentation/polySeg/Contour/computeAndAddContourRepresentation';
+import removeContourFromElement from './removeContourFromElement';
 let polySegConversionInProgress = false;
-function removeRepresentation(viewportId, segmentationRepresentationUID, renderImmediate = false) {
+function removeRepresentation(viewportId, segmentationId, renderImmediate = false) {
     const enabledElement = getEnabledElementByViewportId(viewportId);
     if (!enabledElement) {
         return;
     }
     const { viewport } = enabledElement;
-    _removeRepresentation(segmentationRepresentationUID);
-    deleteConfigCache(segmentationRepresentationUID);
     if (!renderImmediate) {
         return;
     }
+    removeContourFromElement(viewportId, segmentationId);
     viewport.render();
 }
 async function render(viewport, contourRepresentation) {
@@ -28,11 +26,10 @@ async function render(viewport, contourRepresentation) {
     }
     let contourData = segmentation.representationData[Representations.Contour];
     if (!contourData &&
-        canComputeRequestedRepresentation(contourRepresentation.segmentationRepresentationUID) &&
+        canComputeRequestedRepresentation(segmentationId, Representations.Contour) &&
         !polySegConversionInProgress) {
         polySegConversionInProgress = true;
         contourData = await computeAndAddContourRepresentation(segmentationId, {
-            segmentationRepresentationUID: contourRepresentation.segmentationRepresentationUID,
             viewport,
         });
     }
@@ -47,4 +44,3 @@ export default {
     render,
     removeRepresentation,
 };
-//# sourceMappingURL=contourDisplay.js.map