@ohif/app 3.10.1 → 3.10.2

package/dist/{6029.bundle.43e04238ac01880fa66c.js → 6029.bundle.a4206e2a2e75c7b1ad7b.js}

@@ -652,6 +652,10 @@ function calculateSUVScalingFactors(instances) {
 /* harmony export */   zj: () => (/* binding */ getConfig)
 /* harmony export */ });
 /* unused harmony export getAddOns */
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
+/* harmony import */ var _enums_Events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94021);
+
+
 let config = {};
 function getConfig() {
     return config;
@@ -4618,6 +4622,7 @@ class ToolStyle {
             textBoxLinkLineDash: '2,3',
             textBoxShadow: true,
             markerSize: '10',
+            angleArcLineDash: '',
         };
         this._initializeConfig(defaultConfig);
     }
@@ -5247,7 +5252,7 @@ const segmentationRenderingEngine = new SegmentationRenderingEngine();
 /* unused harmony export default */
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99737);
-/* harmony import */ var _kitware_vtk_js_Rendering_Core_ColorTransferFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33739);
+/* harmony import */ var _kitware_vtk_js_Rendering_Core_ColorTransferFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(642);
 /* harmony import */ var _kitware_vtk_js_Common_DataModel_PiecewiseFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(99341);
 /* harmony import */ var _triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(49906);
 /* harmony import */ var _SegmentationStyle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(92686);
@@ -5969,13 +5974,16 @@ function normalizeSegments(segmentsConfig, type, data) {
     const normalizedSegments = {};
     if (segmentsConfig) {
         Object.entries(segmentsConfig).forEach(([segmentIndex, segment]) => {
-            normalizedSegments[segmentIndex] = {
+            const { label, locked, cachedStats, active, ...rest } = segment;
+            const normalizedSegment = {
                 segmentIndex: Number(segmentIndex),
-                label: segment.label ?? `Segment ${segmentIndex}`,
-                locked: segment.locked ?? false,
-                cachedStats: segment.cachedStats ?? {},
-                active: segment.active ?? false,
+                label: label ?? `Segment ${segmentIndex}`,
+                locked: locked ?? false,
+                cachedStats: cachedStats ?? {},
+                active: active ?? false,
+                ...rest,
             };
+            normalizedSegments[segmentIndex] = normalizedSegment;
         });
     }
     else if (type === enums.SegmentationRepresentations.Surface) {
@@ -14764,6 +14772,8 @@ WindowLevelTool.toolName = 'WindowLevel';
 /* harmony import */ var _kitware_vtk_js_Common_Core_Math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84607);
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15327);
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(85817);
+/* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(99737);
+
 
 
 
@@ -14880,6 +14890,9 @@ class ZoomTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .BaseTool */ .oS {
         }
         this.mouseDragCallback = this._dragCallback.bind(this);
     }
+    mouseWheelCallback(evt) {
+        this._zoom(evt);
+    }
     _pinchCallback(evt) {
         const pointsList = evt.detail
             .currentPointsList;
@@ -14919,6 +14932,36 @@ class ZoomTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .BaseTool */ .oS {
         }
         viewport.render();
     }
+    _zoom(evt) {
+        const { element, points } = evt.detail;
+        const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.getEnabledElement)(element);
+        const { viewport } = enabledElement;
+        const camera = viewport.getCamera();
+        const wheelData = evt.detail.wheel;
+        const direction = wheelData.direction;
+        const eventDetails = {
+            detail: {
+                element,
+                eventName: _enums__WEBPACK_IMPORTED_MODULE_4__.Events.MOUSE_WHEEL,
+                renderingEngineId: enabledElement.renderingEngineId,
+                viewportId: viewport.id,
+                camera: {},
+                deltaPoints: {
+                    page: points.page,
+                    client: points.client,
+                    world: points.world,
+                    canvas: [0, -direction * 5],
+                },
+                startPoints: points,
+                lastPoints: points,
+                currentPoints: points,
+            },
+        };
+        if (viewport.type === _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.Enums.ViewportType.STACK) {
+            this.preMouseDownCallback(eventDetails);
+        }
+        this._dragCallback(eventDetails);
+    }
     _panCallback(evt) {
         const { element, deltaPoints } = evt.detail;
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.getEnabledElement)(element);
@@ -14991,6 +15034,8 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
             shadow: true,
