@cornerstonejs/tools 0.1.2 → 0.2.0

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

@@ -0,0 +1,158 @@
+import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
+import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
+import { cache, getEnabledElementByIds, utilities, } from '@cornerstonejs/core';
+import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
+import Representations from '../../../enums/SegmentationRepresentations';
+import { getToolGroupById } from '../../../store/ToolGroupManager';
+import addLabelmapToElement from './addLabelmapToElement';
+import { deepMerge } from '../../../utilities';
+import removeLabelmapFromElement from './removeLabelmapFromElement';
+const MAX_NUMBER_COLORS = 255;
+const labelMapConfigCache = new Map();
+async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
+    const { segmentationId } = representationInput;
+    const segmentation = SegmentationState.getSegmentation(segmentationId);
+    const { volumeId } = segmentation.representations[Representations.Labelmap];
+    const segmentationRepresentationUID = utilities.uuidv4();
+    await _addLabelmapToToolGroupViewports(toolGroupId, volumeId, segmentationRepresentationUID);
+    const segmentsHidden = new Set();
+    const visibility = true;
+    const colorLUTIndex = 0;
+    const active = true;
+    const cfun = vtkColorTransferFunction.newInstance();
+    const ofun = vtkPiecewiseFunction.newInstance();
+    const toolGroupSpecificRepresentation = {
+        segmentationId,
+        segmentationRepresentationUID,
+        type: Representations.Labelmap,
+        segmentsHidden,
+        visibility,
+        colorLUTIndex,
+        active,
+        config: {
+            cfun,
+            ofun,
+        },
+    };
+    if (toolGroupSpecificConfig) {
+        const suppressEvents = true;
+        const currentToolGroupConfig = SegmentationState.getToolGroupSpecificConfig(toolGroupId);
+        const mergedConfig = deepMerge(currentToolGroupConfig, toolGroupSpecificConfig);
+        SegmentationState.setToolGroupSpecificConfig(toolGroupId, {
+            renderInactiveSegmentations: mergedConfig.renderInactiveSegmentations || true,
+            representations: {
+                ...mergedConfig.representations,
+            },
+        }, suppressEvents);
+    }
+    SegmentationState.addSegmentationRepresentation(toolGroupId, toolGroupSpecificRepresentation);
+}
+function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID) {
+    _removeLabelmapFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
+    SegmentationState.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID);
+}
+function render(viewport, representation, toolGroupConfig) {
+    const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, visibility, config: renderingConfig, } = representation;
+    const segmentation = SegmentationState.getSegmentation(segmentationId);
+    const labelmapData = segmentation.representations[Representations.Labelmap];
+    const { volumeId: labelmapUID } = labelmapData;
+    const labelmap = cache.getVolume(labelmapUID);
+    if (!labelmap) {
+        throw new Error(`No Labelmap found for volumeId: ${labelmapUID}`);
+    }
+    const actor = viewport.getActor(segmentationRepresentationUID);
+    if (!actor) {
+        console.warn('No actor found for actorUID: ', segmentationRepresentationUID);
+        return;
+    }
+    const { cfun, ofun } = renderingConfig;
+    const labelmapConfig = toolGroupConfig.representations[Representations.Labelmap];
+    const renderInactiveSegmentations = toolGroupConfig.renderInactiveSegmentations;
+    _setLabelmapColorAndOpacity(viewport.id, actor, cfun, ofun, colorLUTIndex, labelmapConfig, active, renderInactiveSegmentations, visibility);
+}
+function _setLabelmapColorAndOpacity(viewportId, actor, cfun, ofun, colorLUTIndex, labelmapConfig, isActiveLabelmap, renderInactiveSegmentations, visibility = true) {
+    ofun.addPoint(0, 0);
+    const fillAlpha = isActiveLabelmap
+        ? labelmapConfig.fillAlpha
+        : labelmapConfig.fillAlphaInactive;
+    const outlineWidth = isActiveLabelmap
+        ? labelmapConfig.outlineWidthActive
+        : labelmapConfig.outlineWidthInactive;
+    const colorLUT = SegmentationState.getColorLut(colorLUTIndex);
+    const numColors = Math.min(256, colorLUT.length);
+    const { volumeActor, uid } = actor;
+    const { needColorUpdate, needOpacityUpdate } = _needsTransferFunctionUpdate(viewportId, uid, fillAlpha, colorLUTIndex);
+    if (needColorUpdate) {
+        for (let i = 0; i < numColors; i++) {
+            const color = colorLUT[i];
+            cfun.addRGBPoint(i, color[0] / MAX_NUMBER_COLORS, color[1] / MAX_NUMBER_COLORS, color[2] / MAX_NUMBER_COLORS);
+        }
+        volumeActor.getProperty().setRGBTransferFunction(0, cfun);
+    }
+    if (needOpacityUpdate) {
+        for (let i = 0; i < numColors; i++) {
+            const color = colorLUT[i];
+            const segmentOpacity = (color[3] / 255) * fillAlpha;
+            ofun.addPoint(i, segmentOpacity);
+        }
+        ofun.setClamping(false);
+        volumeActor.getProperty().setScalarOpacity(0, ofun);
+    }
+    volumeActor.getProperty().setInterpolationTypeToNearest();
+    volumeActor.getProperty().setUseLabelOutline(labelmapConfig.renderOutline);
+    volumeActor.getProperty().setLabelOutlineThickness(outlineWidth);
+    const visible = visibility && (isActiveLabelmap || renderInactiveSegmentations);
+    volumeActor.setVisibility(visible);
+}
+function _needsTransferFunctionUpdate(viewportId, actorUID, fillAlpha, colorLUTIndex) {
+    const cacheUID = `${viewportId}-${actorUID}`;
+    const config = labelMapConfigCache.get(cacheUID);
+    let needColorUpdate = false;
+    let needOpacityUpdate = false;
+    labelMapConfigCache.set(cacheUID, {
+        fillAlpha,
+        colorLUTIndex,
+    });
+    if (!config) {
+        needColorUpdate = true;
+        needOpacityUpdate = true;
+    }
+    if (config && config.fillAlpha !== fillAlpha) {
+        needOpacityUpdate = true;
+    }
+    if (config && config.colorLUTIndex !== colorLUTIndex) {
+        needColorUpdate = true;
+    }
+    return { needColorUpdate, needOpacityUpdate };
+}
+function _removeLabelmapFromToolGroupViewports(toolGroupId, segmentationRepresentationUID) {
+    const toolGroup = getToolGroupById(toolGroupId);
+    if (toolGroup === undefined) {
+        throw new Error(`ToolGroup with ToolGroupId ${toolGroupId} does not exist`);
+    }
+    const { viewportsInfo } = toolGroup;
+    for (const viewportInfo of viewportsInfo) {
+        const { viewportId, renderingEngineId } = viewportInfo;
+        const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
+        removeLabelmapFromElement(enabledElement.viewport.element, segmentationRepresentationUID);
+    }
+}
+async function _addLabelmapToToolGroupViewports(toolGroupId, volumeId, segmentationRepresentationUID) {
+    const toolGroup = getToolGroupById(toolGroupId);
+    const { viewportsInfo } = toolGroup;
+    for (const viewportInfo of viewportsInfo) {
+        const { viewportId, renderingEngineId } = viewportInfo;
+        const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
+        if (!enabledElement) {
+            throw new Error(`No enabled element found for rendering engine: ${renderingEngineId} and viewport: ${viewportId}`);
+        }
+        const { viewport } = enabledElement;
+        addLabelmapToElement(viewport.element, volumeId, segmentationRepresentationUID);
+    }
+}
+export default {
+    render,
+    addSegmentationRepresentation,
+    removeSegmentationRepresentation,
+};
+//# sourceMappingURL=labelmapDisplay.js.map

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

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

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

