@ohif/app 3.11.0-beta.98 → 3.11.0

package/dist/{9594.bundle.e623f61b984d7ff3b4b6.js → 4019.bundle.e07cc2a71b6e189a706a.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[9594],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[4019],{
 
 /***/ 97:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -155,22 +155,6 @@ const eraseInsideSphere = ERASE_SPHERE_STRATEGY.strategyFunction;
 
 
 
-/***/ }),
-
-/***/ 2222:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (/* binding */ getCanvasEllipseCorners)
-/* harmony export */ });
-function getCanvasEllipseCorners(ellipseCanvasPoints) {
-    const [bottom, top, left, right] = ellipseCanvasPoints;
-    const topLeft = [left[0], top[1]];
-    const bottomRight = [right[0], bottom[1]];
-    return [topLeft, bottomRight];
-}
-
-
 /***/ }),
 
 /***/ 5403:
@@ -819,20 +803,22 @@ const sphereComposition = {
         if (!points) {
             return;
         }
-        const center = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.fromValues */ .eR.fromValues(0, 0, 0);
-        points.forEach((point) => {
-            gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.add */ .eR.add(center, center, point);
-        });
-        gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.scale */ .eR.scale(center, center, 1 / points.length);
+        const center = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.create */ .eR.create();
+        if (points.length >= 2) {
+            gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.add */ .eR.add(center, points[0], points[1]);
+            gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.scale */ .eR.scale(center, center, 0.5);
+        }
+        else {
+            gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec3.copy */ .eR.copy(center, points[0]);
+        }
         operationData.centerWorld = center;
         operationData.centerIJK = transformWorldToIndex(segmentationImageData, center);
-        const { boundsIJK: newBoundsIJK, topLeftWorld, bottomRightWorld, } = (0,_utilities_getSphereBoundsInfo__WEBPACK_IMPORTED_MODULE_6__/* .getSphereBoundsInfoFromViewport */ .l)(points.slice(0, 2), segmentationImageData, viewport);
+        const { boundsIJK: newBoundsIJK } = (0,_utilities_getSphereBoundsInfo__WEBPACK_IMPORTED_MODULE_6__/* .getSphereBoundsInfoFromViewport */ .l)(points.slice(0, 2), segmentationImageData, viewport);
+        const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+        const corners = (0,_fillCircle__WEBPACK_IMPORTED_MODULE_5__/* .getEllipseCornersFromCanvasCoordinates */ .C$)(canvasCoordinates);
+        const cornersInWorld = corners.map((corner) => viewport.canvasToWorld(corner));
         operationData.isInObjectBoundsIJK = newBoundsIJK;
-        operationData.isInObject = (0,_fillCircle__WEBPACK_IMPORTED_MODULE_5__/* .createEllipseInPoint */ .mu)({
-            topLeftWorld,
-            bottomRightWorld,
-            center,
-        });
+        operationData.isInObject = (0,_fillCircle__WEBPACK_IMPORTED_MODULE_5__/* .createEllipseInPoint */ .mu)(cornersInWorld);
     },
 };
 const SPHERE_STRATEGY = new _BrushStrategy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A('Sphere', _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.regionFill, _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.setValue, sphereComposition, _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.determineSegmentIndex, _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.preview, _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.labelmapStatistics, _compositions__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.ensureSegmentationVolumeFor3DManipulation);
