@cornerstonejs/tools 1.71.1 → 1.71.2

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const defaultContourConfig = {
     renderOutline: true,
     outlineWidthAutoGenerated: 3,
-    outlineWidthActive: 2,
+    outlineWidthActive: 1,
     outlineWidthInactive: 1,
     outlineOpacity: 1,
     outlineOpacityInactive: 0.85,
@@ -11,7 +11,7 @@ const defaultContourConfig = {
     outlineDashInactive: undefined,
     outlineDashAutoGenerated: '5,3',
     activeSegmentOutlineWidthDelta: 0,
-    renderFill: true,
+    renderFill: false,
     fillAlpha: 0.5,
     fillAlphaInactive: 0.3,
     fillAlphaAutoGenerated: 0.3,

package/dist/cjs/tools/displayTools/Contour/contourConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":";;AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,CAAC;IAC5B,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,mBAAmB,EAAE,SAAS;IAC9B,wBAAwB,EAAE,KAAK;IAC/B,8BAA8B,EAAE,CAAC;IACjC,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,GAAG;IACd,iBAAiB,EAAE,GAAG;IACtB,sBAAsB,EAAE,GAAG;CAC5B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":";;AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,CAAC;IAC5B,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,mBAAmB,EAAE,SAAS;IAC9B,wBAAwB,EAAE,KAAK;IAC/B,8BAA8B,EAAE,CAAC;IACjC,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,GAAG;IACd,iBAAiB,EAAE,GAAG;IACtB,sBAAsB,EAAE,GAAG;CAC5B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,kBAAe,uBAAuB,CAAC"}

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

@@ -39,10 +39,10 @@ const core_1 = require("@cornerstonejs/core");
 const SegmentationRepresentations_1 = __importDefault(require("../../../enums/SegmentationRepresentations"));
 const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
 const ToolGroupManager_1 = require("../../../store/ToolGroupManager");
-const addOrUpdateVTKContourSets_1 = require("./vtkContour/addOrUpdateVTKContourSets");
 const removeContourFromElement_1 = __importDefault(require("./removeContourFromElement"));
-const contourConfigCache_1 = require("./vtkContour/contourConfigCache");
+const contourConfigCache_1 = require("./contourHandler/contourConfigCache");
 const segmentation_1 = require("../../../stateManagement/segmentation");
+const handleContourSegmentation_1 = require("./contourHandler/handleContourSegmentation");
 let polySegConversionInProgress = false;
 function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, renderImmediate = false) {
     _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
@@ -57,6 +57,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
     }
 }
 function render(viewport, representationConfig, toolGroupConfig) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { segmentationId } = representationConfig;
         const segmentation = SegmentationState.getSegmentation(segmentationId);
@@ -73,11 +74,12 @@ function render(viewport, representationConfig, toolGroupConfig) {
                 viewport,
             });
         }
-        const { geometryIds } = contourData;
-        if (!(geometryIds === null || geometryIds === void 0 ? void 0 : geometryIds.length) || !(viewport instanceof core_1.BaseVolumeViewport)) {
+        if (!contourData) {
             return;
         }
-        (0, addOrUpdateVTKContourSets_1.addOrUpdateVTKContourSets)(viewport, geometryIds, representationConfig, toolGroupConfig);
+        if ((_a = contourData === null || contourData === void 0 ? void 0 : contourData.geometryIds) === null || _a === void 0 ? void 0 : _a.length) {
+            (0, handleContourSegmentation_1.handleContourSegmentation)(viewport, contourData.geometryIds, contourData.annotationUIDsMap, representationConfig, toolGroupConfig);
+        }
     });
 }
 function _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID) {
@@ -89,7 +91,7 @@ function _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresent
     for (const viewportInfo of viewportsInfo) {
         const { viewportId, renderingEngineId } = viewportInfo;
         const enabledElement = (0, core_1.getEnabledElementByIds)(viewportId, renderingEngineId);
-        (0, removeContourFromElement_1.default)(enabledElement.viewport.element, segmentationRepresentationUID);
+        (0, removeContourFromElement_1.default)(segmentationRepresentationUID, toolGroupId);
     }
 }
 exports.default = {

package/dist/cjs/tools/displayTools/Contour/contourDisplay.js.map

@@ -1 +1 @@
-{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAI6B;AAE7B,6GAAyE;AACzE,2GAA6F;AAC7F,sEAA+D;AAK/D,sFAAmF;AACnF,0FAAkE;AAClE,wEAAoE;AACpE,wEAAgE;AAEhE,IAAI,2BAA2B,GAAG,KAAK,CAAC;AAYxC,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,oCAAoC,CAClC,WAAW,EACX,6BAA6B,CAC9B,CAAC;IACF,iBAAiB,CAAC,gCAAgC,CAChD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,IAAA,sCAAiB,EAAC,6BAA6B,CAAC,CAAC;IAEjD,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACnE,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,EAAE;YAC1D,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAQD,SAAe,MAAM,CACnB,QAA+B,EAC/B,oBAAqD,EACrD,eAAiD;;QAEjD,MAAM,EAAE,cAAc,EAAE,GAAG,oBAAoB,CAAC;QAChD,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAEvE,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,kBAAkB,CAAC,qCAAe,CAAC,OAAO,CAAC,CAAC;QAE3E,IACE,CAAC,WAAW;YACZ,sBAAO,CAAC,iCAAiC,CACvC,oBAAoB,CAAC,6BAA6B,CACnD;YACD,CAAC,2BAA2B,EAC5B;YACA,2BAA2B,GAAG,IAAI,CAAC;YAEnC,WAAW,GAAG,MAAM,sBAAO,CAAC,kCAAkC,CAC5D,cAAc,EACd;gBACE,6BAA6B,EAC3B,oBAAoB,CAAC,6BAA6B;gBACpD,QAAQ;aACT,CACF,CAAC;SACH;QAOD,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;QAEpC,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAA,IAAI,CAAC,CAAC,QAAQ,YAAY,yBAAkB,CAAC,EAAE;YACrE,OAAO;SACR;QAGD,IAAA,qDAAyB,EACvB,QAAQ,EACR,WAAW,EACX,oBAAoB,EACpB,eAAe,CAChB,CAAC;IAkEJ,CAAC;CAAA;AAED,SAAS,oCAAoC,CAC3C,WAAmB,EACnB,6BAAqC;IAErC,MAAM,SAAS,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CAAC;KAC7E;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;QACF,IAAA,kCAAwB,EACtB,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC/B,6BAA6B,CAC9B,CAAC;KACH;AACH,CAAC;AAED,kBAAe;IACb,MAAM;IACN,gCAAgC;CACjC,CAAC"}
+{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAoE;AAEpE,6GAAyE;AACzE,2GAA6F;AAC7F,sEAA+D;AAK/D,0FAAkE;AAClE,4EAAwE;AACxE,wEAAgE;AAChE,0FAAuF;AAEvF,IAAI,2BAA2B,GAAG,KAAK,CAAC;AAYxC,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,oCAAoC,CAClC,WAAW,EACX,6BAA6B,CAC9B,CAAC;IACF,iBAAiB,CAAC,gCAAgC,CAChD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,IAAA,sCAAiB,EAAC,6BAA6B,CAAC,CAAC;IAEjD,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACnE,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,EAAE;YAC1D,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAQD,SAAe,MAAM,CACnB,QAA+B,EAC/B,oBAAqD,EACrD,eAAiD;;;QAEjD,MAAM,EAAE,cAAc,EAAE,GAAG,oBAAoB,CAAC;QAChD,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAEvE,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,kBAAkB,CAAC,qCAAe,CAAC,OAAO,CAAC,CAAC;QAE3E,IACE,CAAC,WAAW;YACZ,sBAAO,CAAC,iCAAiC,CACvC,oBAAoB,CAAC,6BAA6B,CACnD;YACD,CAAC,2BAA2B,EAC5B;YACA,2BAA2B,GAAG,IAAI,CAAC;YAEnC,WAAW,GAAG,MAAM,sBAAO,CAAC,kCAAkC,CAC5D,cAAc,EACd;gBACE,6BAA6B,EAC3B,oBAAoB,CAAC,6BAA6B;gBACpD,QAAQ;aACT,CACF,CAAC;SACH;QAED,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,IAAI,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW,0CAAE,MAAM,EAAE;YACpC,IAAA,qDAAyB,EACvB,QAAQ,EACR,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,iBAAiB,EAC7B,oBAAoB,EACpB,eAAe,CAChB,CAAC;SACH;;CACF;AAED,SAAS,oCAAoC,CAC3C,WAAmB,EACnB,6BAAqC;IAErC,MAAM,SAAS,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CAAC;KAC7E;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;QACF,IAAA,kCAAwB,EAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC;KACtE;AACH,CAAC;AAED,kBAAe;IACb,MAAM;IACN,gCAAgC;CACjC,CAAC"}

package/dist/cjs/tools/displayTools/Contour/contourHandler/contourConfigCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contourConfigCache.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/contourConfigCache.ts"],"names":[],"mappings":";;;AAYA,MAAM,2CAA2C,GAAG,IAAI,GAAG,EAAE,CAAC;AAE9D,SAAgB,cAAc,CAC5B,6BAAqC;IAErC,OAAO,2CAA2C,CAAC,GAAG,CACpD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAND,wCAMC;AAED,SAAgB,cAAc,CAC5B,6BAAqC,EACrC,MAAmB;IAEnB,2CAA2C,CAAC,GAAG,CAC7C,6BAA6B,EAC7B,MAAM,CACP,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,SAAgB,iBAAiB,CAAC,6BAAqC;IACrE,2CAA2C,CAAC,MAAM,CAChD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAJD,8CAIC"}

package/dist/cjs/tools/displayTools/Contour/contourHandler/handleContourSegmentation.d.ts

@@ -0,0 +1,6 @@
+import { Types } from '@cornerstonejs/core';
+import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../../types';
+declare function handleContourSegmentation(viewport: Types.IVolumeViewport, geometryIds: string[], annotationUIDsMap: Map<number, Set<string>>, contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+declare function updateContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+declare function addContourSetsToElement(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+export { handleContourSegmentation, updateContourSets, addContourSetsToElement, };

package/dist/cjs/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addContourSetsToElement = exports.updateContourSets = exports.handleContourSegmentation = void 0;
+const stateManagement_1 = require("../../../../stateManagement");
+const core_1 = require("@cornerstonejs/core");
+const contourConfigCache_1 = require("./contourConfigCache");
+const utils_1 = require("./utils");
+const contourSegmentation_1 = require("../../../../utilities/contourSegmentation");
+const utils_2 = require("./utils");
+function handleContourSegmentation(viewport, geometryIds, annotationUIDsMap, contourRepresentation, contourRepresentationConfig) {
+    const addOrUpdateFn = annotationUIDsMap.size
+        ? updateContourSets
+        : addContourSetsToElement;
+    addOrUpdateFn(viewport, geometryIds, contourRepresentation, contourRepresentationConfig);
+}
+exports.handleContourSegmentation = handleContourSegmentation;
+function updateContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
+    const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
+    const newContourConfig = contourRepresentationConfig.representations.CONTOUR;
+    const cachedConfig = (0, contourConfigCache_1.getConfigCache)(segmentationRepresentationUID);
+    const newOutlineWithActive = newContourConfig.outlineWidthActive;
+    if ((cachedConfig === null || cachedConfig === void 0 ? void 0 : cachedConfig.outlineWidthActive) !== newOutlineWithActive) {
+        (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
+            outlineWidthActive: newOutlineWithActive,
+        }));
+    }
+    const segmentsToSetToInvisible = [];
+    const segmentsToSetToVisible = [];
+    for (const segmentIndex of segmentsHidden) {
+        if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
+            segmentsToSetToInvisible.push(segmentIndex);
+        }
+    }
+    for (const segmentIndex of cachedConfig.segmentsHidden) {
+        if (!segmentsHidden.has(segmentIndex)) {
+            segmentsToSetToVisible.push(segmentIndex);
+        }
+    }
+    const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
+        .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
+        .concat(segmentsToSetToInvisible);
+    const { segmentSpecificConfigs } = geometryIds.reduce((acc, geometryId) => {
+        const geometry = core_1.cache.getGeometry(geometryId);
+        const { data: contourSet } = geometry;
+        const segmentIndex = contourSet.getSegmentIndex();
+        const segmentSpecificConfig = (0, utils_1.getSegmentSpecificConfig)(contourRepresentation, geometryId, segmentIndex);
+        acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig !== null && segmentSpecificConfig !== void 0 ? segmentSpecificConfig : {};
+        return acc;
+    }, { contourSets: [], segmentSpecificConfigs: {} });
+    const affectedSegments = [
+        ...mergedInvisibleSegments,
+        ...segmentsToSetToVisible,
+    ];
+    const hasCustomSegmentSpecificConfig = Object.values(segmentSpecificConfigs).some((config) => Object.keys(config).length > 0);
+    if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
+        (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
+            segmentsHidden: new Set(segmentsHidden),
+        }));
+    }
+    viewport.render();
+}
+exports.updateContourSets = updateContourSets;
+function addContourSetsToElement(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
+    const { segmentationRepresentationUID, segmentationId, segmentsHidden } = contourRepresentation;
+    const segmentSpecificMap = new Map();
+    geometryIds.forEach((geometryId) => {
+        const geometry = core_1.cache.getGeometry(geometryId);
+        if (!geometry) {
+            console.warn(`No geometry found for geometryId ${geometryId}. Skipping render.`);
+            return;
+        }
+        const segmentIndex = geometry.data.getSegmentIndex();
+        (0, utils_2.validateGeometry)(geometry);
+        const segmentSpecificConfig = (0, utils_1.getSegmentSpecificConfig)(contourRepresentation, geometryId, segmentIndex);
+        const contourSet = geometry.data;
+        contourSet.contours.forEach((contour) => {
+            const { points, color, id } = contour;
+            const contourSegmentationAnnotation = {
+                annotationUID: core_1.utilities.uuidv4(),
+                data: {
+                    contour: {
+                        closed: true,
+                        polyline: points,
+                    },
+                    segmentation: {
+                        segmentationId,
+                        segmentIndex,
+                        color,
+                        id,
+                    },
+                    handles: {},
+                },
+                handles: {},
+                highlighted: false,
+                autoGenerated: false,
+                invalidated: false,
+                isLocked: false,
+                isVisible: true,
+                metadata: {
+                    referencedImageId: viewport.getCurrentImageId(),
+                    toolName: 'PlanarFreehandContourSegmentationTool',
+                    FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
+                    viewPlaneNormal: viewport.getCamera().viewPlaneNormal,
+                },
+            };
+            const annotationGroupSelector = viewport.element;
+            (0, stateManagement_1.addAnnotation)(contourSegmentationAnnotation, annotationGroupSelector);
+            (0, contourSegmentation_1.addContourSegmentationAnnotation)(contourSegmentationAnnotation);
+        });
+        if (segmentSpecificConfig) {
+            segmentSpecificMap.set(segmentIndex, segmentSpecificConfig);
+        }
+    });
+    const outlineWidthActive = contourRepresentationConfig.representations.CONTOUR.outlineWidthActive;
+    (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, (0, contourConfigCache_1.getConfigCache)(segmentationRepresentationUID), {
+        segmentsHidden: new Set(segmentsHidden),
+        segmentSpecificMap,
+        outlineWidthActive,
+    }));
+    viewport.resetCamera();
+    viewport.render();
+}
+exports.addContourSetsToElement = addContourSetsToElement;
+//# sourceMappingURL=handleContourSegmentation.js.map