@@ -0,0 +1,2 @@
+declare function removeLabelmapFromElement(element: HTMLElement, segmentationRepresentationUID: string, removeFromCache?: boolean): void;
+export default removeLabelmapFromElement;

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

@@ -0,0 +1,10 @@
+import { getEnabledElement } from '@cornerstonejs/core';
+function removeLabelmapFromElement(element, segmentationRepresentationUID, removeFromCache = false) {
+    const enabledElement = getEnabledElement(element);
+    const { viewport } = enabledElement;
+    viewport.removeVolumeActors([
+        segmentationRepresentationUID,
+    ]);
+}
+export default removeLabelmapFromElement;
+//# sourceMappingURL=removeLabelmapFromElement.js.map

package/dist/esm/tools/displayTools/Labelmap/removeLabelmapFromElement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"removeLabelmapFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/removeLabelmapFromElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAavD,SAAS,yBAAyB,CAChC,OAAoB,EACpB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAElC;IAAC,QAAkC,CAAC,kBAAkB,CAAC;QACtD,6BAA6B;KAC9B,CAAC,CAAA;AACJ,CAAC;AAED,eAAe,yBAAyB,CAAA"}

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

@@ -0,0 +1,3 @@
+import { SegmentationPublicInput } from '../../../types/SegmentationStateTypes';
+declare function validate(segmentationInput: SegmentationPublicInput): void;
+export default validate;

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