@@ -1611,23 +1597,35 @@ const PARALLEL_THRESHOLD = 1 - EPSILON;
 function filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection) {
     const { viewPlaneNormal } = camera;
     const annotationsWithParallelNormals = annotations.filter((td) => {
-        let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+        const { planeRestriction, referencedImageId } = td.metadata;
+        let { viewPlaneNormal: annotationViewPlaneNormal } = td.metadata;
+        if (planeRestriction) {
+            const { inPlaneVector1, inPlaneVector2 } = planeRestriction;
+            if (inPlaneVector1 &&
+                !isEqual(0, gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.dot */ .eR.dot(viewPlaneNormal, inPlaneVector1))) {
+                return false;
+            }
+            if (inPlaneVector2 &&
+                !isEqual(0, gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.dot */ .eR.dot(viewPlaneNormal, inPlaneVector2))) {
+                return false;
+            }
+            return true;
+        }
         if (!td.metadata.referencedImageId &&
             !annotationViewPlaneNormal &&
             td.metadata.FrameOfReferenceUID) {
             for (const point of td.data.handles.points) {
                 const vector = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.create */ .eR.create(), point, camera.focalPoint);
-                const dotProduct = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.dot */ .eR.dot(vector, camera.viewPlaneNormal);
+                const dotProduct = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.dot */ .eR.dot(vector, viewPlaneNormal);
                 if (!isEqual(dotProduct, 0)) {
                     return false;
                 }
             }
-            td.metadata.viewPlaneNormal = camera.viewPlaneNormal;
+            td.metadata.viewPlaneNormal = viewPlaneNormal;
             td.metadata.cameraFocalPoint = camera.focalPoint;
             return true;
         }
-        if (!annotationViewPlaneNormal) {
-            const { referencedImageId } = td.metadata;
+        if (!annotationViewPlaneNormal && referencedImageId) {
             const { imageOrientationPatient } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.metaData.get('imagePlaneModule', referencedImageId);
             const rowCosineVec = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.fromValues */ .eR.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
             const colCosineVec = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec3.fromValues */ .eR.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
@@ -1704,130 +1702,6 @@ function filterAnnotationsWithinSamePlane(annotations, camera) {
 }
 
 
-/***/ }),
-
-/***/ 40905:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   S: () => (/* binding */ getStrategyData)
-/* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
-/* harmony import */ var _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(98870);
-/* harmony import */ var _stateManagement_segmentation_helpers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91963);
-/* harmony import */ var _utilities_segmentation_getReferenceVolumeForSegmentationVolume__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12853);
-
-
-
-
-function getStrategyDataForVolumeViewport({ operationData }) {
-    const { volumeId } = operationData;
-    if (!volumeId) {
-        const event = new CustomEvent(_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.Enums.Events.ERROR_EVENT, {
-            detail: {
-                type: 'Segmentation',
-                message: 'No volume id found for the segmentation',
-            },
-            cancelable: true,
-        });
-        _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget.dispatchEvent(event);
-        return null;
-    }
-    const segmentationVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolume(volumeId);
-    const imageVolume = (0,_utilities_segmentation_getReferenceVolumeForSegmentationVolume__WEBPACK_IMPORTED_MODULE_3__/* .getReferenceVolumeForSegmentationVolume */ .b)(volumeId);
-    if (!segmentationVolume || !imageVolume) {
-        return null;
-    }
-    const { imageData: segmentationImageData } = segmentationVolume;
-    const { voxelManager: segmentationVoxelManager } = segmentationVolume;
-    const { voxelManager: imageVoxelManager, imageData } = imageVolume;
-    return {
-        segmentationImageData,
-        segmentationVoxelManager,
-        segmentationScalarData: null,
-        imageScalarData: null,
-        imageVoxelManager,
-        imageData,
-    };
-}
-function getStrategyDataForStackViewport({ operationData, viewport, strategy, }) {
-    const { segmentationId } = operationData;
-    let segmentationImageData;
-    let segmentationVoxelManager;
-    let segmentationScalarData;
-    let imageScalarData;
-    let imageVoxelManager;
-    let imageData;
-    if (strategy.ensureSegmentationVolumeFor3DManipulation) {
-        strategy.ensureSegmentationVolumeFor3DManipulation({
-            operationData,
-            viewport,
-        });
-        segmentationVoxelManager = operationData.segmentationVoxelManager;
-        segmentationImageData = operationData.segmentationImageData;
-        segmentationScalarData = null;
-    }
-    else {
-        const labelmapImageId = (0,_stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_1__.getCurrentLabelmapImageIdForViewport)(viewport.id, segmentationId);
-        if (!labelmapImageId) {
-            return null;
-        }
-        const actorEntry = (0,_stateManagement_segmentation_helpers__WEBPACK_IMPORTED_MODULE_2__/* .getLabelmapActorEntry */ .wV)(viewport.id, segmentationId);
-        if (!actorEntry) {
-            return null;
-        }
-        const currentSegImage = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getImage(labelmapImageId);
-        segmentationImageData = actorEntry.actor.getMapper().getInputData();
-        segmentationVoxelManager = currentSegImage.voxelManager;
-        const currentSegmentationImageId = operationData.imageId;
-        const segmentationImage = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getImage(currentSegmentationImageId);
-        if (!segmentationImage) {
-            return null;
-        }
-        segmentationScalarData = segmentationImage.getPixelData?.();
-    }
-    if (strategy.ensureImageVolumeFor3DManipulation) {
-        strategy.ensureImageVolumeFor3DManipulation({
-            operationData,
-            viewport,
-        });
-        imageVoxelManager = operationData.imageVoxelManager;
-        imageScalarData = operationData.imageScalarData;
-        imageData = operationData.imageData;
-    }
-    else {
-        const currentImageId = viewport.getCurrentImageId();
-        if (!currentImageId) {
-            return null;
-        }
-        const image = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getImage(currentImageId);
-        imageData = image ? null : viewport.getImageData();
-        imageScalarData = image?.getPixelData() || imageData.getScalarData();
-        imageVoxelManager = image?.voxelManager;
-    }
-    return {
-        segmentationImageData,
-        segmentationScalarData,
-        imageScalarData,
-        segmentationVoxelManager,
-        imageVoxelManager,
-        imageData,
-    };
-}
-function getStrategyData({ operationData, viewport, strategy, }) {
-    if (!operationData) {
-        return null;
-    }
-    if (('volumeId' in operationData && operationData.volumeId != null) ||
-        ('referencedVolumeId' in operationData &&
-            operationData.referencedVolumeId != null)) {
-        return getStrategyDataForVolumeViewport({ operationData });
-    }
-    return getStrategyDataForStackViewport({ operationData, viewport, strategy });
-}
-
-
-
 /***/ }),
 
 /***/ 42797: