@ohif/app 3.13.0-beta.109 → 3.13.0-beta.110

package/dist/{6577.bundle.f614df8efd7562f4.js → 6577.bundle.a3e571d5f84837ea.js}

@@ -757,7 +757,9 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__rspack_im
         if (!this.configuration.calculateStats) {
             return;
         }
-        if (annotation.invalidated) {
+        const { data, invalidated } = annotation;
+        const cachedStats = data?.cachedStats;
+        if (invalidated || !cachedStats?.[targetId]) {
             this._calculateStatsIfActive(annotation, targetId, viewport, renderingEngine, enabledElement);
         }
         this._renderStats(annotation, viewport, enabledElement, svgDrawingHelper);
@@ -791,6 +793,7 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__rspack_im
     updateClosedCachedStats({ viewport, points, imageData, metadata, voxelManager, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }) {
         const { areaUnit, unit } = calibratedScale;
         const indexPoints = points.map((point) => imageData.worldToIndex(point));
+        const dims = imageData.getDimensions();
         let iMin = Number.MAX_SAFE_INTEGER;
         let iMax = Number.MIN_SAFE_INTEGER;
         let jMin = Number.MAX_SAFE_INTEGER;
@@ -806,6 +809,12 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__rspack_im
             kMin = Math.min(kMin, worldPosIndex[2]);
             kMax = Math.max(kMax, worldPosIndex[2]);
         }
+        iMin = Math.max(0, Math.min(dims[0] - 1, iMin));
+        iMax = Math.max(0, Math.min(dims[0] - 1, iMax));
+        jMin = Math.max(0, Math.min(dims[1] - 1, jMin));
+        jMax = Math.max(0, Math.min(dims[1] - 1, jMax));
+        kMin = Math.max(0, Math.min(dims[2] - 1, kMin));
+        kMax = Math.max(0, Math.min(dims[2] - 1, kMax));
         [iMin, iMax] = (0,_utilities_boundingBox_snapIndexBounds__rspack_import_21/* ["default"] */.A)(iMin, iMax);
         [jMin, jMax] = (0,_utilities_boundingBox_snapIndexBounds__rspack_import_21/* ["default"] */.A)(jMin, jMax);
         [kMin, kMax] = (0,_utilities_boundingBox_snapIndexBounds__rspack_import_21/* ["default"] */.A)(kMin, kMax);
@@ -963,14 +972,15 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _store_state__rspack_import_10 = __webpack_require__(85204);
 /* import */ var _enums__rspack_import_11 = __webpack_require__(87937);
 /* import */ var _utilities_viewportFilters__rspack_import_12 = __webpack_require__(60810);
-/* import */ var _utilities_math_rectangle__rspack_import_13 = __webpack_require__(33657);
-/* import */ var _cursors_elementCursor__rspack_import_14 = __webpack_require__(7001);
-/* import */ var _utilities_triggerAnnotationRenderForViewportIds__rspack_import_15 = __webpack_require__(58640);
-/* import */ var _utilities_getPixelValueUnits__rspack_import_16 = __webpack_require__(40634);
-/* import */ var _utilities_viewportCapabilities__rspack_import_17 = __webpack_require__(90398);
-/* import */ var _utilities_viewport_isViewportPreScaled__rspack_import_18 = __webpack_require__(18990);
-/* import */ var _utilities_math_basic__rspack_import_19 = __webpack_require__(73262);
-/* import */ var _stateManagement_annotation_config_helpers__rspack_import_20 = __webpack_require__(76712);
+/* import */ var _utilities_getViewportICamera__rspack_import_13 = __webpack_require__(29604);
+/* import */ var _utilities_math_rectangle__rspack_import_14 = __webpack_require__(33657);
+/* import */ var _cursors_elementCursor__rspack_import_15 = __webpack_require__(7001);
+/* import */ var _utilities_triggerAnnotationRenderForViewportIds__rspack_import_16 = __webpack_require__(58640);
+/* import */ var _utilities_getPixelValueUnits__rspack_import_17 = __webpack_require__(40634);
+/* import */ var _utilities_viewportCapabilities__rspack_import_18 = __webpack_require__(90398);
+/* import */ var _utilities_viewport_isViewportPreScaled__rspack_import_19 = __webpack_require__(18990);
+/* import */ var _utilities_math_basic__rspack_import_20 = __webpack_require__(73262);
+/* import */ var _stateManagement_annotation_config_helpers__rspack_import_21 = __webpack_require__(76712);
 var _a;
 
 
@@ -991,6 +1001,7 @@ var _a;
 
 
 
+
 
 
 const { transformWorldToIndex } = _cornerstonejs_core__rspack_import_1.utilities;
@@ -1003,7 +1014,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
             preventHandleOutsideImage: false,
             calculateStats: true,
             getTextLines: defaultGetTextLines,
-            statsCalculator: _utilities_math_basic__rspack_import_19.BasicStatsCalculator,
+            statsCalculator: _utilities_math_basic__rspack_import_20.BasicStatsCalculator,
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -1048,9 +1059,9 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                 hasMoved: false,
             };
             this._activateDraw(element);