package/dist/cjs/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleContourSegmentation.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/handleContourSegmentation.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/displayTools/Contour/contourHandler/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/utils.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmD;AACnD,sFAAiE;AACjE,gFAA2D;AAC3D,yFAAoE;AAepE,SAAgB,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;;IAEb,IAAI,qBAAqB,GACvB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAnBD,4DAmBC;AAOD,SAAgB,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAnBD,4CAmBC;AAUD,SAAgB,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,mBAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,YAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,kBAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC;AA1CD,kCA0CC"}

package/dist/cjs/tools/displayTools/Contour/removeContourFromElement.d.ts

@@ -1,2 +1,2 @@
-declare function removeContourFromElement(element: HTMLDivElement, segmentationRepresentationUID: string, removeFromCache?: boolean): void;
+declare function removeContourFromElement(segmentationRepresentationUID: string, toolGroupId: string, removeFromCache?: boolean): void;
 export default removeContourFromElement;

package/dist/cjs/tools/displayTools/Contour/removeContourFromElement.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@cornerstonejs/core");
-function removeContourFromElement(element, segmentationRepresentationUID, removeFromCache = false) {
-    const enabledElement = (0, core_1.getEnabledElement)(element);
-    const { viewport } = enabledElement;
-    const actorEntries = viewport.getActors();
-    const actorUIDsToRemove = actorEntries
-        .map(({ uid }) => uid.includes(segmentationRepresentationUID) ? uid : undefined)
-        .filter(Boolean);
-    viewport.removeActors(actorUIDsToRemove);
+const segmentationState_1 = require("../../../stateManagement/segmentation/segmentationState");
+const stateManagement_1 = require("../../../stateManagement");
+function removeContourFromElement(segmentationRepresentationUID, toolGroupId, removeFromCache = false) {
+    const segmentationRepresentation = (0, segmentationState_1.getSegmentationRepresentationByUID)(toolGroupId, segmentationRepresentationUID);
+    const { segmentationId } = segmentationRepresentation;
+    const segmentation = (0, segmentationState_1.getSegmentation)(segmentationId);
+    const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
+    annotationUIDsMap.forEach((annotationSet) => {
+        annotationSet.forEach((annotationUID) => {
+            (0, stateManagement_1.removeAnnotation)(annotationUID);
+        });
+    });
 }
 exports.default = removeContourFromElement;
 //# sourceMappingURL=removeContourFromElement.js.map

package/dist/cjs/tools/displayTools/Contour/removeContourFromElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":";;AAAA,8CAAwD;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAC9D;SACA,MAAM,CAAC,OAAO,CAAC,CAAC;IAGnB,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;AAG3C,CAAC;AAED,kBAAe,wBAAwB,CAAC"}
+{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":";;AAEA,+FAGiE;AAEjE,8DAA4D;AAY5D,SAAS,wBAAwB,CAC/B,6BAAqC,EACrC,WAAmB,EACnB,eAAe,GAAG,KAAK;IAEvB,MAAM,0BAA0B,GAAG,IAAA,sDAAkC,EACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,GAAG,0BAA0B,CAAC;IAEtD,MAAM,YAAY,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;IAErD,MAAM,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC;IAEtE,iBAAiB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QAC1C,aAAa,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YACtC,IAAA,kCAAgB,EAAC,aAAa,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,wBAAwB,CAAC"}

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

@@ -1,7 +1,7 @@
 const defaultContourConfig = {
     renderOutline: true,
     outlineWidthAutoGenerated: 3,
-    outlineWidthActive: 2,
+    outlineWidthActive: 1,
     outlineWidthInactive: 1,
     outlineOpacity: 1,
     outlineOpacityInactive: 0.85,
@@ -9,7 +9,7 @@ const defaultContourConfig = {
     outlineDashInactive: undefined,
     outlineDashAutoGenerated: '5,3',
     activeSegmentOutlineWidthDelta: 0,
-    renderFill: true,
+    renderFill: false,
     fillAlpha: 0.5,
     fillAlphaInactive: 0.3,
     fillAlphaAutoGenerated: 0.3,

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

@@ -1 +1 @@
-{"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,CAAC;IAC5B,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,mBAAmB,EAAE,SAAS;IAC9B,wBAAwB,EAAE,KAAK;IAC/B,8BAA8B,EAAE,CAAC;IACjC,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,GAAG;IACd,iBAAiB,EAAE,GAAG;IACtB,sBAAsB,EAAE,GAAG;CAC5B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,CAAC;IAC5B,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,mBAAmB,EAAE,SAAS;IAC9B,wBAAwB,EAAE,KAAK;IAC/B,8BAA8B,EAAE,CAAC;IACjC,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,GAAG;IACd,iBAAiB,EAAE,GAAG;IACtB,sBAAsB,EAAE,GAAG;CAC5B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,eAAe,uBAAuB,CAAC"}

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

@@ -1,11 +1,11 @@
-import { getEnabledElementByIds, BaseVolumeViewport, } from '@cornerstonejs/core';
+import { getEnabledElementByIds } from '@cornerstonejs/core';
 import Representations from '../../../enums/SegmentationRepresentations';
 import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
 import { getToolGroup } from '../../../store/ToolGroupManager';
-import { addOrUpdateVTKContourSets } from './vtkContour/addOrUpdateVTKContourSets';
 import removeContourFromElement from './removeContourFromElement';
-import { deleteConfigCache } from './vtkContour/contourConfigCache';
+import { deleteConfigCache } from './contourHandler/contourConfigCache';
 import { polySeg } from '../../../stateManagement/segmentation';
+import { handleContourSegmentation } from './contourHandler/handleContourSegmentation';
 let polySegConversionInProgress = false;
 function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, renderImmediate = false) {
     _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
@@ -35,11 +35,12 @@ async function render(viewport, representationConfig, toolGroupConfig) {
             viewport,
         });
     }
-    const { geometryIds } = contourData;
-    if (!geometryIds?.length || !(viewport instanceof BaseVolumeViewport)) {
+    if (!contourData) {
         return;
     }
-    addOrUpdateVTKContourSets(viewport, geometryIds, representationConfig, toolGroupConfig);
+    if (contourData?.geometryIds?.length) {
+        handleContourSegmentation(viewport, contourData.geometryIds, contourData.annotationUIDsMap, representationConfig, toolGroupConfig);
+    }
 }
 function _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID) {
     const toolGroup = getToolGroup(toolGroupId);
@@ -50,7 +51,7 @@ function _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresent
     for (const viewportInfo of viewportsInfo) {
         const { viewportId, renderingEngineId } = viewportInfo;
         const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
-        removeContourFromElement(enabledElement.viewport.element, segmentationRepresentationUID);
+        removeContourFromElement(segmentationRepresentationUID, toolGroupId);
     }
 }
 export default {

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

@@ -1 +1 @@
-{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}

package/dist/esm/tools/displayTools/Contour/contourHandler/contourConfigCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contourConfigCache.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/contourConfigCache.ts"],"names":[],"mappings":"AAYA,MAAM,2CAA2C,GAAG,IAAI,GAAG,EAAE,CAAC;AAE9D,MAAM,UAAU,cAAc,CAC5B,6BAAqC;IAErC,OAAO,2CAA2C,CAAC,GAAG,CACpD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,6BAAqC,EACrC,MAAmB;IAEnB,2CAA2C,CAAC,GAAG,CAC7C,6BAA6B,EAC7B,MAAM,CACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,6BAAqC;IACrE,2CAA2C,CAAC,MAAM,CAChD,6BAA6B,CAC9B,CAAC;AACJ,CAAC"}

package/dist/esm/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js

@@ -0,0 +1,119 @@
+import { addAnnotation } from '../../../../stateManagement';
+import { cache, utilities } from '@cornerstonejs/core';
+import { getConfigCache, setConfigCache } from './contourConfigCache';
+import { getSegmentSpecificConfig } from './utils';
+import { addContourSegmentationAnnotation } from '../../../../utilities/contourSegmentation';
+import { validateGeometry } from './utils';
+function handleContourSegmentation(viewport, geometryIds, annotationUIDsMap, contourRepresentation, contourRepresentationConfig) {
+    const addOrUpdateFn = annotationUIDsMap.size
+        ? updateContourSets
+        : addContourSetsToElement;
+    addOrUpdateFn(viewport, geometryIds, contourRepresentation, contourRepresentationConfig);
+}
+function updateContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
+    const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
+    const newContourConfig = contourRepresentationConfig.representations.CONTOUR;
+    const cachedConfig = getConfigCache(segmentationRepresentationUID);
+    const newOutlineWithActive = newContourConfig.outlineWidthActive;
+    if (cachedConfig?.outlineWidthActive !== newOutlineWithActive) {
+        setConfigCache(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
+            outlineWidthActive: newOutlineWithActive,
+        }));
+    }
+    const segmentsToSetToInvisible = [];
+    const segmentsToSetToVisible = [];
+    for (const segmentIndex of segmentsHidden) {
+        if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
+            segmentsToSetToInvisible.push(segmentIndex);
+        }
+    }
+    for (const segmentIndex of cachedConfig.segmentsHidden) {
+        if (!segmentsHidden.has(segmentIndex)) {
+            segmentsToSetToVisible.push(segmentIndex);
+        }
+    }
+    const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
+        .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
+        .concat(segmentsToSetToInvisible);
+    const { segmentSpecificConfigs } = geometryIds.reduce((acc, geometryId) => {
+        const geometry = cache.getGeometry(geometryId);
+        const { data: contourSet } = geometry;
+        const segmentIndex = contourSet.getSegmentIndex();
+        const segmentSpecificConfig = getSegmentSpecificConfig(contourRepresentation, geometryId, segmentIndex);
+        acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig ?? {};
+        return acc;
+    }, { contourSets: [], segmentSpecificConfigs: {} });
+    const affectedSegments = [
+        ...mergedInvisibleSegments,
+        ...segmentsToSetToVisible,
+    ];
+    const hasCustomSegmentSpecificConfig = Object.values(segmentSpecificConfigs).some((config) => Object.keys(config).length > 0);
+    if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
+        setConfigCache(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
+            segmentsHidden: new Set(segmentsHidden),
+        }));
+    }
+    viewport.render();
+}
+function addContourSetsToElement(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
+    const { segmentationRepresentationUID, segmentationId, segmentsHidden } = contourRepresentation;
+    const segmentSpecificMap = new Map();
+    geometryIds.forEach((geometryId) => {
+        const geometry = cache.getGeometry(geometryId);
+        if (!geometry) {
+            console.warn(`No geometry found for geometryId ${geometryId}. Skipping render.`);
+            return;
+        }
+        const segmentIndex = geometry.data.getSegmentIndex();
+        validateGeometry(geometry);
+        const segmentSpecificConfig = getSegmentSpecificConfig(contourRepresentation, geometryId, segmentIndex);
+        const contourSet = geometry.data;
+        contourSet.contours.forEach((contour) => {
+            const { points, color, id } = contour;
+            const contourSegmentationAnnotation = {
+                annotationUID: utilities.uuidv4(),
+                data: {
+                    contour: {
+                        closed: true,
+                        polyline: points,
+                    },
+                    segmentation: {
+                        segmentationId,
+                        segmentIndex,
+                        color,
+                        id,
+                    },
+                    handles: {},
+                },
+                handles: {},
+                highlighted: false,
+                autoGenerated: false,
+                invalidated: false,
+                isLocked: false,
+                isVisible: true,
+                metadata: {
+                    referencedImageId: viewport.getCurrentImageId(),
+                    toolName: 'PlanarFreehandContourSegmentationTool',
+                    FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
+                    viewPlaneNormal: viewport.getCamera().viewPlaneNormal,
+                },
+            };
+            const annotationGroupSelector = viewport.element;
+            addAnnotation(contourSegmentationAnnotation, annotationGroupSelector);
+            addContourSegmentationAnnotation(contourSegmentationAnnotation);
+        });
+        if (segmentSpecificConfig) {
+            segmentSpecificMap.set(segmentIndex, segmentSpecificConfig);
+        }
+    });
+    const outlineWidthActive = contourRepresentationConfig.representations.CONTOUR.outlineWidthActive;
+    setConfigCache(segmentationRepresentationUID, Object.assign({}, getConfigCache(segmentationRepresentationUID), {
+        segmentsHidden: new Set(segmentsHidden),
+        segmentSpecificMap,
+        outlineWidthActive,
+    }));
+    viewport.resetCamera();
+    viewport.render();
+}
+export { handleContourSegmentation, updateContourSets, addContourSetsToElement, };
+//# sourceMappingURL=handleContourSegmentation.js.map

