@ohif/app 3.12.0-beta.98 → 3.12.0

package/dist/{7412.bundle.aec4834a71fc27c4ce06.js → 7412.bundle.fab1742191b7fe937330.js}

@@ -2486,21 +2486,25 @@ var getViewportIdsWithSegmentation = __webpack_require__(58859);
 
 
 
+const getViewportByViewportId = (viewportId) => {
+    const enabledElement = (0,esm.getEnabledElementByViewportId)(viewportId);
+    return enabledElement?.viewport ?? undefined;
+};
 const onLabelmapSegmentationDataModified = function (evt) {
     const { segmentationId, modifiedSlicesToUse } = evt.detail;
     const { representationData } = (0,getSegmentation/* getSegmentation */.T)(segmentationId);
     const viewportIds = (0,getViewportIdsWithSegmentation/* getViewportIdsWithSegmentation */.P)(segmentationId);
     const hasVolumeViewport = viewportIds.some((viewportId) => {
-        const { viewport } = (0,esm.getEnabledElementByViewportId)(viewportId);
+        const viewport = getViewportByViewportId(viewportId);
         return viewport instanceof esm.VolumeViewport;
     });
     const hasStackViewport = viewportIds.some((viewportId) => {
-        const { viewport } = (0,esm.getEnabledElementByViewportId)(viewportId);
+        const viewport = getViewportByViewportId(viewportId);
         return viewport instanceof esm.StackViewport;
     });
     const hasBothStackAndVolume = hasVolumeViewport && hasStackViewport;
     viewportIds.forEach((viewportId) => {
-        const { viewport } = (0,esm.getEnabledElementByViewportId)(viewportId);
+        const viewport = getViewportByViewportId(viewportId);
         if (viewport instanceof esm.VolumeViewport) {
             performVolumeLabelmapUpdate({
                 modifiedSlicesToUse: hasBothStackAndVolume ? [] : modifiedSlicesToUse,
@@ -3766,7 +3770,8 @@ function addAnnotation(annotation, annotationGroupSelector) {
         annotation.annotationUID = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.uuidv4();
     }
     const manager = getAnnotationManager();
-    if (annotationGroupSelector instanceof HTMLDivElement) {
+    if (annotationGroupSelector instanceof HTMLDivElement &&
+        (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(annotationGroupSelector)) {
         const groupKey = manager.getGroupKey(annotationGroupSelector);
         manager.addAnnotation(annotation, groupKey);
         (0,_helpers_state__WEBPACK_IMPORTED_MODULE_1__.triggerAnnotationAddedForElement)(annotation, annotationGroupSelector);
@@ -5510,6 +5515,9 @@ function getColorLUT(index) {
 
 function getCurrentLabelmapImageIdForViewport(viewportId, segmentationId) {
     const imageIds = getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId);
+    if (!imageIds?.length) {
+        return;
+    }
     return imageIds[0];
 }
 function getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId) {
@@ -5933,6 +5941,7 @@ function setSegmentIndexVisibility(viewportId, specifier, segmentIndex, visibili
         if (!representation.segments || !representation.segments[segmentIndex]) {
             return;
         }
+        representation.visible ||= visibility;
         representation.segments[segmentIndex].visible = visibility;
     });
     (0,SegmentationRenderingEngine/* triggerSegmentationRenderBySegmentationId */.fy)(specifier.segmentationId);
@@ -6020,11 +6029,15 @@ var computeVolumeLabelmapFromStack = __webpack_require__(6994);
 var esm = __webpack_require__(15327);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/getSegmentation.js
 var getSegmentation = __webpack_require__(33283);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/segmentation/createLabelmapMemo.js
+var createLabelmapMemo = __webpack_require__(2397);
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/helpers/clearSegmentValue.js
 
 
 
-function clearSegmentValue(segmentationId, segmentIndex) {
+
+const { DefaultHistoryMemo } = esm.utilities.HistoryMemo;
+function clearSegmentValue(segmentationId, segmentIndex, options) {
     const segmentation = (0,getSegmentation/* getSegmentation */.T)(segmentationId);
     if (segmentation.representationData.Labelmap) {
         const { representationData } = segmentation;
@@ -6038,11 +6051,18 @@ function clearSegmentValue(segmentationId, segmentIndex) {
                     return;
                 }
                 const { voxelManager } = item;
+                const memo = options?.recordHistory
+                    ? (0,createLabelmapMemo.createLabelmapMemo)(segmentationId, voxelManager)
+                    : null;
+                const useVoxelManager = memo?.voxelManager ?? voxelManager;
                 voxelManager.forEach(({ value, index }) => {
                     if (value === segmentIndex) {
-                        voxelManager.setAtIndex(index, 0);
+                        useVoxelManager.setAtIndex(index, 0);
                     }
                 });
+                if (memo?.commitMemo()) {
+                    DefaultHistoryMemo.push(memo);
+                }
             });
         }
         (0,triggerSegmentationEvents.triggerSegmentationDataModified)(segmentationId);
@@ -6060,27 +6080,46 @@ var getActiveSegmentIndex = __webpack_require__(60740);
 var getViewportIdsWithSegmentation = __webpack_require__(58859);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/annotation/annotationState.js
 var annotationState = __webpack_require__(82056);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/AnnotationTool.js
+var AnnotationTool = __webpack_require__(91350);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contourSegmentation/index.js + 1 modules
 var contourSegmentation = __webpack_require__(56534);
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/helpers/removeSegmentAnnotations.js
 
 
 
-function removeContourSegmentAnnotations(segmentationId, segmentIndex) {
+
+function removeContourSegmentAnnotations(segmentationId, segmentIndex, options) {
     const annotationUIDsMap = (0,utilities.getAnnotationsUIDMapFromSegmentation)(segmentationId);
     if (!annotationUIDsMap) {
         return;
     }
-    const annotationUIDs = annotationUIDsMap.get(segmentIndex);
-    if (!annotationUIDs) {
+    const annotationUIDsSet = annotationUIDsMap.get(segmentIndex);
+    if (!annotationUIDsSet) {
         return;
     }
-    annotationUIDs.forEach((annotationUID) => {
+    const annotationUIDs = Array.from(annotationUIDsSet);
+    const annotations = [];
+    for (const annotationUID of annotationUIDs) {
         const annotation = (0,annotationState.getAnnotation)(annotationUID);
         if ((0,contourSegmentation.isContourSegmentationAnnotation)(annotation)) {
-            (0,utilities.removeCompleteContourAnnotation)(annotation);
+            annotations.push(annotation);
         }
-    });
+    }
+    if (annotations.length === 0) {
+        return;
+    }
+    for (const annotation of annotations) {
+        if (annotation.parentAnnotationUID) {
+            continue;
+        }
+        if (options?.recordHistory) {
+            AnnotationTool/* default */.A.createAnnotationMemo(null, annotation, {
+                deleting: true,
+            });
+        }
+        (0,utilities.removeCompleteContourAnnotation)(annotation);
+    }
 }
 
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/removeSegment.js
@@ -6097,10 +6136,14 @@ function removeSegment(segmentationId, segmentIndex, options = {
 }) {
     const segmentation = (0,getSegmentation/* getSegmentation */.T)(segmentationId);
     if (segmentation?.representationData.Contour) {
-        removeContourSegmentAnnotations(segmentationId, segmentIndex);
+        removeContourSegmentAnnotations(segmentationId, segmentIndex, {
+            recordHistory: options.recordHistory,
+        });
     }
     else if (segmentation?.representationData.Labelmap) {
-        clearSegmentValue(segmentationId, segmentIndex);
+        clearSegmentValue(segmentationId, segmentIndex, {
+            recordHistory: options.recordHistory,
+        });
     }
     else {
         throw new Error('Invalid segmentation type');
@@ -6119,7 +6162,7 @@ function removeSegment(segmentationId, segmentIndex, options = {
             },
         },
     ]);
-    if (isThisSegmentActive && options.setNextSegmentAsActive) {
+    if (isThisSegmentActive && options.setNextSegmentAsActive !== false) {
         const segmentIndices = Object.keys(segments)
             .map(Number)
             .sort((a, b) => a - b);
@@ -6491,6 +6534,9 @@ function setActiveSegmentIndex(segmentationId, segmentIndex) {
     });
     viewportIds.forEach((viewportId) => {
         const toolGroup = (0,_store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_0__.getToolGroupForViewport)(viewportId);
+        if (!toolGroup) {
+            return;
+        }
         (0,_utilities_segmentation_invalidateBrushCursor__WEBPACK_IMPORTED_MODULE_1__/* .invalidateBrushCursor */ .E)(toolGroup.id);
     });
 }
@@ -7462,7 +7508,7 @@ class Synchronizer {
         }
         const eventSource = this._eventSource === 'element' ? viewport.element : _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget;
         eventSource.addEventListener(this._eventName, this._onEvent.bind(this));
-        this._auxiliaryEvents.forEach(({ name, source }) => {
+        this._auxiliaryEvents.forEach(({ name, source = 'element' }) => {
             const target = source === 'element' ? viewport.element : _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget;
             target.addEventListener(name, this._onEvent.bind(this));
         });
@@ -8017,9 +8063,11 @@ class ToolGroup {
                 const cursor = cursors.MouseCursor.getDefinedCursor('default');
                 this._setCursorForViewports(cursor);
             }
+            toolInstance.isPrimary = false;
         }
         else {
             this.setViewportsCursorByToolName(toolName);
+            toolInstance.isPrimary = true;
         }
         if (this._hasMousePrimaryButtonBinding(toolBindingsOptions)) {
             if (this.prevActivePrimaryToolName === null) {
@@ -8066,6 +8114,7 @@ class ToolGroup {
         }
         this.toolOptions[toolName] = toolOptions;
         toolInstance.mode = mode;
+        toolInstance.isPrimary = false;
         if (typeof toolInstance.onSetToolPassive === 'function') {
             toolInstance.onSetToolPassive();
         }
@@ -9239,7 +9288,7 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
             const canvasPos = currentPoints.canvas;
             const { magnifyingGlass: config } = this.configuration;
             const { radius, zoomFactor, autoPan } = config;
-            const canvasHandlePoints = this._getCanvasHandlePoints(canvasPos, radius);
+            const worldHandlePoints = this._getWorldHandlePoints(viewport, canvasPos, radius);
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
             const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
@@ -9261,9 +9310,9 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
                     sourceViewportId: viewport.id,
                     magnifyViewportId,
                     zoomFactor,
-                    isCanvasAnnotation: true,
+                    isCanvasAnnotation: false,
                     handles: {
-                        points: canvasHandlePoints,
+                        points: worldHandlePoints,
                         activeHandleIndex: null,
                     },
                 },
@@ -9279,13 +9328,14 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
                     padding: autoPan.padding,
                     callback: (data) => {
                         const annotationPoints = annotation.data.handles.points;
-                        const { canvas: canvasDelta } = data.delta;
+                        const { world: worldDelta } = data.delta;
                         for (let i = 0, len = annotationPoints.length; i < len; i++) {
                             const point = annotationPoints[i];
-                            point[0] += canvasDelta[0];
-                            point[1] += canvasDelta[1];
-                            annotation.invalidated = true;
+                            point[0] += worldDelta[0];
+                            point[1] += worldDelta[1];
+                            point[2] += worldDelta[2];
                         }
+                        annotation.invalidated = true;
                     },
                 },
             });
@@ -9305,17 +9355,9 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
             });
         };
         this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
-            const { data } = annotation;
-            const { points } = data.handles;
-            const canvasCoordinates = points;
-            const canvasTop = canvasCoordinates[0];
-            const canvasBottom = canvasCoordinates[2];
-            const canvasLeft = canvasCoordinates[3];
-            const radius = Math.abs(canvasBottom[1] - canvasTop[1]) * 0.5;
-            const center = [
-                canvasLeft[0] + radius,
-                canvasTop[1] + radius,
-            ];
+            const { viewport } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
+            const { points } = annotation.data.handles;
+            const { radius, center } = this._getCanvasCircleData(viewport, points);
             const radiusPoint = (0,_utilities_math_circle__WEBPACK_IMPORTED_MODULE_12__.getCanvasCircleRadius)([center, canvasCoords]);
             if (Math.abs(radiusPoint - radius) < proximity * 2) {
                 return true;
@@ -9372,14 +9414,14 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
         this._dragDrawCallback = (evt) => {
             this.isDrawing = true;
             const eventDetail = evt.detail;
+            const { element } = eventDetail;
+            const { viewport } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
             const { deltaPoints } = eventDetail;
             const canvasDelta = deltaPoints?.canvas ?? [0, 0, 0];
             const { annotation, viewportIdsToRender } = this.editData;
             const { points } = annotation.data.handles;
-            points.forEach((point) => {
-                point[0] += canvasDelta[0];
-                point[1] += canvasDelta[1];
-            });
+            const worldDelta = this._getWorldDeltaFromCanvasDelta(viewport, points, canvasDelta);
+            this._applyWorldDelta(points, worldDelta);
             annotation.invalidated = true;
             this.editData.hasMoved = true;
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
@@ -9392,12 +9434,10 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
             const { data } = annotation;
             if (handleIndex === undefined) {
                 const { deltaPoints } = eventDetail;
-                const canvasDelta = deltaPoints.canvas;
+                const canvasDelta = deltaPoints.canvas ?? [0, 0, 0];
                 const points = data.handles.points;
-                points.forEach((point) => {
-                    point[0] += canvasDelta[0];
-                    point[1] += canvasDelta[1];
-                });
+                const worldDelta = this._getWorldDeltaFromCanvasDelta((0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element).viewport, points, canvasDelta);
+                this._applyWorldDelta(points, worldDelta);
                 annotation.invalidated = true;
             }
             else {
@@ -9408,18 +9448,12 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
         };
         this._dragHandle = (evt) => {
             const eventDetail = evt.detail;
+            const { element } = eventDetail;
+            const { viewport } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
             const { annotation } = this.editData;
             const { data } = annotation;
             const { points } = data.handles;
-            const canvasCoordinates = points;
-            const canvasTop = canvasCoordinates[0];
-            const canvasBottom = canvasCoordinates[2];
-            const canvasLeft = canvasCoordinates[3];
-            const radius = Math.abs(canvasBottom[1] - canvasTop[1]) * 0.5;
-            const canvasCenter = [
-                canvasLeft[0] + radius,
-                canvasTop[1] + radius,
-            ];
+            const { center: canvasCenter } = this._getCanvasCircleData(viewport, points);
             const { currentPoints } = eventDetail;
             const currentCanvasPoints = currentPoints.canvas;
             const newRadius = (0,_utilities_math_circle__WEBPACK_IMPORTED_MODULE_12__.getCanvasCircleRadius)([
@@ -9427,10 +9461,11 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
                 currentCanvasPoints,
             ]);
             const newCanvasHandlePoints = this._getCanvasHandlePoints(canvasCenter, newRadius);
-            points[0] = newCanvasHandlePoints[0];
-            points[1] = newCanvasHandlePoints[1];
-            points[2] = newCanvasHandlePoints[2];
-            points[3] = newCanvasHandlePoints[3];
+            const newWorldHandlePoints = newCanvasHandlePoints.map((handle) => viewport.canvasToWorld(handle));
+            points[0] = newWorldHandlePoints[0];
+            points[1] = newWorldHandlePoints[1];
+            points[2] = newWorldHandlePoints[2];
+            points[3] = newWorldHandlePoints[3];
         };
         this.cancel = (element) => {
             if (!this.isDrawing) {
@@ -9492,19 +9527,11 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
                 const { annotationUID, data } = annotation;
                 const { magnifyViewportId, zoomFactor, handles } = data;
                 const { points, activeHandleIndex } = handles;
+                const { center, radius, canvasPoints } = this._getCanvasCircleData(viewport, points);
                 styleSpecifier.annotationUID = annotationUID;
                 const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
                 const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
                 const color = this.getStyle('color', styleSpecifier, annotation);
-                const canvasCoordinates = points;
-                const canvasTop = canvasCoordinates[0];
-                const canvasBottom = canvasCoordinates[2];
-                const canvasLeft = canvasCoordinates[3];
-                const radius = Math.abs(canvasBottom[1] - canvasTop[1]) * 0.5;
-                const center = [
-                    canvasLeft[0] + radius,
-                    canvasTop[1] + radius,
-                ];
                 if (!viewport.getRenderingEngine()) {
                     console.warn('Rendering Engine has been destroyed');
                     return renderStatus;
@@ -9516,7 +9543,10 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
                 if (!(0,_stateManagement_annotation_annotationLocking__WEBPACK_IMPORTED_MODULE_3__.isAnnotationLocked)(annotationUID) &&
                     !this.editData &&
                     activeHandleIndex !== null) {
-                    activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
+                    const activeHandle = canvasPoints[activeHandleIndex];
+                    activeHandleCanvasCoords = [
+                        [activeHandle[0], activeHandle[1], 0],
+                    ];
                 }
                 if (activeHandleCanvasCoords) {
                     const handleGroupUID = '0';
@@ -9539,6 +9569,22 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
             }
             return renderStatus;
         };
+        this._getWorldHandlePoints = (viewport, canvasCenterPos, canvasRadius) => {
+            const canvasHandlePoints = this._getCanvasHandlePoints(canvasCenterPos, canvasRadius);
+            return canvasHandlePoints.map((handlePoint) => viewport.canvasToWorld(handlePoint));
+        };
+        this._getCanvasCircleData = (viewport, points) => {
+            const canvasPoints = points.map((point) => viewport.worldToCanvas(point));
+            const canvasTop = canvasPoints[0];
+            const canvasBottom = canvasPoints[2];
+            const canvasLeft = canvasPoints[3];
+            const radius = Math.abs(canvasBottom[1] - canvasTop[1]) * 0.5;
+            const center = [
+                canvasLeft[0] + radius,
+                canvasTop[1] + radius,
+            ];
+            return { canvasPoints, center, radius };
+        };
         this._getCanvasHandlePoints = (canvasCenterPos, canvasRadius) => {
             return [
                 [canvasCenterPos[0], canvasCenterPos[1] - canvasRadius, 0],
@@ -9605,6 +9651,33 @@ class AdvancedMagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotati
         });
         return dropdown;
     }
+    _getWorldDeltaFromCanvasDelta(viewport, points, canvasDelta) {
+        if (!canvasDelta) {
+            return [0, 0, 0];
+        }
+        const referencePoint = points[0];
+        const referenceCanvasPoint = viewport.worldToCanvas(referencePoint);
+        const movedWorldPoint = viewport.canvasToWorld([
+            referenceCanvasPoint[0] + canvasDelta[0],
+            referenceCanvasPoint[1] + canvasDelta[1],
+        ]);
+        return [
+            movedWorldPoint[0] - referencePoint[0],
+            movedWorldPoint[1] - referencePoint[1],
+            movedWorldPoint[2] - referencePoint[2],
+        ];
+    }
+    _applyWorldDelta(points, worldDelta) {
+        if (!worldDelta) {
+            return;
+        }
+        for (let i = 0, len = points.length; i < len; i++) {
+            const point = points[i];
+            point[0] += worldDelta[0];
+            point[1] += worldDelta[1];
+            point[2] += worldDelta[2];
+        }
+    }
 }
 class AdvancedMagnifyViewportManager {
     constructor() {
@@ -12514,6 +12587,9 @@ class PanTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .BaseTool */ .oS {
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
             limitToViewport: false,
+            ignoreX: false,
+            ignoreY: false,
+            ignoreZ: false
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -12588,6 +12664,15 @@ class PanTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .BaseTool */ .oS {
             deltaPointsWorld[2] === 0) {
             return;
         }
+        if (this.configuration.ignoreX) {
+            deltaPointsWorld[0] = 0;
+        }
+        if (this.configuration.ignoreY) {
+            deltaPointsWorld[1] = 0;
+        }
+        if (this.configuration.ignoreZ) {
+            deltaPointsWorld[2] = 0;
+        }
         const viewport = enabledElement.viewport;
         const camera = viewport.getCamera();
         const { focalPoint, position } = camera;
@@ -13334,7 +13419,7 @@ class ScaleOverlayTool extends _base_AnnotationDisplayTool__WEBPACK_IMPORTED_MOD
             let annotation = this.editData?.annotation;
             const annotations = (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_3__.getAnnotations)(this.getToolName(), viewport.element);
             if (annotations.length) {
-                annotation = annotations.filter((thisAnnotation) => thisAnnotation.data.viewportId == viewport.id)[0];
+                annotation = annotations.filter((thisAnnotation) => thisAnnotation.data?.viewportId == viewport.id)[0];
             }
             enabledElements.forEach((element) => {
                 const { viewport } = element;
@@ -13580,10 +13665,10 @@ class ScaleOverlayTool extends _base_AnnotationDisplayTool__WEBPACK_IMPORTED_MOD
         const location = this.configuration.scaleLocation;
         const { viewport } = enabledElement;
         const annotations = (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_3__.getAnnotations)(this.getToolName(), viewport.element);
-        const annotation = annotations.filter((thisAnnotation) => thisAnnotation.data.viewportId == viewport.id)[0];
+        const annotation = annotations.filter((thisAnnotation) => thisAnnotation.data?.viewportId == viewport.id)[0];
         const canvas = enabledElement.viewport.canvas;
         const renderStatus = false;
-        if (!viewport) {
+        if (!viewport || !annotation) {
             return renderStatus;
         }
         const styleSpecifier = {
@@ -13738,6 +13823,7 @@ class SculptorTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .BaseTool */ .oS
             ],
             toolShape: 'circle',
             referencedToolName: 'PlanarFreehandROI',
+            updateCursorSize: 'dynamic',
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -14050,7 +14136,9 @@ class SculptorTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .BaseTool */ .oS
         else {
             const cursorShape = this.registeredShapes.get(this.selectedShape);
             const canvasCoords = eventData.currentPoints.canvas;
-            cursorShape.updateToolSize(canvasCoords, viewport, activeAnnotation);
+            if (this.configuration.updateCursorSize === 'dynamic') {
+                cursorShape.updateToolSize(canvasCoords, viewport, activeAnnotation);
+            }
         }
         (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_6__/* .triggerAnnotationRenderForViewportIds */ .t)(this.commonData.viewportIdsToRender);
     }
@@ -19908,7 +19996,6 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -19920,6 +20007,7 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
                 const { annotationUID, data } = annotation;
                 const { handles } = data;
                 const { points, activeHandleIndex } = handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,
@@ -20069,12 +20157,14 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
                 const targetId = targetIds[i];
                 const image = this.getTargetImageData(targetId);
                 if (!image) {
+                    console.warn('image not found for stats:', targetId);
+                    delete cachedStats[targetId];
                     continue;
                 }
                 const { dimensions, imageData, metadata, voxelManager } = image;
                 const handles = points.map((point) => imageData.worldToIndex(point));
                 const calibrate = (0,_utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_3__/* .getCalibratedLengthUnitsAndScale */ .Op)(image, handles);
-                const radius = CircleROITool.calculateLengthInIndex(calibrate, handles);
+                const radius = CircleROITool.calculateLengthInIndex(calibrate, handles.slice(0, 2));
                 const area = Math.PI * radius * radius;
                 const perimeter = 2 * Math.PI * radius;
                 const isEmptyArea = radius === 0;
@@ -20570,7 +20660,6 @@ class CobbAngleTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationTool
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -20581,6 +20670,7 @@ class CobbAngleTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationTool
                 const annotation = annotations[i];
                 const { annotationUID, data } = annotation;
                 const { points, activeHandleIndex } = data.handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,
@@ -21043,7 +21133,6 @@ class DragProbeTool extends _ProbeTool__WEBPACK_IMPORTED_MODULE_5__/* ["default"
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -21055,6 +21144,7 @@ class DragProbeTool extends _ProbeTool__WEBPACK_IMPORTED_MODULE_5__/* ["default"
             const data = annotation.data;
             const point = data.handles.points[0];
             const canvasCoordinates = viewport.worldToCanvas(point);
+            const targetId = this.getTargetId(viewport, data);
             styleSpecifier.annotationUID = annotationUID;
             const { color } = this.getAnnotationStyle({
                 annotation,
@@ -21897,7 +21987,6 @@ class EllipticalROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotation
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -21909,6 +21998,7 @@ class EllipticalROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotation
                 const { annotationUID, data } = annotation;
                 const { handles } = data;
                 const { points, activeHandleIndex } = handles;
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth, lineDash } = this.getAnnotationStyle({
                     annotation,
@@ -23810,7 +23900,7 @@ class LivewireContourSegmentationTool extends _LivewireContourTool__WEBPACK_IMPO
                 });
             }
             const acceptedPath = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_2__/* .LivewirePath */ .j();
-            for (let i = 0; i < count; i++) {
+            for (let i = 0; i < count - 1; i++) {
                 scissors.startSearch(worldToSlice(points[i]));
                 const path = scissors.findPathToPoint(worldToSlice(points[(i + 1) % count]));
                 acceptedPath.addPoints(path);
@@ -23963,8 +24053,6 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
                 viewportIdsToRender,
                 movingTextBox: false,
             };
-            const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-            const { renderingEngine } = enabledElement;
             this._activateModify(element);
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(viewportIdsToRender);
             evt.preventDefault();
@@ -23991,8 +24079,6 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
                 movingTextBox,
             };
             this._activateModify(element);
-            const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-            const { renderingEngine } = enabledElement;
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(viewportIdsToRender);
             evt.preventDefault();
         };
@@ -24041,7 +24127,7 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
             const { canvas: canvasPos, world: worldPosOriginal } = currentPoints;
             let worldPos = worldPosOriginal;
             const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-            const { viewport, renderingEngine } = enabledElement;
+            const { viewport } = enabledElement;
             const controlPoints = this.editData.currentPath.getControlPoints();
             let closePath = controlPoints.length >= 2 && doubleClick;
             this.doneEditMemo();
@@ -24087,6 +24173,9 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
             annotation.invalidated = true;
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(viewportIdsToRender);
             if (this.editData.closed) {
+                if (closePath) {
+                    annotation.data.isOpenUShapeContour = 'lineSegment';
+                }
                 this.updateAnnotation(this.editData.confirmedPath);
                 this._endCallback(evt);
             }
@@ -24095,7 +24184,6 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
         this._mouseMoveCallback = (evt) => {
             const { element, currentPoints } = evt.detail;
             const { world: worldPos, canvas: canvasPos } = currentPoints;
-            const { renderingEngine } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
             const viewportIdsToRender = (0,_utilities_viewportFilters__WEBPACK_IMPORTED_MODULE_14__.getViewportIdsWithToolToRender)(element, this.getToolName());
             this.editData.lastCanvasPoint = canvasPos;
             const { width: imgWidth, height: imgHeight } = this.scissors;
@@ -24141,8 +24229,6 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
                 this.editHandle(worldPos, element, annotation, handleIndex);
             }
             this.editData.hasMoved = true;
-            const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-            const { renderingEngine } = enabledElement;
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(viewportIdsToRender);
         };
         this.cancel = (element) => {
@@ -24202,7 +24288,7 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
                 return;
             }
             const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-            const { viewport, renderingEngine } = enabledElement;
+            const { viewport } = enabledElement;
             const { cachedStats } = data;
             const { polyline: points } = data.contour;
             const targetIds = Object.keys(cachedStats);
@@ -24712,7 +24798,6 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             if (!annotations?.length) {
                 return renderStatus;
             }
-            const targetId = this.getTargetId(viewport);
             const renderingEngine = viewport.getRenderingEngine();
             const styleSpecifier = {
                 toolGroupId: this.toolGroupId,
@@ -24725,6 +24810,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 const data = annotation.data;
                 const point = data.handles.points[0];
                 const canvasCoordinates = viewport.worldToCanvas(point);
+                const targetId = this.getTargetId(viewport, data);
                 styleSpecifier.annotationUID = annotationUID;
                 const { color, lineWidth } = this.getAnnotationStyle({
                     annotation,
@@ -25167,6 +25253,17 @@ class RegionSegmentTool extends _base_GrowCutBaseTool__WEBPACK_IMPORTED_MODULE_7
     }
     async getGrowCutLabelmap(growCutData) {
         const { segmentation: { referencedVolumeId }, renderingEngineId, viewportId, circleCenterPoint, circleBorderPoint, options, } = growCutData;
+        const { positiveSeedVariance, negativeSeedVariance, positiveStdDevMultiplier, } = this.configuration;
+        const baseStdDevMultiplier = positiveStdDevMultiplier ?? 1;
+        const currentStdDevMultiplier = options?.positiveStdDevMultiplier
+            ? Math.max(options.positiveStdDevMultiplier, 0.01)
+            : baseStdDevMultiplier;
+        const varianceScale = currentStdDevMultiplier / baseStdDevMultiplier;
+        const growCutOptions = {
+            ...options,
+            positiveSeedVariance: Math.max(0.01, (positiveSeedVariance ?? 1) * varianceScale),
+            negativeSeedVariance: Math.max(0.01, (negativeSeedVariance ?? 1) * varianceScale),
+        };
         const renderingEngine = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getRenderingEngine)(renderingEngineId);
         const viewport = renderingEngine.getViewport(viewportId);
         const worldCircleRadius = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.len */ .eR.len(gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.create */ .eR.create(), circleCenterPoint, circleBorderPoint));
@@ -25174,7 +25271,7 @@ class RegionSegmentTool extends _base_GrowCutBaseTool__WEBPACK_IMPORTED_MODULE_7
             center: circleCenterPoint,
             radius: worldCircleRadius,
         };
-        return _utilities_segmentation__WEBPACK_IMPORTED_MODULE_6__.growCut.runGrowCutForSphere(referencedVolumeId, sphereInfo, viewport, options);
+        return _utilities_segmentation__WEBPACK_IMPORTED_MODULE_6__.growCut.runGrowCutForSphere(referencedVolumeId, sphereInfo, viewport, growCutOptions);
     }
     _activateDraw(element) {
         element.addEventListener(_enums__WEBPACK_IMPORTED_MODULE_4__.Events.MOUSE_UP, this._endCallback);
@@ -29587,6 +29684,9 @@ AnnotationDisplayTool.toolName = 'AnnotationDisplayTool';
 
 const { DefaultHistoryMemo } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.HistoryMemo;
 class BaseTool {
+    get configurationTyped() {
+        return this.configuration;
+    }
     static { this.defaults = {
         configuration: {
             strategies: {},
@@ -29596,6 +29696,7 @@ class BaseTool {
         },
     }; }
     constructor(toolProps, defaultToolProps) {
+        this.isPrimary = false;
         const mergedDefaults = BaseTool.mergeDefaultProps(BaseTool.defaults, defaultToolProps);
         const initialProps = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.deepMerge(mergedDefaults, toolProps);
         const { configuration = {}, supportedInteractionTypes, toolGroupId, } = initialProps;
@@ -29610,6 +29711,11 @@ class BaseTool {
         }
         return _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.deepMerge(defaultProps, additionalProps);
     }
+    static isSpecifiedTargetId(desiredVolumeId) {
+        return (_viewport, { targetId }) => {
+            return targetId.includes(desiredVolumeId);
+        };
+    }
     get toolName() {
         return this.getToolName();
     }
@@ -29669,10 +29775,18 @@ class BaseTool {
             throw new Error('getTargetIdImage: targetId must start with "imageId:" or "volumeId:"');
         }
     }
-    getTargetId(viewport) {
-        const targetId = viewport.getViewReferenceId?.();
-        if (targetId) {
-            return targetId;
+    getTargetId(viewport, data) {
+        const { isPreferredTargetId } = this.configurationTyped;
+        if (isPreferredTargetId && data?.cachedStats) {
+            for (const [targetId, cachedStat] of Object.entries(data.cachedStats)) {
+                if (isPreferredTargetId(viewport, { targetId, cachedStat })) {
+                    return targetId;
+                }
+            }
+        }
+        const defaultTargetId = viewport.getViewReferenceId?.();
+        if (defaultTargetId) {
+            return defaultTargetId;
         }
         throw new Error('getTargetId: viewport must have a getViewReferenceId method');
     }
@@ -29820,7 +29934,12 @@ async function render(viewport, contourRepresentation) {
         (0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()?.canComputeRequestedRepresentation(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour) &&
         !polySegConversionInProgressForViewportId.get(viewport.id)) {
         polySegConversionInProgressForViewportId.set(viewport.id, true);
-        contourData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_6__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour, () => polySeg.computeContourData(segmentationId, { viewport }));
+        try {
+            contourData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_6__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour, () => polySeg.computeContourData(segmentationId, { viewport }));
+        }
+        catch (error) {
+            console.warn('Unable to compute contour data for segmentationId', segmentationId, error);
+        }
         polySegConversionInProgressForViewportId.set(viewport.id, false);
     }
     else if (!contourData && !(0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()) {
@@ -30563,12 +30682,10 @@ function getUpdateFunction(viewport) {
 /* harmony import */ var _strategies_eraseSphere__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1989);
 /* harmony import */ var _strategies_fillCircle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(56789);
 /* harmony import */ var _strategies_eraseCircle__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(33852);
-/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(74347);
-/* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(7001);
-/* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(58640);
-/* harmony import */ var _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(23631);
-/* harmony import */ var _strategies_utils_getStrategyData__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(40905);
-
+/* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(7001);
+/* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(58640);
+/* harmony import */ var _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(23631);
+/* harmony import */ var _strategies_utils_getStrategyData__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(40905);
 
 
 
@@ -30580,7 +30697,7 @@ function getUpdateFunction(viewport) {
 
 
 
-class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .A {
+class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
@@ -30667,7 +30784,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             const { viewport } = enabledElement;
             this._editData = this.createEditData(element);
             this._activateDraw(element);
-            (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_8__.hideElementCursor)(element);
+            (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_7__.hideElementCursor)(element);
             evt.preventDefault();
             this._previewData.isDrag = false;
             this._previewData.timerStart = Date.now();
@@ -30681,7 +30798,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
                 world: gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.clone */ .eR.clone(worldPoint),
             };
             const hoverData = this._hoverData || this.createHoverData(element);
-            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(hoverData.viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(hoverData.viewportIdsToRender);
             const operationData = this.getOperationData(element);
             if (!operationData) {
                 return false;
@@ -30690,6 +30807,9 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             return true;
         };
         this.mouseMoveCallback = (evt) => {
+            if (!this.isPrimary) {
+                return;
+            }
             if (this.mode === _enums__WEBPACK_IMPORTED_MODULE_2__.ToolModes.Active) {
                 this.updateCursor(evt);
                 if (!this.configuration.preview.enabled) {
@@ -30738,7 +30858,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             }
             const { viewport } = enabledElement;
             const activeStrategy = this.configuration.activeStrategy;
-            const strategyData = (0,_strategies_utils_getStrategyData__WEBPACK_IMPORTED_MODULE_11__/* .getStrategyData */ .S)({
+            const strategyData = (0,_strategies_utils_getStrategyData__WEBPACK_IMPORTED_MODULE_10__/* .getStrategyData */ .S)({
                 operationData,
                 viewport,
                 strategy: activeStrategy,
@@ -30760,7 +30880,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             const { viewport } = enabledElement;
             this.updateCursor(evt);
             const { viewportIdsToRender } = this._hoverData;
-            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(viewportIdsToRender);
             const delta = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec2.distance */ .Zc.distance(currentPoints.canvas, this._previewData.startPoint);
             const { dragTimeMs, dragMoveDistance } = this.configuration.preview;
             if (!this._previewData.isDrag &&
@@ -30822,7 +30942,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             }
             this.doneEditMemo();
             this._deactivateDraw(element);
-            (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_8__.resetElementCursor)(element);
+            (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_7__.resetElementCursor)(element);
             this.updateCursor(evt);
             this._editData = null;
             this._lastDragInfo = null;
@@ -30856,55 +30976,12 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
         if (!this._hoverData) {
             return;
         }
-        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(this._hoverData.viewportIdsToRender);
+        BrushTool.activeCursorTool = this;
+        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(this._hoverData.viewportIdsToRender);
     }
     _calculateCursor(element, centerCanvas) {
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
-        const { viewport } = enabledElement;
-        const { canvasToWorld } = viewport;
-        const camera = viewport.getCamera();
-        const { brushSize } = this.configuration;
-        const viewUp = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.fromValues */ .eR.fromValues(camera.viewUp[0], camera.viewUp[1], camera.viewUp[2]);
-        const viewPlaneNormal = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.fromValues */ .eR.fromValues(camera.viewPlaneNormal[0], camera.viewPlaneNormal[1], camera.viewPlaneNormal[2]);
-        const viewRight = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
-        gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.cross */ .eR.cross(viewRight, viewUp, viewPlaneNormal);
-        const centerCursorInWorld = canvasToWorld([
-            centerCanvas[0],
-            centerCanvas[1],
-        ]);
-        const bottomCursorInWorld = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
-        const topCursorInWorld = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
-        const leftCursorInWorld = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
-        const rightCursorInWorld = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
-        for (let i = 0; i <= 2; i++) {
-            bottomCursorInWorld[i] = centerCursorInWorld[i] - viewUp[i] * brushSize;
-            topCursorInWorld[i] = centerCursorInWorld[i] + viewUp[i] * brushSize;
-            leftCursorInWorld[i] = centerCursorInWorld[i] - viewRight[i] * brushSize;
-            rightCursorInWorld[i] = centerCursorInWorld[i] + viewRight[i] * brushSize;
-        }
-        if (!this._hoverData) {
-            return;
-        }
-        const { brushCursor } = this._hoverData;
-        const { data } = brushCursor;
-        if (data.handles === undefined) {
-            data.handles = {};
-        }
-        data.handles.points = [
-            bottomCursorInWorld,
-            topCursorInWorld,
-            leftCursorInWorld,
-            rightCursorInWorld,
-        ];
-        const activeStrategy = this.configuration.activeStrategy;
-        const strategy = this.configuration.strategies[activeStrategy];
-        if (typeof strategy?.computeInnerCircleRadius === 'function') {
-            strategy.computeInnerCircleRadius({
-                configuration: this.configuration,
-                viewport,
-            });
-        }
-        data.invalidated = false;
+        this.applyActiveStrategyCallback(enabledElement, this.getOperationData(element), _enums__WEBPACK_IMPORTED_MODULE_2__.StrategyCallbacks.CalculateCursorGeometry);
     }
     getStatistics(element, segmentIndices) {
         if (!element) {
@@ -30952,7 +31029,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
         this._hoverData.brushCursor.metadata.segmentColor = segmentColor;
     }
     renderAnnotation(enabledElement, svgDrawingHelper) {
-        if (!this._hoverData) {
+        if (!this._hoverData || BrushTool.activeCursorTool !== this) {
             return;
         }
         const { viewport } = enabledElement;
@@ -30966,40 +31043,7 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
             const { element } = viewport;
             this._calculateCursor(element, centerCanvas);
         }
-        const toolMetadata = brushCursor.metadata;
-        if (!toolMetadata) {
-            return;
-        }
-        const annotationUID = toolMetadata.brushCursorUID;
-        const data = brushCursor.data;
-        const { points } = data.handles;
-        const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
-        const bottom = canvasCoordinates[0];
-        const top = canvasCoordinates[1];
-        const center = [
-            Math.floor((bottom[0] + top[0]) / 2),
-            Math.floor((bottom[1] + top[1]) / 2),
-        ];
-        const radius = Math.abs(bottom[1] - Math.floor((bottom[1] + top[1]) / 2));
-        const color = `rgb(${toolMetadata.segmentColor?.slice(0, 3) || [0, 0, 0]})`;
-        if (!viewport.getRenderingEngine()) {
-            console.warn('Rendering Engine has been destroyed');
-            return;
-        }
-        const circleUID = '0';
-        (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_7__.drawCircle)(svgDrawingHelper, annotationUID, circleUID, center, radius, {
-            color,
-            lineDash: this.centerSegmentIndexInfo.segmentIndex === 0 ? [1, 2] : null,
-        });
-        const { dynamicRadiusInCanvas } = this.configuration?.threshold || {
-            dynamicRadiusInCanvas: 0,
-        };
-        if (dynamicRadiusInCanvas) {
-            const circleUID1 = '1';
-            (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_7__.drawCircle)(svgDrawingHelper, annotationUID, circleUID1, center, dynamicRadiusInCanvas, {
-                color,
-            });
-        }
+        this.applyActiveStrategyCallback(enabledElement, this.getOperationData(viewport.element), _enums__WEBPACK_IMPORTED_MODULE_2__.StrategyCallbacks.RenderCursor, svgDrawingHelper);
     }
 }
 BrushTool.toolName = 'Brush';
@@ -34022,7 +34066,7 @@ SphereScissorsTool.toolName = 'SphereScissor';
 /* harmony import */ var _utilities_boundingBox__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(72282);
 /* harmony import */ var _BrushStrategy__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(55887);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29857);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(64664);
 /* harmony import */ var _utilities_math_sphere__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(62783);
 
 
@@ -34250,7 +34294,7 @@ function fillOutsideCircle() {
 /* harmony import */ var _utilities_boundingBox__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(72282);
 /* harmony import */ var _BrushStrategy__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(55887);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29857);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(64664);
 
 
 
@@ -38140,7 +38184,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCalibratedLengthUnitsAndScale: () => (/* reexport safe */ _getCalibratedUnits__WEBPACK_IMPORTED_MODULE_6__.Op),
 /* harmony export */   getCalibratedProbeUnitsAndValue: () => (/* reexport safe */ _getCalibratedUnits__WEBPACK_IMPORTED_MODULE_6__.Xw),
 /* harmony export */   getClosestImageIdForStackViewport: () => (/* reexport safe */ _annotationHydration__WEBPACK_IMPORTED_MODULE_14__.x),
-/* harmony export */   getOrCreateImageVolume: () => (/* reexport safe */ _segmentation_getOrCreateImageVolume__WEBPACK_IMPORTED_MODULE_40__.A),
+/* harmony export */   getOrCreateImageVolume: () => (/* reexport safe */ _segmentation_getOrCreateImageVolume__WEBPACK_IMPORTED_MODULE_41__.A),
 /* harmony export */   getPixelValueUnits: () => (/* reexport safe */ _getPixelValueUnits__WEBPACK_IMPORTED_MODULE_36__.j),
 /* harmony export */   getPixelValueUnitsImageId: () => (/* reexport safe */ _getPixelValueUnits__WEBPACK_IMPORTED_MODULE_36__.N),
 /* harmony export */   getSphereBoundsInfo: () => (/* reexport safe */ _getSphereBoundsInfo__WEBPACK_IMPORTED_MODULE_10__.R),
@@ -38157,6 +38201,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   polyDataUtils: () => (/* reexport module object */ _polyData_utils__WEBPACK_IMPORTED_MODULE_30__),
 /* harmony export */   rectangleROITool: () => (/* reexport module object */ _rectangleROITool__WEBPACK_IMPORTED_MODULE_25__),
 /* harmony export */   roundNumber: () => (/* binding */ roundNumber),
+/* harmony export */   safeStructuredClone: () => (/* reexport safe */ _safeStructuredClone__WEBPACK_IMPORTED_MODULE_40__.W),
 /* harmony export */   segmentation: () => (/* reexport module object */ _segmentation__WEBPACK_IMPORTED_MODULE_16__),
 /* harmony export */   setAnnotationLabel: () => (/* reexport safe */ _setAnnotationLabel__WEBPACK_IMPORTED_MODULE_38__.A),
 /* harmony export */   stackContextPrefetch: () => (/* reexport safe */ _stackPrefetch__WEBPACK_IMPORTED_MODULE_26__.N),
@@ -38167,7 +38212,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   triggerAnnotationRenderForToolGroupIds: () => (/* reexport safe */ _triggerAnnotationRenderForToolGroupIds__WEBPACK_IMPORTED_MODULE_8__.A),
 /* harmony export */   triggerAnnotationRenderForViewportIds: () => (/* reexport safe */ _triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_7__.A),
 /* harmony export */   triggerEvent: () => (/* reexport safe */ _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.triggerEvent),
-/* harmony export */   usFanExtraction: () => (/* reexport module object */ _tools_annotation_UltrasoundPleuraBLineTool_utils_fanExtraction__WEBPACK_IMPORTED_MODULE_41__),
+/* harmony export */   usFanExtraction: () => (/* reexport module object */ _tools_annotation_UltrasoundPleuraBLineTool_utils_fanExtraction__WEBPACK_IMPORTED_MODULE_42__),
 /* harmony export */   viewport: () => (/* reexport module object */ _viewport__WEBPACK_IMPORTED_MODULE_27__),
 /* harmony export */   viewportFilters: () => (/* reexport module object */ _viewportFilters__WEBPACK_IMPORTED_MODULE_20__),
 /* harmony export */   voi: () => (/* reexport module object */ _voi__WEBPACK_IMPORTED_MODULE_31__)
@@ -38212,8 +38257,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _geometricSurfaceUtils__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(5565);
 /* harmony import */ var _setAnnotationLabel__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(1355);
 /* harmony import */ var _moveAnnotationToViewPlane__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(79646);
-/* harmony import */ var _segmentation_getOrCreateImageVolume__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(83075);
-/* harmony import */ var _tools_annotation_UltrasoundPleuraBLineTool_utils_fanExtraction__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(58180);
+/* harmony import */ var _safeStructuredClone__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(33459);
+/* harmony import */ var _segmentation_getOrCreateImageVolume__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(83075);
+/* harmony import */ var _tools_annotation_UltrasoundPleuraBLineTool_utils_fanExtraction__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(58180);
 
 
 
@@ -38260,6 +38306,7 @@ const roundNumber = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.r
 
 
 
+
 /***/ }),
 
 /***/ 95527:
@@ -39929,8 +39976,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 /* harmony import */ var _stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(49906);
-/* harmony import */ var _enums_Events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94021);
-
 
 
 const { VoxelManager, RLEVoxelMap } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities;
@@ -40390,7 +40435,7 @@ function getHoveredContourSegmentationAnnotation(segmentationId) {
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 
 function getOrCreateImageVolume(referencedImageIds) {
-    if (!referencedImageIds || referencedImageIds.length <= 1) {
+    if (!referencedImageIds?.length) {
         return;
     }
     const isValidVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isValidVolume(referencedImageIds);
@@ -40423,6 +40468,9 @@ function getOrCreateImageVolume(referencedImageIds) {
 
 function getOrCreateSegmentationVolume(segmentationId) {
     const { representationData } = (0,_stateManagement_segmentation_getSegmentation__WEBPACK_IMPORTED_MODULE_1__/* .getSegmentation */ .T)(segmentationId);
+    if (!representationData.Labelmap) {
+        return;
+    }
     let { volumeId } = representationData.Labelmap;
     let segVolume;
     if (volumeId) {
@@ -40433,7 +40481,7 @@ function getOrCreateSegmentationVolume(segmentationId) {
     }
     const { imageIds: labelmapImageIds } = representationData.Labelmap;
     volumeId = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.generateVolumeId(labelmapImageIds);
-    if (!labelmapImageIds || labelmapImageIds.length === 1) {
+    if (!labelmapImageIds || labelmapImageIds.length === 0) {
         return;
     }
     const isValidVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isValidVolume(labelmapImageIds);
@@ -40471,7 +40519,10 @@ function getReferenceVolumeForSegmentationVolume(segmentationVolumeId) {
         const imageIds = segmentationVolume.imageIds;
         const image = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getImage(imageIds[0]);
         const referencedImageId = image.referencedImageId;
-        const volumeInfo = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolumeContainingImageId(referencedImageId);
+        let volumeInfo = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolumeContainingImageId(referencedImageId);
+        if (!volumeInfo?.volume) {
+            volumeInfo = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolumeContainingImageId(image.imageId);
+        }
         imageVolume = volumeInfo?.volume;
     }
     return imageVolume;
@@ -40783,6 +40834,9 @@ async function getStatistics({ segmentationId, segmentIndices, mode = 'collectiv
 }
 async function calculateVolumeStatistics({ operationData, indices, unit, mode, }) {
     const strategyData = (0,_utilsForWorker__WEBPACK_IMPORTED_MODULE_1__/* .prepareVolumeStrategyDataForWorker */ .o9)(operationData);
+    if (!strategyData) {
+        return;
+    }
     const { segmentationVoxelManager, imageVoxelManager, segmentationImageData, imageData, } = strategyData;
     if (!segmentationVoxelManager || !segmentationImageData) {
         return;
@@ -44653,7 +44707,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   r: () => (/* binding */ version)
 /* harmony export */ });
-const version = '4.12.6';
+const version = '4.15.29';
 
 
 /***/ }),