-            (0,_cursors_elementCursor__rspack_import_14.hideElementCursor)(element);
+            (0,_cursors_elementCursor__rspack_import_15.hideElementCursor)(element);
             evt.preventDefault();
-            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
             return annotation;
         };
         this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
@@ -1066,7 +1077,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
             ]);
             const point = [canvasCoords[0], canvasCoords[1]];
             const { left, top, width, height } = rect;
-            const distanceToPoint = _utilities_math_rectangle__rspack_import_13.distanceToPoint([left, top, width, height], point);
+            const distanceToPoint = _utilities_math_rectangle__rspack_import_14.distanceToPoint([left, top, width, height], point);
             if (distanceToPoint <= proximity) {
                 return true;
             }
@@ -1083,10 +1094,10 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                 movingTextBox: false,
             };
             this._activateModify(element);
-            (0,_cursors_elementCursor__rspack_import_14.hideElementCursor)(element);
+            (0,_cursors_elementCursor__rspack_import_15.hideElementCursor)(element);
             const enabledElement = (0,_cornerstonejs_core__rspack_import_1.getEnabledElement)(element);
             const { renderingEngine } = enabledElement;
-            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
             evt.preventDefault();
         };
         this.handleSelectedCallback = (evt, annotation, handle) => {
@@ -1110,10 +1121,10 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                 movingTextBox,
             };
             this._activateModify(element);
-            (0,_cursors_elementCursor__rspack_import_14.hideElementCursor)(element);
+            (0,_cursors_elementCursor__rspack_import_15.hideElementCursor)(element);
             const enabledElement = (0,_cornerstonejs_core__rspack_import_1.getEnabledElement)(element);
             const { renderingEngine } = enabledElement;
-            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
             evt.preventDefault();
         };
         this._endCallback = (evt) => {
@@ -1127,7 +1138,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
             data.handles.activeHandleIndex = null;
             this._deactivateModify(element);
             this._deactivateDraw(element);
-            (0,_cursors_elementCursor__rspack_import_14.resetElementCursor)(element);
+            (0,_cursors_elementCursor__rspack_import_15.resetElementCursor)(element);
             this.doneEditMemo();
             this.editData = null;
             this.isDrawing = false;
@@ -1135,7 +1146,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                 this.configuration.preventHandleOutsideImage) {
                 (0,_stateManagement__rspack_import_5/* .removeAnnotation */.O8)(annotation.annotationUID);
             }
-            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
             if (newAnnotation) {
                 (0,_stateManagement_annotation_helpers_state__rspack_import_8.triggerAnnotationCompleted)(annotation);
             }
@@ -1217,7 +1228,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
             }
             this.editData.hasMoved = true;
             const enabledElement = (0,_cornerstonejs_core__rspack_import_1.getEnabledElement)(element);
-            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+            (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
             if (annotation.invalidated) {
                 (0,_stateManagement_annotation_helpers_state__rspack_import_8.triggerAnnotationModified)(annotation, element, _enums__rspack_import_11.ChangeTypes.HandlesUpdated);
             }
@@ -1227,12 +1238,12 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                 this.isDrawing = false;
                 this._deactivateDraw(element);
                 this._deactivateModify(element);
-                (0,_cursors_elementCursor__rspack_import_14.resetElementCursor)(element);
+                (0,_cursors_elementCursor__rspack_import_15.resetElementCursor)(element);
                 const { annotation, viewportIdsToRender, newAnnotation } = this.editData;
                 const { data } = annotation;
                 annotation.highlighted = false;
                 data.handles.activeHandleIndex = null;
-                (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)(viewportIdsToRender);
+                (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)(viewportIdsToRender);
                 if (newAnnotation) {
                     (0,_stateManagement_annotation_helpers_state__rspack_import_8.triggerAnnotationCompleted)(annotation);
                 }
@@ -1307,7 +1318,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                     annotation,
                     styleSpecifier,
                 });