package/dist/esm/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleContourSegmentation.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/handleContourSegmentation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAS,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAM9D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAE7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,SAAS,yBAAyB,CAChC,QAA+B,EAC/B,WAAqB,EACrB,iBAA2C,EAC3C,qBAA6D,EAC7D,2BAA6D;IAE7D,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI;QAC1C,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,uBAAuB,CAAC;IAC5B,aAAa,CACX,QAAQ,EACR,WAAW,EACX,qBAAqB,EACrB,2BAA2B,CAC5B,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D;IAE7D,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GACrD,qBAAqB,CAAC;IACxB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7E,MAAM,YAAY,GAAG,cAAc,CAAC,6BAA6B,CAAC,CAAC;IAEnE,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;IAEjE,IAAI,YAAY,EAAE,kBAAkB,KAAK,oBAAoB,EAAE;QAC7D,cAAc,CACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;YAC9B,kBAAkB,EAAE,oBAAoB;SACzC,CAAC,CACH,CAAC;KACH;IAED,MAAM,wBAAwB,GAAG,EAAE,CAAC;IACpC,MAAM,sBAAsB,GAAG,EAAE,CAAC;IAElC,KAAK,MAAM,YAAY,IAAI,cAAc,EAAE;QACzC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAClD,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC7C;KACF;IAED,KAAK,MAAM,YAAY,IAAI,YAAY,CAAC,cAAc,EAAE;QACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC3C;KACF;IAED,MAAM,uBAAuB,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;SACpE,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxE,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAEpC,MAAM,EAAE,sBAAsB,EAAE,GAAG,WAAW,CAAC,MAAM,CACnD,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QACtC,MAAM,YAAY,GAAI,UAAgC,CAAC,eAAe,EAAE,CAAC;QACzE,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,qBAAqB,EACrB,UAAU,EACV,YAAY,CACb,CAAC;QACF,GAAG,CAAC,sBAAsB,CAAC,YAAY,CAAC,GAAG,qBAAqB,IAAI,EAAE,CAAC;QAEvE,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,WAAW,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAChD,CAAC;IAEF,MAAM,gBAAgB,GAAG;QACvB,GAAG,uBAAuB;QAC1B,GAAG,sBAAsB;KAC1B,CAAC;IAEF,MAAM,8BAA8B,GAAG,MAAM,CAAC,MAAM,CAClD,sBAAsB,CACvB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEnD,IAAI,gBAAgB,CAAC,MAAM,IAAI,8BAA8B,EAAE;QAC7D,cAAc,CACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;YAC9B,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;SACxC,CAAC,CACH,CAAC;KACH;IAED,QAAQ,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D;IAE7D,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,cAAc,EAAE,GACrE,qBAAqB,CAAC;IACxB,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,CAAC;IACrC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;YACF,OAAO;SACR;QAED,MAAM,YAAY,GAAI,QAAQ,CAAC,IAA0B,CAAC,eAAe,EAAE,CAAC;QAE5E,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE3B,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,qBAAqB,EACrB,UAAU,EACV,YAAY,CACb,CAAC;QAEF,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAyB,CAAC;QAEtD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YACtC,MAAM,6BAA6B,GAAG;gBACpC,aAAa,EAAE,SAAS,CAAC,MAAM,EAAE;gBACjC,IAAI,EAAE;oBACJ,OAAO,EAAE;wBACP,MAAM,EAAE,IAAI;wBACZ,QAAQ,EAAE,MAAM;qBACjB;oBACD,YAAY,EAAE;wBACZ,cAAc;wBACd,YAAY;wBACZ,KAAK;wBACL,EAAE;qBACH;oBACD,OAAO,EAAE,EAAE;iBACZ;gBACD,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE;oBACR,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,EAAE;oBAC/C,QAAQ,EAAE,uCAAuC;oBACjD,mBAAmB,EAAE,QAAQ,CAAC,sBAAsB,EAAE;oBACtD,eAAe,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,eAAe;iBACtD;aACF,CAAC;YACF,MAAM,uBAAuB,GAAG,QAAQ,CAAC,OAAO,CAAC;YAEjD,aAAa,CAAC,6BAA6B,EAAE,uBAAuB,CAAC,CAAC;YAEtE,gCAAgC,CAAC,6BAA6B,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,IAAI,qBAAqB,EAAE;YACzB,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;SAC7D;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GACtB,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAEzE,cAAc,CACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,6BAA6B,CAAC,EAAE;QAC/D,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;QACvC,kBAAkB;QAClB,kBAAkB;KACnB,CAAC,CACH,CAAC;IAEF,QAAQ,CAAC,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC;AAED,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,GACxB,CAAC"}

package/dist/esm/tools/displayTools/Contour/contourHandler/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,qBAAqB,CAAC;AACnD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,WAAW,MAAM,2CAA2C,CAAC;AAepE,MAAM,UAAU,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;IAEb,IAAI,qBAAqB,GACvB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAUD,MAAM,UAAU,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -1,12 +1,15 @@
-import { getEnabledElement } from '@cornerstonejs/core';
-function removeContourFromElement(element, segmentationRepresentationUID, removeFromCache = false) {
-    const enabledElement = getEnabledElement(element);
-    const { viewport } = enabledElement;
-    const actorEntries = viewport.getActors();
-    const actorUIDsToRemove = actorEntries
-        .map(({ uid }) => uid.includes(segmentationRepresentationUID) ? uid : undefined)
-        .filter(Boolean);
-    viewport.removeActors(actorUIDsToRemove);
+import { getSegmentationRepresentationByUID, getSegmentation, } from '../../../stateManagement/segmentation/segmentationState';
+import { removeAnnotation } from '../../../stateManagement';
+function removeContourFromElement(segmentationRepresentationUID, toolGroupId, removeFromCache = false) {
+    const segmentationRepresentation = getSegmentationRepresentationByUID(toolGroupId, segmentationRepresentationUID);
+    const { segmentationId } = segmentationRepresentation;
+    const segmentation = getSegmentation(segmentationId);
+    const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
+    annotationUIDsMap.forEach((annotationSet) => {
+        annotationSet.forEach((annotationUID) => {
+            removeAnnotation(annotationUID);
+        });
+    });
 }
 export default removeContourFromElement;
 //# sourceMappingURL=removeContourFromElement.js.map

package/dist/esm/tools/displayTools/Contour/removeContourFromElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAC9D;SACA,MAAM,CAAC,OAAO,CAAC,CAAC;IAGnB,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;AAG3C,CAAC;AAED,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kCAAkC,EAClC,eAAe,GAChB,MAAM,yDAAyD,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAY5D,SAAS,wBAAwB,CAC/B,6BAAqC,EACrC,WAAmB,EACnB,eAAe,GAAG,KAAK;IAEvB,MAAM,0BAA0B,GAAG,kCAAkC,CACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,GAAG,0BAA0B,CAAC;IAEtD,MAAM,YAAY,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;IAErD,MAAM,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC;IAEtE,iBAAiB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QAC1C,aAAa,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YACtC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe,wBAAwB,CAAC"}

package/dist/types/tools/displayTools/Contour/contourDisplay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contourDisplay.d.ts","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAEN,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,gCAAgC,EAChC,+BAA+B,EAChC,MAAM,uCAAuC,CAAC;AAkB/C,iBAAS,gCAAgC,CACvC,WAAW,EAAE,MAAM,EACnB,6BAA6B,EAAE,MAAM,EACrC,eAAe,UAAQ,GACtB,IAAI,CAsBN;AAQD,iBAAe,MAAM,CACnB,QAAQ,EAAE,KAAK,CAAC,eAAe,EAC/B,oBAAoB,EAAE,+BAA+B,EACrD,eAAe,EAAE,gCAAgC,GAChD,OAAO,CAAC,IAAI,CAAC,CAgHf;;;;;AA2BD,wBAGE"}
+{"version":3,"file":"contourDisplay.d.ts","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAKpE,OAAO,EACL,gCAAgC,EAChC,+BAA+B,EAChC,MAAM,uCAAuC,CAAC;AAkB/C,iBAAS,gCAAgC,CACvC,WAAW,EAAE,MAAM,EACnB,6BAA6B,EAAE,MAAM,EACrC,eAAe,UAAQ,GACtB,IAAI,CAsBN;AAQD,iBAAe,MAAM,CACnB,QAAQ,EAAE,KAAK,CAAC,eAAe,EAC/B,oBAAoB,EAAE,+BAA+B,EACrD,eAAe,EAAE,gCAAgC,GAChD,OAAO,CAAC,IAAI,CAAC,CA0Cf;;;;;AAwBD,wBAGE"}

package/dist/types/tools/displayTools/Contour/contourHandler/contourConfigCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contourConfigCache.d.ts","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/contourConfigCache.ts"],"names":[],"mappings":"AAAA,aAAK,WAAW,GAAG;IACjB,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAUF,wBAAgB,cAAc,CAC5B,6BAA6B,EAAE,MAAM,GACpC,WAAW,CAIb;AAED,wBAAgB,cAAc,CAC5B,6BAA6B,EAAE,MAAM,EACrC,MAAM,EAAE,WAAW,QAMpB;AAED,wBAAgB,iBAAiB,CAAC,6BAA6B,EAAE,MAAM,QAItE"}

package/dist/types/tools/displayTools/Contour/contourHandler/handleContourSegmentation.d.ts

@@ -0,0 +1,7 @@
+import { Types } from '@cornerstonejs/core';
+import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../../types';
+declare function handleContourSegmentation(viewport: Types.IVolumeViewport, geometryIds: string[], annotationUIDsMap: Map<number, Set<string>>, contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+declare function updateContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+declare function addContourSetsToElement(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
+export { handleContourSegmentation, updateContourSets, addContourSetsToElement, };
+//# sourceMappingURL=handleContourSegmentation.d.ts.map

package/dist/types/tools/displayTools/Contour/contourHandler/handleContourSegmentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleContourSegmentation.d.ts","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/handleContourSegmentation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,KAAK,EAAa,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EACL,gCAAgC,EAChC,sCAAsC,EACvC,MAAM,mBAAmB,CAAC;AAO3B,iBAAS,yBAAyB,CAChC,QAAQ,EAAE,KAAK,CAAC,eAAe,EAC/B,WAAW,EAAE,MAAM,EAAE,EACrB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EAC3C,qBAAqB,EAAE,sCAAsC,EAC7D,2BAA2B,EAAE,gCAAgC,QAW9D;AAED,iBAAS,iBAAiB,CACxB,QAAQ,EAAE,KAAK,CAAC,eAAe,EAC/B,WAAW,EAAE,MAAM,EAAE,EACrB,qBAAqB,EAAE,sCAAsC,EAC7D,2BAA2B,EAAE,gCAAgC,QAyE9D;AAED,iBAAS,uBAAuB,CAC9B,QAAQ,EAAE,KAAK,CAAC,eAAe,EAC/B,WAAW,EAAE,MAAM,EAAE,EACrB,qBAAqB,EAAE,sCAAsC,EAC7D,2BAA2B,EAAE,gCAAgC,QAmF9D;AAED,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,GACxB,CAAC"}

package/dist/types/tools/displayTools/Contour/contourHandler/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/contourHandler/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,EAAE,sCAAsC,EAAE,MAAM,mBAAmB,CAAC;AAc3E,wBAAgB,wBAAwB,CACtC,qBAAqB,EAAE,sCAAsC,EAC7D,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,0DAgBd;AAOD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,GAAG,IAAI,CAmBhE;AAUD,wBAAgB,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,WAAW,eA0CxD"}

package/dist/types/tools/displayTools/Contour/removeContourFromElement.d.ts

@@ -1,3 +1,3 @@
-declare function removeContourFromElement(element: HTMLDivElement, segmentationRepresentationUID: string, removeFromCache?: boolean): void;
+declare function removeContourFromElement(segmentationRepresentationUID: string, toolGroupId: string, removeFromCache?: boolean): void;
 export default removeContourFromElement;
 //# sourceMappingURL=removeContourFromElement.d.ts.map

package/dist/types/tools/displayTools/Contour/removeContourFromElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeContourFromElement.d.ts","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAaA,iBAAS,wBAAwB,CAC/B,OAAO,EAAE,cAAc,EACvB,6BAA6B,EAAE,MAAM,EACrC,eAAe,UAAQ,GACtB,IAAI,CAiBN;AAED,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"removeContourFromElement.d.ts","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAmBA,iBAAS,wBAAwB,CAC/B,6BAA6B,EAAE,MAAM,EACrC,WAAW,EAAE,MAAM,EACnB,eAAe,UAAQ,GACtB,IAAI,CAiBN;AAED,eAAe,wBAAwB,CAAC"}