+            showAngleArc: false,
+            arcOffset: 5,
             preventHandleOutsideImage: false,
             getTextLines: defaultGetTextLines,
         },
@@ -15139,6 +15184,7 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__.removeAnnotation)(annotation.annotationUID);
             }
             (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+            this.doneEditMemo();
             if (newAnnotation) {
                 (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_12__.triggerAnnotationCompleted)(annotation);
             }
@@ -15149,8 +15195,9 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             this.isDrawing = true;
             const eventDetail = evt.detail;
             const { element } = eventDetail;
-            const { annotation, viewportIdsToRender, handleIndex, movingTextBox } = this.editData;
+            const { annotation, viewportIdsToRender, handleIndex, movingTextBox, newAnnotation, } = this.editData;
             const { data } = annotation;
+            this.createMemo(element, annotation, { newAnnotation });
             if (movingTextBox) {
                 const { deltaPoints } = eventDetail;
                 const worldPosDelta = deltaPoints.world;
@@ -15267,7 +15314,7 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 const { annotationUID, data } = annotation;
                 const { points, activeHandleIndex } = data.handles;
                 styleSpecifier.annotationUID = annotationUID;
-                const { color, lineWidth, lineDash } = this.getAnnotationStyle({
+                const { color, lineWidth, lineDash, angleArcLineDash } = this.getAnnotationStyle({
                     annotation,
                     styleSpecifier,
                 });
@@ -15319,6 +15366,36 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                     width: lineWidth,
                     lineDash,
                 });
+                if (this.configuration.showAngleArc) {
+                    const center = canvasCoordinates[1];
+                    const offset = this.configuration.arcOffset;
+                    const radius = Math.min(_utilities_math_line__WEBPACK_IMPORTED_MODULE_6__.distanceToPoint([center[0], center[1]], [canvasCoordinates[0][0], canvasCoordinates[0][1]], [canvasCoordinates[2][0], canvasCoordinates[2][1]]), _utilities_math_line__WEBPACK_IMPORTED_MODULE_6__.distanceToPoint([center[0], center[1]], [canvasCoordinates[2][0], canvasCoordinates[2][1]], [canvasCoordinates[0][0], canvasCoordinates[0][1]])) / offset;
+                    const anglePoints = [];
+                    let startAngle = Math.atan2(canvasCoordinates[0][1] - center[1], canvasCoordinates[0][0] - center[0]);
+                    let endAngle = Math.atan2(canvasCoordinates[2][1] - center[1], canvasCoordinates[2][0] - center[0]);
+                    if (endAngle < startAngle) {
+                        endAngle += 2 * Math.PI;
+                    }
+                    const angleDifference = endAngle - startAngle;
+                    if (angleDifference > Math.PI) {
+                        const temp = startAngle;
+                        startAngle = endAngle;
+                        endAngle = temp + 2 * Math.PI;
+                    }
+                    const segments = 32;
+                    for (let i = 0; i <= segments; i++) {
+                        const angle = startAngle + (i / segments) * (endAngle - startAngle);
+                        anglePoints.push([
+                            center[0] + radius * Math.cos(angle),
+                            center[1] + radius * Math.sin(angle),
+                        ]);
+                    }
+                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_8__.drawPath)(svgDrawingHelper, annotationUID, '3', anglePoints, {
+                        color: color,
+                        width: lineWidth,
+                        lineDash: angleArcLineDash,
+                    });
+                }
                 if (!data.cachedStats[targetId]?.angle) {
                     continue;
                 }
@@ -15363,6 +15440,7 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, instance, viewport, } = this.hydrateBase(AngleTool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -15380,7 +15458,7 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__.addAnnotation)(annotation, viewport.element);
@@ -15880,6 +15958,7 @@ class ArrowAnnotateTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .Annotation
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, instance, viewport, } = this.hydrateBase(ArrowAnnotateTool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -15898,7 +15977,7 @@ class ArrowAnnotateTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .Annotation
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_3__.addAnnotation)(annotation, viewport.element);
@@ -16702,6 +16781,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .Annotation
         const [major0, major1] = majorAxis;
         const [minor0, minor1] = minorAxis;
         const points = [major0, major1, minor0, minor1];
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -16731,7 +16811,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .Annotation
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_5__.addAnnotation)(annotation, viewport.element);
@@ -17374,6 +17454,7 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, instance, viewport, } = this.hydrateBase(CircleROITool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -17404,7 +17485,7 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__.addAnnotation)(annotation, viewport.element);
@@ -19380,6 +19461,7 @@ class EllipticalROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotation
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, instance, viewport, } = this.hydrateBase(EllipticalROITool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -19400,7 +19482,7 @@ class EllipticalROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotation
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__.addAnnotation)(annotation, viewport.element);
@@ -20954,6 +21036,7 @@ class LengthTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationTool */
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, instance, viewport, } = this.hydrateBase(LengthTool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -20971,7 +21054,7 @@ class LengthTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationTool */
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_5__.addAnnotation)(annotation, viewport.element);
@@ -21879,9 +21962,11 @@ function defaultGetTextLines(data, targetId) {
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(99737);
 /* harmony import */ var _utilities_viewportFilters__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(60810);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(7001);
-/* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(58640);
-/* harmony import */ var _utilities_getPixelValueUnits__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(40634);
-/* harmony import */ var _utilities_viewport_isViewportPreScaled__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(18990);
+/* harmony import */ var _stateManagement_annotation_annotationVisibility__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(29601);
+/* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(58640);
+/* harmony import */ var _utilities_getPixelValueUnits__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(40634);
+/* harmony import */ var _utilities_viewport_isViewportPreScaled__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(18990);
+
 
 
 
@@ -21906,6 +21991,10 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             preventHandleOutsideImage: false,
             getTextLines: defaultGetTextLines,
             handleRadius: '6',
+            textCanvasOffset: {
+                x: 6,
+                y: -6,
+            },
         },
     }; }
     constructor(toolProps = {}, defaultToolProps) {
@@ -21932,7 +22021,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             this._activateModify(element);
             (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_10__.hideElementCursor)(element);
             evt.preventDefault();
-            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)(viewportIdsToRender);
             return annotation;
         };
         this._endCallback = (evt) => {
@@ -21956,7 +22045,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 this.configuration.preventHandleOutsideImage) {
                 (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_3__.removeAnnotation)(annotation.annotationUID);
             }