@@ -0,0 +1,16 @@
+import { cache } from '@cornerstonejs/core';
+function validate(segmentationInput) {
+    if (!segmentationInput.representation.data) {
+        throw new Error('The segmentationInput.representationData.data is undefined, please provide a valid representationData.data');
+    }
+    const representationData = segmentationInput.representation.data;
+    if (!representationData.volumeId) {
+        throw new Error('The segmentationInput.representationData.volumeId is undefined, please provide a valid representationData.volumeId');
+    }
+    const cachedVolume = cache.getVolume(representationData.volumeId);
+    if (!cachedVolume) {
+        throw new Error(`volumeId of ${representationData.volumeId} not found in cache, you should load and cache volume before adding segmentation`);
+    }
+}
+export default validate;
+//# sourceMappingURL=validateRepresentationData.js.map

package/dist/esm/tools/displayTools/Labelmap/validateRepresentationData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateRepresentationData.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/validateRepresentationData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAE3C,SAAS,QAAQ,CAAC,iBAA0C;IAC1D,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAA;KACF;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAA;IAEhE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,oHAAoH,CACrH,CAAA;KACF;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjE,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CACb,eAAe,kBAAkB,CAAC,QAAQ,kFAAkF,CAC7H,CAAA;KACF;AACH,CAAC;AAED,eAAe,QAAQ,CAAA"}

package/dist/esm/tools/displayTools/SegmentationDisplayTool.d.ts

@@ -1,11 +1,11 @@
 import { BaseTool } from '../base';
-import { SegmentationConfig } from '../../types/SegmentationStateTypes';
 import { PublicToolProps, ToolProps } from '../../types';
+import { SegmentationRepresentationConfig } from '../../types/SegmentationStateTypes';
 export default class SegmentationDisplayTool extends BaseTool {
     static toolName: string;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
     enableCallback(): void;
     disableCallback(): void;
-    renderSegmentation: (toolGroupUID: string) => void;
-    _getSegmentationConfig(toolGroupUID: string): SegmentationConfig;
+    renderSegmentation: (toolGroupId: string) => void;
+    _getMergedRepresentationsConfig(toolGroupId: string): SegmentationRepresentationConfig;
 }

package/dist/esm/tools/displayTools/SegmentationDisplayTool.js

@@ -1,35 +1,34 @@
 import { BaseTool } from '../base';
-import { getEnabledElementByUIDs } from '@cornerstonejs/core';
+import { getEnabledElementByIds } from '@cornerstonejs/core';
 import Representations from '../../enums/SegmentationRepresentations';
-import { getSegmentationState } from '../../stateManagement/segmentation/segmentationState';
-import { LabelmapDisplay } from './Labelmap';
+import { getSegmentationRepresentations } from '../../stateManagement/segmentation/segmentationState';
+import { labelmapDisplay } from './Labelmap';
 import { segmentationConfig } from '../../stateManagement/segmentation';