-                const { viewPlaneNormal, viewUp } = viewport.getCamera();
+                const { viewPlaneNormal, viewUp } = (0,_utilities_getViewportICamera__rspack_import_13/* ["default"] */.A)(viewport);
                 if (!data.cachedStats[targetId] ||
                     data.cachedStats[targetId].areaUnit == null) {
                     data.cachedStats[targetId] = {
@@ -1328,7 +1339,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                             if (targetId.startsWith('imageId')) {
                                 const viewports = renderingEngine
                                     .getViewports()
-                                    .filter(_utilities_viewportCapabilities__rspack_import_17/* .viewportSupportsImageSlices */.hz);
+                                    .filter(_utilities_viewportCapabilities__rspack_import_18/* .viewportSupportsImageSlices */.hz);
                                 const invalidatedStack = viewports.find((vp) => {
                                     const referencedImageURI = _cornerstonejs_core__rspack_import_1.utilities.imageIdToURI(referencedImageId);
                                     const hasImageURI = vp.hasImageURI(referencedImageURI);
@@ -1356,7 +1367,7 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                     activeHandleIndex !== undefined) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                const showHandlesAlways = Boolean((0,_stateManagement_annotation_config_helpers__rspack_import_20/* .getStyleProperty */.h)('showHandlesAlways', {}));
+                const showHandlesAlways = Boolean((0,_stateManagement_annotation_config_helpers__rspack_import_21/* .getStyleProperty */.h)('showHandlesAlways', {}));
                 if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,_drawingSvg__rspack_import_9.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
@@ -1443,10 +1454,10 @@ class RectangleROITool extends _base__rspack_import_0/* .AnnotationTool */.EC {
                     const area = Math.abs(width * height);
                     const { areaUnit } = calibrate;
                     const pixelUnitsOptions = {
-                        isPreScaled: (0,_utilities_viewport_isViewportPreScaled__rspack_import_18/* .isViewportPreScaled */.u)(viewport, targetId),
+                        isPreScaled: (0,_utilities_viewport_isViewportPreScaled__rspack_import_19/* .isViewportPreScaled */.u)(viewport, targetId),
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                     };
-                    const modalityUnit = (0,_utilities_getPixelValueUnits__rspack_import_16/* .getPixelValueUnits */.j)(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
+                    const modalityUnit = (0,_utilities_getPixelValueUnits__rspack_import_17/* .getPixelValueUnits */.j)(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                     let pointsInShape;
                     if (voxelManager) {
                         pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
@@ -1523,7 +1534,7 @@ RectangleROITool.hydrate = (viewportId, points, options) => {
         },
     };
     (0,_stateManagement__rspack_import_5/* .addAnnotation */.lC)(annotation, viewport.element);
-    (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_15/* ["default"] */.A)([viewport.id]);
+    (0,_utilities_triggerAnnotationRenderForViewportIds__rspack_import_16/* ["default"] */.A)([viewport.id]);
 };
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
@@ -1887,6 +1898,12 @@ class AnnotationTool extends _AnnotationDisplayTool__rspack_import_2/* ["default
             else if (viewport instanceof _cornerstonejs_core__rspack_import_0.BaseVolumeViewport) {
                 referencedImageId = instance.getReferencedImageId(viewport, points[0], viewPlaneNormal, viewUp);
             }
+            else if (_cornerstonejs_core__rspack_import_0.utilities.isGenericViewport(viewport)) {
+                const genericViewport = viewport;
+                referencedImageId = genericViewport.getViewReference?.({
+                    points: [points[0]],
+                })?.referencedImageId;
+            }
             else {
                 throw new Error('Unsupported viewport type');
             }
@@ -1920,7 +1937,7 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _stateManagement_segmentation_config_segmentationColor__rspack_import_7 = __webpack_require__(93733);
 /* import */ var _stateManagement_segmentation_getActiveSegmentIndex__rspack_import_8 = __webpack_require__(60740);
 /* import */ var _enums__rspack_import_9 = __webpack_require__(87937);
-/* import */ var _utilities_segmentation_createLabelmapMemo__rspack_import_10 = __webpack_require__(2397);
+/* import */ var _utilities_segmentation_createLabelmapMemo__rspack_import_10 = __webpack_require__(24778);
 /* import */ var _stateManagement_annotation_annotationState__rspack_import_11 = __webpack_require__(82056);
 /* import */ var _utilities_planar__rspack_import_12 = __webpack_require__(71096);
 /* import */ var _utilities_math_polyline__rspack_import_13 = __webpack_require__(3549);
@@ -3293,18 +3310,7 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var _cornerstonejs_core__rspack_import_0 = __webpack_require__(70594);
 
 function isViewportPreScaled(viewport, targetId) {
-    if (viewport instanceof _cornerstonejs_core__rspack_import_0.BaseVolumeViewport) {
-        const volumeId = _cornerstonejs_core__rspack_import_0.utilities.getVolumeId(targetId);
-        const volume = _cornerstonejs_core__rspack_import_0.cache.getVolume(volumeId);
-        return !!volume?.scaling && Object.keys(volume.scaling).length > 0;
-    }
-    else if (viewport instanceof _cornerstonejs_core__rspack_import_0.StackViewport) {
-        const { preScale } = viewport.getImageData() || {};
-        return !!preScale?.scaled;
-    }
-    else {
-        return false;
-    }
+    return !!_cornerstonejs_core__rspack_import_0.utilities.getScalingDescriptor(viewport, targetId)?.isPreScaled;
 }