-            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)(viewportIdsToRender);
             if (newAnnotation) {
                 (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_4__.triggerAnnotationCompleted)(annotation);
             }
@@ -21971,7 +22060,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             this.createMemo(element, annotation, { newAnnotation });
             data.handles.points[0] = [...worldPos];
             annotation.invalidated = true;
-            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)(viewportIdsToRender);
         };
         this.cancel = (element) => {
             if (this.isDrawing) {
@@ -21982,7 +22071,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 const { data } = annotation;
                 annotation.highlighted = false;
                 data.handles.activeHandleIndex = null;
-                (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+                (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)(viewportIdsToRender);
                 if (newAnnotation) {
                     (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_4__.triggerAnnotationCompleted)(annotation);
                 }
@@ -22074,6 +22163,9 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                     console.warn('Rendering Engine has been destroyed');
                     return renderStatus;
                 }
+                if (!(0,_stateManagement_annotation_annotationVisibility__WEBPACK_IMPORTED_MODULE_11__.isAnnotationVisible)(annotationUID)) {
+                    continue;
+                }
                 const handleGroupUID = '0';
                 (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_6__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, [canvasCoordinates], { color, lineWidth, handleRadius: this.configuration.handleRadius });
                 renderStatus = true;
@@ -22084,8 +22176,8 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 const textLines = this.configuration.getTextLines(data, targetId);
                 if (textLines) {
                     const textCanvasCoordinates = [
-                        canvasCoordinates[0] + 6,
-                        canvasCoordinates[1] - 6,
+                        canvasCoordinates[0] + this.configuration.textCanvasOffset.x,
+                        canvasCoordinates[1] + this.configuration.textCanvasOffset.y,
                     ];
                     const textUID = '0';
                     (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_6__.drawTextBox)(svgDrawingHelper, annotationUID, textUID, textLines, [textCanvasCoordinates[0], textCanvasCoordinates[1]], options);
@@ -22109,6 +22201,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
             return;
         }
         const { FrameOfReferenceUID, referencedImageId, viewPlaneNormal, viewUp, instance, viewport, } = this.hydrateBase(ProbeTool, enabledElement, points, options);
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.uuidv4(),
             data: {
@@ -22126,11 +22219,11 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_3__.addAnnotation)(annotation, viewport.element);
-        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)([viewport.id]);
+        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)([viewport.id]);
     }; }
     getHandleNearImagePoint(element, annotation, canvasCoords, proximity) {
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
@@ -22154,7 +22247,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
         };
         this._activateModify(element);
         (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_10__.hideElementCursor)(element);