-import { triggerSegmentationStateModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
-import { getToolGroupByToolGroupUID } from '../../store/ToolGroupManager';
+import { triggerSegmentationRepresentationModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
+import { getToolGroupById } from '../../store/ToolGroupManager';
 import { deepMerge } from '../../utilities';
 export default class SegmentationDisplayTool extends BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         configuration: {},
     }) {
         super(toolProps, defaultToolProps);
-        this.renderSegmentation = (toolGroupUID) => {
-            const toolGroup = getToolGroupByToolGroupUID(toolGroupUID);
+        this.renderSegmentation = (toolGroupId) => {
+            const toolGroup = getToolGroupById(toolGroupId);
             if (!toolGroup) {
                 return;
             }
-            const toolGroupSegmentationState = getSegmentationState(toolGroupUID);
-            const toolGroupViewports = toolGroup.viewportsInfo.map(({ renderingEngineUID, viewportUID }) => {
-                const enabledElement = getEnabledElementByUIDs(viewportUID, renderingEngineUID);
+            const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
+            const toolGroupViewports = toolGroup.viewportsInfo.map(({ renderingEngineId, viewportId }) => {
+                const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
                 if (enabledElement) {
                     return enabledElement.viewport;
                 }
             });
-            toolGroupSegmentationState.forEach((segmentationData) => {
-                const config = this._getSegmentationConfig(toolGroupUID);
-                const { representation } = segmentationData;
+            toolGroupSegmentationRepresentations.forEach((representation) => {
+                const config = this._getMergedRepresentationsConfig(toolGroupId);
                 toolGroupViewports.forEach((viewport) => {
                     if (representation.type == Representations.Labelmap) {
-                        LabelmapDisplay.render(viewport, segmentationData, config);
+                        labelmapDisplay.render(viewport, representation, config);
                     }
                     else {
                         throw new Error(`Render for ${representation.type} is not supported yet`);
@@ -42,30 +41,32 @@ export default class SegmentationDisplayTool extends BaseTool {
         };
     }
     enableCallback() {
-        const toolGroupUID = this.toolGroupUID;
-        const toolGroupSegmentationState = getSegmentationState(toolGroupUID);
-        if (toolGroupSegmentationState.length === 0) {
+        const toolGroupId = this.toolGroupId;
+        const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
+        if (!toolGroupSegmentationRepresentations ||
+            toolGroupSegmentationRepresentations.length === 0) {
             return;
         }
-        for (const segmentationData of toolGroupSegmentationState) {
-            segmentationData.visibility = true;
+        for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
+            segmentationRepresentation.visibility = true;
+            triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
         }
-        triggerSegmentationStateModified(toolGroupUID);
     }
     disableCallback() {
-        const toolGroupUID = this.toolGroupUID;
-        const toolGroupSegmentationState = getSegmentationState(toolGroupUID);
-        if (toolGroupSegmentationState.length === 0) {
+        const toolGroupId = this.toolGroupId;
+        const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
+        if (!toolGroupSegmentationRepresentations ||
+            toolGroupSegmentationRepresentations.length === 0) {
             return;
         }
-        for (const segmentationData of toolGroupSegmentationState) {
-            segmentationData.visibility = false;
+        for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
+            segmentationRepresentation.visibility = false;
+            triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
         }
-        triggerSegmentationStateModified(toolGroupUID);
     }
-    _getSegmentationConfig(toolGroupUID) {
-        const toolGroupConfig = segmentationConfig.getSegmentationConfig(toolGroupUID);
-        const globalConfig = segmentationConfig.getGlobalSegmentationConfig();
+    _getMergedRepresentationsConfig(toolGroupId) {
+        const toolGroupConfig = segmentationConfig.getToolGroupSpecificConfig(toolGroupId);
+        const globalConfig = segmentationConfig.getGlobalConfig();
         const mergedConfig = deepMerge(globalConfig, toolGroupConfig);
         return mergedConfig;
     }

package/dist/esm/tools/displayTools/SegmentationDisplayTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,eAAe,MAAM,yCAAyC,CAAA;AACrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,sDAAsD,CAAA;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AACvE,OAAO,EAAE,yCAAyC,EAAE,MAAM,8DAA8D,CAAA;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAI/D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AA4B3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,QAAQ;IAE3D,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,aAAa,EAAE,EAAE;KAClB;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAsDpC,uBAAkB,GAAG,CAAC,WAAmB,EAAQ,EAAE;YACjD,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAE/C,IAAI,CAAC,SAAS,EAAE;gBACd,OAAM;aACP;YAED,MAAM,oCAAoC,GACxC,8BAA8B,CAAC,WAAW,CAAC,CAAA;YAG7C,MAAM,kBAAkB,GAAG,SAAS,CAAC,aAAa,CAAC,GAAG,CACpD,CAAC,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,EAAE;gBACpC,MAAM,cAAc,GAAG,sBAAsB,CAC3C,UAAU,EACV,iBAAiB,CAClB,CAAA;gBAED,IAAI,cAAc,EAAE;oBAClB,OAAO,cAAc,CAAC,QAAQ,CAAA;iBAC/B;YACH,CAAC,CACF,CAAA;YAGD,oCAAoC,CAAC,OAAO,CAC1C,CAAC,cAA+C,EAAE,EAAE;gBAClD,MAAM,MAAM,GAAG,IAAI,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAA;gBAEhE,kBAAkB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACtC,IAAI,cAAc,CAAC,IAAI,IAAI,eAAe,CAAC,QAAQ,EAAE;wBACnD,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAA;qBACzD;yBAAM;wBACL,MAAM,IAAI,KAAK,CACb,cAAc,cAAc,CAAC,IAAI,uBAAuB,CACzD,CAAA;qBACF;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC,CACF,CAAA;YAGD,kBAAkB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACtC,QAAQ,CAAC,MAAM,EAAE,CAAA;YACnB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;IAlGD,CAAC;IAED,cAAc;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,MAAM,oCAAoC,GACxC,8BAA8B,CAAC,WAAW,CAAC,CAAA;QAE7C,IACE,CAAC,oCAAoC;YACrC,oCAAoC,CAAC,MAAM,KAAK,CAAC,EACjD;YACA,OAAM;SACP;QAGD,KAAK,MAAM,0BAA0B,IAAI,oCAAoC,EAAE;YAC7E,0BAA0B,CAAC,UAAU,GAAG,IAAI,CAAA;YAC5C,yCAAyC,CACvC,WAAW,EACX,0BAA0B,CAAC,6BAA6B,CACzD,CAAA;SACF;IACH,CAAC;IAED,eAAe;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,MAAM,oCAAoC,GACxC,8BAA8B,CAAC,WAAW,CAAC,CAAA;QAE7C,IACE,CAAC,oCAAoC;YACrC,oCAAoC,CAAC,MAAM,KAAK,CAAC,EACjD;YACA,OAAM;SACP;QAGD,KAAK,MAAM,0BAA0B,IAAI,oCAAoC,EAAE;YAC7E,0BAA0B,CAAC,UAAU,GAAG,KAAK,CAAA;YAC7C,yCAAyC,CACvC,WAAW,EACX,0BAA0B,CAAC,6BAA6B,CACzD,CAAA;SACF;IACH,CAAC;IA6DD,+BAA+B,CAC7B,WAAmB;QAEnB,MAAM,eAAe,GACnB,kBAAkB,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,kBAAkB,CAAC,eAAe,EAAE,CAAA;QAGzD,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;QAE7D,OAAO,YAAY,CAAA;IACrB,CAAC;;AA5HM,gCAAQ,GAAG,qBAAqB,CAAA"}

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

@@ -7,10 +7,10 @@ export default class CircleScissorsTool extends BaseTool {
         annotation: any;
         segmentation: any;
         segmentIndex: number;
-        segmentationDataUID: string;
+        segmentationId: string;
         segmentsLocked: number[];
         segmentColor: [number, number, number, number];
-        viewportUIDsToRender: string[];
+        viewportIdsToRender: string[];
         handleIndex?: number;
         movingTextBox: boolean;
         newAnnotation?: boolean;

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

@@ -1,11 +1,12 @@
-import { cache, getEnabledElement, StackViewport, } from '@cornerstonejs/core';
+import { cache, getEnabledElement, StackViewport } from '@cornerstonejs/core';
 import { BaseTool } from '../base';
 import { fillInsideCircle } from './strategies/fillCircle';
 import { Events } from '../../enums';
 import { drawCircle as drawCircleSvg } from '../../drawingSvg';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
-import triggerAnnotationRenderForViewportUIDs from '../../utilities/triggerAnnotationRenderForViewportUIDs';
+import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { segmentLocking, activeSegmentation, segmentIndex as segmentIndexController, segmentationColor, } from '../../stateManagement/segmentation';
+import { getSegmentation } from '../../stateManagement/segmentation/segmentationState';
 export default class CircleScissorsTool extends BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -28,16 +29,18 @@ export default class CircleScissorsTool extends BaseTool {
             this.isDrawing = true;
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
-            const toolGroupUID = this.toolGroupUID;
-            const activeSegmentationInfo = activeSegmentation.getActiveSegmentationInfo(toolGroupUID);
-            if (!activeSegmentationInfo) {
+            const toolGroupId = this.toolGroupId;
+            const activeSegmentationRepresentation = activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
+            if (!activeSegmentationRepresentation) {
                 throw new Error('No active segmentation detected, create one before using scissors tool');
             }
-            const { volumeUID, segmentationDataUID } = activeSegmentationInfo;
-            const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupUID);
-            const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(volumeUID);
-            const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupUID, activeSegmentationInfo.segmentationDataUID, segmentIndex);
-            const segmentation = cache.getVolume(volumeUID);
+            const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
+            const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
+            const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
+            const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
+            const { representations } = getSegmentation(segmentationId);
+            const { volumeId } = representations[type];
+            const segmentation = cache.getVolume(volumeId);
             const annotation = {
                 invalidated: true,
                 highlighted: true,
@@ -58,16 +61,16 @@ export default class CircleScissorsTool extends BaseTool {
                     cachedStats: {},
                 },
             };
-            const viewportUIDsToRender = [viewport.uid];
+            const viewportIdsToRender = [viewport.id];
             this.editData = {
                 annotation,
                 segmentation,
                 centerCanvas: canvasPos,
                 segmentIndex,
-                segmentationDataUID,
+                segmentationId,
                 segmentsLocked,
                 segmentColor,
-                viewportUIDsToRender,
+                viewportIdsToRender,
                 handleIndex: 3,
                 movingTextBox: false,
                 newAnnotation: true,
@@ -76,7 +79,7 @@ export default class CircleScissorsTool extends BaseTool {
             this._activateDraw(element);
             hideElementCursor(element);
             evt.preventDefault();
-            triggerAnnotationRenderForViewportUIDs(renderingEngine, viewportUIDsToRender);
+            triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
         };
         this._mouseDragCallback = (evt) => {
             this.isDrawing = true;
@@ -87,7 +90,7 @@ export default class CircleScissorsTool extends BaseTool {
             const enabledElement = getEnabledElement(element);
             const { renderingEngine, viewport } = enabledElement;
             const { canvasToWorld } = viewport;
-            const { annotation, viewportUIDsToRender, centerCanvas } = this.editData;
+            const { annotation, viewportIdsToRender, centerCanvas } = this.editData;
             const { data } = annotation;
             const dX = Math.abs(currentCanvasPoints[0] - centerCanvas[0]);
             const dY = Math.abs(currentCanvasPoints[1] - centerCanvas[1]);
@@ -110,12 +113,12 @@ export default class CircleScissorsTool extends BaseTool {
             ];
             annotation.invalidated = true;
             this.editData.hasMoved = true;
-            triggerAnnotationRenderForViewportUIDs(renderingEngine, viewportUIDsToRender);
+            triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
         };
         this._mouseUpCallback = (evt) => {
             const eventDetail = evt.detail;
             const { element } = eventDetail;
-            const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked, segmentationDataUID, } = this.editData;
+            const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked, segmentationId, } = this.editData;
             const { data } = annotation;
             const { viewPlaneNormal, viewUp } = annotation.metadata;
             if (newAnnotation && !hasMoved) {
@@ -138,8 +141,7 @@ export default class CircleScissorsTool extends BaseTool {
                 segmentIndex,
                 segmentsLocked,
                 viewPlaneNormal,
-                toolGroupUID: this.toolGroupUID,
-                segmentationDataUID,
+                segmentationId,
                 viewUp,
             };
             this.applyActiveStrategy(enabledElement, operationData);
@@ -159,8 +161,8 @@ export default class CircleScissorsTool extends BaseTool {
                 return;
             }
             const { viewport } = enabledElement;
-            const { viewportUIDsToRender } = this.editData;
-            if (!viewportUIDsToRender.includes(viewport.uid)) {
+            const { viewportIdsToRender } = this.editData;
+            if (!viewportIdsToRender.includes(viewport.id)) {
                 return;
             }
             const { annotation } = this.editData;

package/dist/esm/tools/segmentation/CircleScissorsTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"CircleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleScissorsTool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CircleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleScissorsTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAG7E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,qCAAqC,MAAM,uDAAuD,CAAA;AACzG,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,YAAY,IAAI,sBAAsB,EACtC,iBAAiB,GAClB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAA;AAQtF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,QAAQ;IAmBtD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,gBAAgB;aAE9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,qBAAgB,GAAG,CAAC,GAA0C,EAAE,EAAE;YAChE,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YACpC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAA;YAEtC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAErB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,kBAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,sBAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,cAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YAEjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,CAAC,cAAc,CAAC,CAAA;YAG3D,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;YAC1C,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAG9C,MAAM,UAAU,GAAG;gBACjB,WAAW,EAAE,IAAI;gBACjB,WAAW,EAAE,IAAI;gBACjB,QAAQ,EAAE;oBACR,eAAe,EAAgB,CAAC,GAAG,eAAe,CAAC;oBACnD,MAAM,EAAgB,CAAC,GAAG,MAAM,CAAC;oBACjC,mBAAmB,EAAE,QAAQ,CAAC,sBAAsB,EAAE;oBACtD,iBAAiB,EAAE,EAAE;oBACrB,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;oBACrC,YAAY;iBACb;gBACD,IAAI,EAAE;oBACJ,OAAO,EAAE;wBACP,MAAM,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC;wBACpE,iBAAiB,EAAE,IAAI;qBACxB;oBACD,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,EAAE;iBAChB;aACF,CAAA;YAED,MAAM,mBAAmB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YAEzC,IAAI,CAAC,QAAQ,GAAG;gBACd,UAAU;gBACV,YAAY;gBACZ,YAAY,EAAE,SAAS;gBACvB,YAAY;gBACZ,cAAc;gBACd,cAAc;gBACd,YAAY;gBACZ,mBAAmB;gBACnB,WAAW,EAAE,CAAC;gBACd,aAAa,EAAE,KAAK;gBACpB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAA;YAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAE3B,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAE1B,GAAG,CAAC,cAAc,EAAE,CAAA;YAEpB,qCAAqC,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;QAC7E,CAAC,CAAA;QAED,uBAAkB,GAAG,CAAC,GAAkC,EAAE,EAAE;YAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YACrB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC/B,MAAM,EAAE,aAAa,EAAE,GAAG,WAAW,CAAA;YACrC,MAAM,mBAAmB,GAAG,aAAa,CAAC,MAAM,CAAA;YAChD,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YACpD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAA;YAGlC,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YACvE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;YAI3B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAE3C,MAAM,YAAY,GAAiB;gBACjC,YAAY,CAAC,CAAC,CAAC;gBACf,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM;aACzB,CAAA;YACD,MAAM,SAAS,GAAiB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;YAC3E,MAAM,UAAU,GAAiB,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5E,MAAM,WAAW,GAAiB;gBAChC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM;gBACxB,YAAY,CAAC,CAAC,CAAC;aAChB,CAAA;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG;gBACpB,aAAa,CAAC,YAAY,CAAC;gBAC3B,aAAa,CAAC,SAAS,CAAC;gBACxB,aAAa,CAAC,UAAU,CAAC;gBACzB,aAAa,CAAC,WAAW,CAAC;aAC3B,CAAA;YAED,UAAU,CAAC,WAAW,GAAG,IAAI,CAAA;YAE7B,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;YAE7B,qCAAqC,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;QAC7E,CAAC,CAAA;QAED,qBAAgB,GAAG,CACjB,GAAiE,EACjE,EAAE;YACF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAE/B,MAAM,EACJ,UAAU,EACV,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,cAAc,GACf,GAAG,IAAI,CAAC,QAAQ,CAAA;YACjB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;YAC3B,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAA;YAEvD,IAAI,aAAa,IAAI,CAAC,QAAQ,EAAE;gBAC9B,OAAM;aACP;YAED,UAAU,CAAC,WAAW,GAAG,KAAK,CAAA;YAC9B,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAA;YAErC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAE7B,kBAAkB,CAAC,OAAO,CAAC,CAAA;YAE3B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YAEnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YACpB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;YAEtB,IAAI,QAAQ,YAAY,aAAa,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;aACvC;YAED,MAAM,aAAa,GAAG;gBACpB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;gBAC3B,MAAM,EAAE,YAAY;gBACpB,YAAY;gBACZ,cAAc;gBACd,eAAe;gBACf,cAAc;gBACd,MAAM;aACP,CAAA;YAED,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QACzD,CAAC,CAAA;QAKD,kBAAa,GAAG,CAAC,OAAO,EAAE,EAAE;YAC1B,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAChE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;YACpE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAIrE,CAAC,CAAA;QAKD,oBAAe,GAAG,CAAC,OAAO,EAAE,EAAE;YAC5B,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnE,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;YACvE,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAIxE,CAAC,CAAA;QAUD,qBAAgB,GAAG,CACjB,cAAqC,EACrC,gBAAqB,EACf,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,OAAM;aACP;YAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YACnC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YAE7C,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;gBAC9C,OAAM;aACP;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YAGpC,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAA;YACxC,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,CAAA;YAE9C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAA;YAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;YAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;YAEtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAEhC,MAAM,MAAM,GAAG;gBACb,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACrC,CAAA;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,OAAO,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAA;YAG7D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE;gBAClC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,MAAM,SAAS,GAAG,GAAG,CAAA;YACrB,aAAa,CACX,gBAAgB,EAChB,kBAAkB,CAAC,QAAQ,EAC3B,aAAa,EACb,SAAS,EACT,MAAsB,EACtB,MAAM,EACN;gBACE,KAAK;aACN,CACF,CAAA;QACH,CAAC,CAAA;IA5RD,CAAC;;AAjCM,2BAAQ,GAAG,eAAe,CAAA"}

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

@@ -12,7 +12,7 @@ export interface RectangleRoiStartEndThresholdAnnotation extends Annotation {
         referencedImageId?: string;
         toolName: string;
         enabledElement: any;
-        volumeUID: string;
+        volumeId: string;
         spacingInNormal: number;
     };
     data: {
@@ -34,7 +34,7 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
     _throttledCalculateCachedStats: any;
     editData: {
         annotation: any;
-        viewportUIDsToRender: string[];
+        viewportIdsToRender: string[];
         handleIndex?: number;
         newAnnotation?: boolean;
         hasMoved?: boolean;
@@ -52,7 +52,7 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
             FrameOfReferenceUID: string;
             referencedImageId: any;
             toolName: string;
-            volumeUID: any;
+            volumeId: any;
             spacingInNormal: number;
         };
         data: {

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

@@ -4,10 +4,10 @@ import { Events } from '../../enums';
 import { addAnnotation, getAnnotations } from '../../stateManagement';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { drawHandles as drawHandlesSvg, drawRect as drawRectSvg, } from '../../drawingSvg';
-import { getViewportUIDsWithToolToRender } from '../../utilities/viewportFilters';
+import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import throttle from '../../utilities/throttle';
 import { hideElementCursor } from '../../cursors/elementCursor';
-import triggerAnnotationRenderForViewportUIDs from '../../utilities/triggerAnnotationRenderForViewportUIDs';
+import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import RectangleRoiTool from '../annotation/RectangleRoiTool';
 export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool {
     constructor(toolProps = {}, defaultToolProps = {
@@ -25,13 +25,13 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
             this.isDrawing = true;
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
-            let referencedImageId, imageVolume, volumeUID;
+            let referencedImageId, imageVolume, volumeId;
             if (viewport instanceof StackViewport) {
                 throw new Error('Stack Viewport Not implemented');
             }
             else {
-                volumeUID = this.getTargetUID(viewport);
-                imageVolume = cache.getVolume(volumeUID);
+                volumeId = this.getTargetId(viewport);
+                imageVolume = cache.getVolume(volumeId);
                 referencedImageId = csUtils.getClosestImageId(imageVolume, worldPos, viewPlaneNormal, viewUp);
             }
             if (referencedImageId) {
@@ -54,7 +54,7 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
                     FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
                     referencedImageId,
                     toolName: RectangleRoiStartEndThresholdTool.toolName,
-                    volumeUID,
+                    volumeId,
                     spacingInNormal,
                 },
                 data: {
@@ -85,10 +85,10 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
             this._computeProjectionPoints(annotation, imageVolume);
             Settings.getObjectSettings(annotation, RectangleRoiStartEndThresholdTool);
             addAnnotation(element, annotation);
-            const viewportUIDsToRender = getViewportUIDsWithToolToRender(element, RectangleRoiStartEndThresholdTool.toolName);
+            const viewportIdsToRender = getViewportIdsWithToolToRender(element, RectangleRoiStartEndThresholdTool.toolName);
             this.editData = {
                 annotation,
-                viewportUIDsToRender,
+                viewportIdsToRender,
                 handleIndex: 3,
                 newAnnotation: true,
                 hasMoved: false,
@@ -96,7 +96,7 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
             this._activateDraw(element);
             hideElementCursor(element);
             evt.preventDefault();
-            triggerAnnotationRenderForViewportUIDs(renderingEngine, viewportUIDsToRender);
+            triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
             return annotation;
         };
         this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
@@ -195,17 +195,17 @@ export default class RectangleRoiStartEndThresholdTool extends RectangleRoiTool
     }
     _calculateCachedStatsTool(annotation, enabledElement) {
         const data = annotation.data;
-        const { viewportUID, renderingEngineUID, viewport } = enabledElement;
+        const { viewportId, renderingEngineId, viewport } = enabledElement;
         const { cachedStats } = data;
-        const volumeUID = this.getTargetUID(viewport);
-        const imageVolume = cache.getVolume(volumeUID);
+        const volumeId = this.getTargetId(viewport);
+        const imageVolume = cache.getVolume(volumeId);
         this._computeProjectionPoints(annotation, imageVolume);
         annotation.invalidated = false;
         const eventType = Events.ANNOTATION_MODIFIED;
         const eventDetail = {
             annotation,
-            viewportUID,
-            renderingEngineUID,
+            viewportId,
+            renderingEngineId,
         };
         triggerEvent(eventTarget, eventType, eventDetail);
         return cachedStats;