-        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A)(viewportIdsToRender);
+        (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .A)(viewportIdsToRender);
         evt.preventDefault();
     }
     _calculateCachedStats(annotation, renderingEngine, enabledElement, changeType = _enums__WEBPACK_IMPORTED_MODULE_8__.ChangeTypes.StatsUpdated) {
@@ -22167,7 +22260,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
             const pixelUnitsOptions = {
-                isPreScaled: (0,_utilities_viewport_isViewportPreScaled__WEBPACK_IMPORTED_MODULE_13__/* .isViewportPreScaled */ .u)(viewport, targetId),
+                isPreScaled: (0,_utilities_viewport_isViewportPreScaled__WEBPACK_IMPORTED_MODULE_14__/* .isViewportPreScaled */ .u)(viewport, targetId),
                 isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
             };
             const image = this.getTargetImageData(targetId);
@@ -22200,7 +22293,7 @@ class ProbeTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                         : 'raw';
                 }
                 else {
-                    modalityUnit = (0,_utilities_getPixelValueUnits__WEBPACK_IMPORTED_MODULE_12__/* .getPixelValueUnits */ .j)(modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
+                    modalityUnit = (0,_utilities_getPixelValueUnits__WEBPACK_IMPORTED_MODULE_13__/* .getPixelValueUnits */ .j)(modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                 }
                 cachedStats[targetId] = {
                     index: ijk,
@@ -23308,6 +23401,7 @@ class SplineROITool extends _base_ContourSegmentationBaseTool__WEBPACK_IMPORTED_
         const splineConfig = instance._getSplineConfig(splineType);
         const SplineClass = splineConfig.Class;
         const splineInstance = new SplineClass();
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.uuidv4(),
             data: {
@@ -23334,7 +23428,7 @@ class SplineROITool extends _base_ContourSegmentationBaseTool__WEBPACK_IMPORTED_
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_2__.addAnnotation)(annotation, viewport.element);
@@ -25657,6 +25751,9 @@ BaseTool.toolName = 'BaseTool';
 /* harmony import */ var _removeContourFromElement__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(87420);
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(36625);
 /* harmony import */ var _utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(27479);
+/* harmony import */ var _utilities_segmentation_getUniqueSegmentIndices__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(25758);
+/* harmony import */ var _stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(82056);
+/* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(3823);
 
 
 
@@ -25664,7 +25761,10 @@ BaseTool.toolName = 'BaseTool';
 
 
 
-let polySegConversionInProgress = false;
+
+
+
+const polySegConversionInProgressForViewportId = new Map();
 const processedViewportSegmentations = new Map();
 function removeRepresentation(viewportId, segmentationId, renderImmediate = false) {
     const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElementByViewportId)(viewportId);
@@ -25672,10 +25772,10 @@ function removeRepresentation(viewportId, segmentationId, renderImmediate = fals
         return;
     }
     const { viewport } = enabledElement;
+    (0,_removeContourFromElement__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(viewportId, segmentationId);
     if (!renderImmediate) {
         return;
     }
-    (0,_removeContourFromElement__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(viewportId, segmentationId);
     viewport.render();
 }
 async function render(viewport, contourRepresentation) {
@@ -25685,13 +25785,13 @@ async function render(viewport, contourRepresentation) {
         return;
     }
     let contourData = segmentation.representationData[_enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour];
+    const polySeg = (0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)();
     if (!contourData &&
         (0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()?.canComputeRequestedRepresentation(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour) &&
-        !polySegConversionInProgress) {
-        polySegConversionInProgress = true;
-        const polySeg = (0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)();
+        !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 }), () => undefined);
-        polySegConversionInProgress = false;
+        polySegConversionInProgressForViewportId.set(viewport.id, false);
     }
     else if (!contourData && !(0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()) {
         console.debug(`No contour data found for segmentationId ${segmentationId} and PolySeg add-on is not configured. Unable to convert from other representations to contour. Please register PolySeg using cornerstoneTools.init({ addons: { polySeg } }) to enable automatic conversion.`);
@@ -25702,8 +25802,101 @@ async function render(viewport, contourRepresentation) {
     if (!contourData.geometryIds?.length) {
         return;
     }
+    let hasContourDataButNotMatchingViewport = false;
+    const viewportNormal = viewport.getCamera().viewPlaneNormal;
+    if (contourData.annotationUIDsMap) {
+        hasContourDataButNotMatchingViewport = !_checkContourNormalsMatchViewport(contourData.annotationUIDsMap, viewportNormal);
+    }
+    if (contourData.geometryIds.length > 0) {
+        hasContourDataButNotMatchingViewport = !_checkContourGeometryMatchViewport(contourData.geometryIds, viewportNormal);
+    }
+    const viewportProcessed = processedViewportSegmentations.get(viewport.id) || new Set();
+    if (hasContourDataButNotMatchingViewport &&
+        !polySegConversionInProgressForViewportId.get(viewport.id) &&
+        !viewportProcessed.has(segmentationId) &&
+        viewport.viewportStatus === _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.Enums.ViewportStatus.RENDERED) {
+        polySegConversionInProgressForViewportId.set(viewport.id, true);
+        const segmentIndices = (0,_utilities_segmentation_getUniqueSegmentIndices__WEBPACK_IMPORTED_MODULE_7__/* .getUniqueSegmentIndices */ .O)(segmentationId);
+        const surfacesInfo = await polySeg.computeSurfaceData(segmentationId, {
+            segmentIndices,
+            viewport,
+        });
+        const geometryIds = surfacesInfo.geometryIds;
+        const pointsAndPolys = [];
+        for (const geometryId of geometryIds.values()) {
+            const geometry = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getGeometry(geometryId);
+            const data = geometry.data;
+            pointsAndPolys.push({
+                points: data.points,
+                polys: data.polys,
+                segmentIndex: data.segmentIndex,
+                id: data.segmentIndex,
+            });
+        }
+        const polyDataCache = await polySeg.clipAndCacheSurfacesForViewport(pointsAndPolys, viewport);
+        const rawResults = polySeg.extractContourData(polyDataCache);
+        const annotationUIDsMap = polySeg.createAndAddContourSegmentationsFromClippedSurfaces(rawResults, viewport, segmentationId);
+        contourData.annotationUIDsMap = new Map([
+            ...contourData.annotationUIDsMap,
+            ...annotationUIDsMap,
+        ]);
+        viewportProcessed.add(segmentationId);
+        processedViewportSegmentations.set(viewport.id, viewportProcessed);
+        polySegConversionInProgressForViewportId.set(viewport.id, false);
+    }
     (0,_contourHandler_handleContourSegmentation__WEBPACK_IMPORTED_MODULE_2__/* .handleContourSegmentation */ .d)(viewport, contourData.geometryIds, contourData.annotationUIDsMap, contourRepresentation);
 }
+function _checkContourGeometryMatchViewport(geometryIds, viewportNormal) {
+    let validGeometry = null;
+    let geometryData = null;
+    for (const geometryId of geometryIds) {
+        const geometry = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getGeometry(geometryId);
+        if (!geometry) {
+            continue;
+        }
+        const data = geometry.data;
+        if (data.contours?.[0]?.points?.length >= 3) {
+            validGeometry = geometry;
+            geometryData = data;
+            break;
+        }
+    }
+    if (!validGeometry || !geometryData) {
+        return false;
+    }
+    const contours = geometryData.contours;
+    const points = contours[0].points;
+    const point1 = points[0];
+    const point2 = points[1];
+    const point3 = points[2];
+    let normal = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.cross */ .eR.cross(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), point2, point1), gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), point3, point1));
+    normal = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.normalize */ .eR.normalize(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), normal);
+    const dotProduct = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.dot */ .eR.dot(normal, viewportNormal);
+    return Math.abs(dotProduct) > 0.9;
+}
+function _checkContourNormalsMatchViewport(annotationUIDsMap, viewportNormal) {
+    const annotationUIDs = Array.from(annotationUIDsMap.values())
+        .flat()
+        .map((uidSet) => Array.from(uidSet))
+        .flat();
+    const randomAnnotationUIDs = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.getRandomSampleFromArray(annotationUIDs, 3);
+    for (const annotationUID of randomAnnotationUIDs) {
+        const annotation = (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_8__.getAnnotation)(annotationUID);
+        if (annotation?.metadata) {
+            if (!annotation.metadata.viewPlaneNormal) {
+                continue;
+            }
+            const annotationNormal = annotation.metadata.viewPlaneNormal;
+            const dotProduct = Math.abs(viewportNormal[0] * annotationNormal[0] +
+                viewportNormal[1] * annotationNormal[1] +
+                viewportNormal[2] * annotationNormal[2]);
+            if (Math.abs(dotProduct - 1) > 0.01) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
     render,
     removeRepresentation,
@@ -26616,6 +26809,9 @@ class BrushTool extends _LabelmapBaseTool__WEBPACK_IMPORTED_MODULE_10__/* ["defa
         }
         this.doneEditMemo();
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
+        if (!enabledElement) {
+            return;
+        }
         this.applyActiveStrategyCallback(enabledElement, this.getOperationData(element), _enums__WEBPACK_IMPORTED_MODULE_2__.StrategyCallbacks.RejectPreview);
         this._previewData.preview = null;
         this._previewData.isDrag = false;
@@ -28131,9 +28327,6 @@ class RectangleROIStartEndThresholdTool extends _annotation_RectangleROITool__WE
         if (this.configuration.calculatePointsInsideVolume) {
             this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
         }
-        if (this.configuration.calculatePointsInsideVolume) {
-            this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
-        }
         annotation.invalidated = false;
         (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_13__.triggerAnnotationModified)(annotation, viewport.element);
         return cachedStats;
@@ -28838,6 +29031,7 @@ class SegmentBidirectionalTool extends _annotation_BidirectionalTool__WEBPACK_IM
         const [major0, major1] = majorAxis;
         const [minor0, minor1] = minorAxis;
         const points = [major0, major1, minor0, minor1];
+        const { toolInstance, ...serializableOptions } = options || {};
         const annotation = {
             annotationUID: options?.annotationUID || _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.uuidv4(),
             data: {
@@ -28869,7 +29063,7 @@ class SegmentBidirectionalTool extends _annotation_BidirectionalTool__WEBPACK_IM
                 viewPlaneNormal,
                 FrameOfReferenceUID,
                 referencedImageId,
-                ...options,
+                ...serializableOptions,
             },
         };
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_1__.addAnnotation)(annotation, viewport.element);
@@ -34198,10 +34392,14 @@ async function calculateVolumeStatistics({ operationData, indices, unit, mode, }
         origin: imageData.getOrigin(),
         direction: imageData.getDirection(),
     };
+    if (!imageInfo.scalarData?.length) {
+        return;
+    }
     const stats = await (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getWebWorkerManager)().executeTask('compute', 'calculateSegmentsStatisticsVolume', {
         segmentationInfo,
         imageInfo,
         indices,
+        unit,
         mode,
     });
     (0,_utilsForWorker__WEBPACK_IMPORTED_MODULE_1__/* .triggerWorkerProgress */ .sg)(_enums__WEBPACK_IMPORTED_MODULE_4__.WorkerTypes.COMPUTE_STATISTICS, 100);
@@ -36476,7 +36674,7 @@ const getImageReferenceInfo = (segVolumeId, segImageIds) => {
     const refImage = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getImage(refImageId);
     const scalingModule = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.metaData.get('scalingModule', refImageId);
     const modalityUnitOptions = {
-        isPreScaled: Boolean(refImage.preScale?.scaled),
+        isPreScaled: Boolean(refImage?.preScale?.scaled),
         isSuvScaled: typeof scalingModule?.suvbw === 'number',
     };
     return { refImageId, modalityUnitOptions };