@ohif/app 3.13.0-beta.64 → 3.13.0-beta.65

package/dist/{9205.bundle.315c3b56464a7590235a.js → 9205.bundle.ed7bce8436a7a431955e.js}

@@ -10438,6 +10438,7 @@ class AdvancedMagnifyViewport {
     _syncViewportsCameras(sourceViewport, magnifyViewport) {
         const worldPos = sourceViewport.canvasToWorld(this.position);
         const parallelScale = this._convertZoomFactorToParallelScale(sourceViewport, magnifyViewport, this.zoomFactor);
+        const { flipHorizontal, flipVertical } = sourceViewport.getCamera();
         const { focalPoint, position, viewPlaneNormal } = magnifyViewport.getCamera();
         const distance = Math.sqrt(Math.pow(focalPoint[0] - position[0], 2) +
             Math.pow(focalPoint[1] - position[1], 2) +
@@ -10456,6 +10457,8 @@ class AdvancedMagnifyViewport {
             parallelScale,
             focalPoint: updatedFocalPoint,
             position: updatedPosition,
+            flipHorizontal,
+            flipVertical,
         });
     }
     _syncStackViewports(sourceViewport, magnifyViewport) {
@@ -12518,7 +12521,7 @@ class MagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .BaseTool */ .oS
             const { viewport } = enabledElement;
             const { element } = viewport;
             const viewportProperties = viewport.getProperties();
-            const { rotation: originalViewportRotation } = viewport.getViewPresentation();
+            const { rotation: originalViewportRotation, flipHorizontal: originalViewportFlipHorizontal, flipVertical: originalViewportFlipVertical, } = viewport.getViewPresentation();
             const { canvas: canvasPos, world: worldPos } = currentPoints;
             let magnifyToolElement;
             magnifyToolElement = element.querySelector('.magnifyTool');
@@ -12549,6 +12552,8 @@ class MagnifyTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .BaseTool */ .oS
                 magnifyViewport.setProperties(viewportProperties);
                 magnifyViewport.setViewPresentation({
                     rotation: originalViewportRotation,
+                    flipHorizontal: originalViewportFlipHorizontal,
+                    flipVertical: originalViewportFlipVertical,
                 });
                 const { parallelScale } = viewport.getCamera();
                 const { focalPoint, position, viewPlaneNormal } = magnifyViewport.getCamera();
@@ -12756,12 +12761,19 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
             showEdgeFaces: true,
             showCornerFaces: true,
             keepOrientationUp: true,
+            highlightColor: [255, 255, 255],
+            edgeColor: [200, 200, 200],
+            cornerColor: [150, 150, 150],
+            restingAmbient: 1.0,
+            hoverAmbient: 1.0,
         },
     }) {
         super(toolProps, defaultToolProps);
         this.widget = new _utilities_vtkjs_OrientationControllerWidget__WEBPACK_IMPORTED_MODULE_5__/* .vtkOrientationControllerWidget */ .C();
         this.resizeObservers = new Map();
         this.cameraHandlers = new Map();
+        this.animationFrameHandles = new Map();
+        this.animationTokens = new Map();
         this._getViewportsInfo = () => {
             const viewports = (0,_store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_2__.getToolGroup)(this.toolGroupId)?.viewportsInfo;
             return viewports || [];
@@ -12855,6 +12867,7 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
             }
             const volumeViewport = viewport;
             this.widget.positionActors(volumeViewport, actors, this.getPositionConfig());
+            this.widget.syncOverlayViewport(viewportId, volumeViewport);
             viewport.render();
         };
     }
@@ -12920,6 +12933,9 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
         this.resizeObservers.forEach((observer) => observer.disconnect());
         this.resizeObservers.clear();
         this.cameraHandlers.clear();
+        this.animationFrameHandles.forEach((handle) => cancelAnimationFrame(handle));
+        this.animationFrameHandles.clear();
+        this.animationTokens.clear();
     }
     createAnnotatedRhombActor() {
         const faceColors = this.getFaceColors();
@@ -12930,9 +12946,17 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
             opacity: this.configuration.opacity ?? 1.0,
             showEdgeFaces: this.configuration.showEdgeFaces !== false,
             showCornerFaces: this.configuration.showCornerFaces !== false,
+            highlightColor: this.configuration.highlightColor ?? [255, 255, 255],
+            edgeColor: this.configuration.edgeColor ?? [200, 200, 200],
+            cornerColor: this.configuration.cornerColor ?? [150, 150, 150],
+            restingAmbient: this.configuration.restingAmbient ?? 1.0,
+            hoverAmbient: this.configuration.hoverAmbient ?? 1.0,
         });
     }
     addMarkerToViewport(viewportId, renderingEngineId) {
+        if (this.widget.getActors(viewportId)) {
+            return;
+        }
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElementByIds)(viewportId, renderingEngineId);
         if (!enabledElement) {
             console.warn('OrientationControllerTool: No enabled element found');
@@ -12973,8 +12997,8 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
                 }
             },
             onFaceHover: (result) => {
-                if (result && result.actorIndex !== 0) {
-                    this.widget.highlightFace(result.pickedActor, result.cellId, volumeViewport, false);
+                if (result) {
+                    this.widget.highlightFace(result.pickedActor, result.cellId, volumeViewport, result.actorIndex === 0);
                 }
                 else {
                     this.widget.clearHighlight();
@@ -13013,6 +13037,14 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
         viewport.render();
     }
     animateCameraToOrientation(viewport, targetViewPlaneNormal, targetViewUp) {
+        const viewportId = viewport.id;
+        const existingHandle = this.animationFrameHandles.get(viewportId);
+        if (existingHandle !== undefined) {
+            cancelAnimationFrame(existingHandle);
+            this.animationFrameHandles.delete(viewportId);
+        }
+        const nextToken = (this.animationTokens.get(viewportId) ?? 0) + 1;
+        this.animationTokens.set(viewportId, nextToken);
         const keepOrientationUp = this.configuration.keepOrientationUp !== false;
         const renderer = viewport.getRenderer();
         const camera = renderer.getActiveCamera();
@@ -13024,34 +13056,33 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
         gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.cross */ .eR.cross(startRight, startUp, startForward);
         gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(startRight, startRight);
         const startMatrix = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .mat4.fromValues */ .pB.fromValues(startRight[0], startRight[1], startRight[2], 0, startUp[0], startUp[1], startUp[2], 0, startForward[0], startForward[1], startForward[2], 0, 0, 0, 0, 1);
+        const targetForward = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create(), targetViewPlaneNormal);
         let targetUp;
         if (keepOrientationUp) {
             targetUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.fromValues */ .eR.fromValues(targetViewUp[0], targetViewUp[1], targetViewUp[2]);
         }
         else {
-            const currentUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create(), startUp);
-            const normalizedForward = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create();
-            gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(normalizedForward, targetViewPlaneNormal);
-            const dot = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.dot */ .eR.dot(currentUp, normalizedForward);
+            const currentFwd = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create(), startForward);
+            const rotQuat = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.create */ .Yu.create();
+            gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.rotationTo */ .Yu.rotationTo(rotQuat, currentFwd, targetForward);
             targetUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create();
-            gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.scaleAndAdd */ .eR.scaleAndAdd(targetUp, currentUp, normalizedForward, -dot);
+            gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.transformQuat */ .eR.transformQuat(targetUp, startUp, rotQuat);
             gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(targetUp, targetUp);
-            if (gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.length */ .eR.length(targetUp) < 0.001) {
-                if (Math.abs(normalizedForward[2]) < 0.9) {
-                    targetUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.fromValues */ .eR.fromValues(0, 0, 1);
-                }
-                else {
-                    targetUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.fromValues */ .eR.fromValues(0, 1, 0);
-                }
-                const dot2 = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.dot */ .eR.dot(targetUp, normalizedForward);
-                gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.scaleAndAdd */ .eR.scaleAndAdd(targetUp, targetUp, normalizedForward, -dot2);
-                gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(targetUp, targetUp);
-            }
         }
+        const upDotForward = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.dot */ .eR.dot(targetUp, targetForward);
+        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.scaleAndAdd */ .eR.scaleAndAdd(targetUp, targetUp, targetForward, -upDotForward);
+        if (gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.length */ .eR.length(targetUp) < 0.0001) {
+            targetUp = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.clone */ .eR.clone(startUp);
+            const fallbackDot = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.dot */ .eR.dot(targetUp, targetForward);
+            gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.scaleAndAdd */ .eR.scaleAndAdd(targetUp, targetUp, targetForward, -fallbackDot);
+        }
+        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(targetUp, targetUp);
         const targetRight = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.create */ .eR.create();
-        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.cross */ .eR.cross(targetRight, targetUp, targetViewPlaneNormal);
+        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.cross */ .eR.cross(targetRight, targetUp, targetForward);
         gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(targetRight, targetRight);
-        const targetMatrix = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .mat4.fromValues */ .pB.fromValues(targetRight[0], targetRight[1], targetRight[2], 0, targetUp[0], targetUp[1], targetUp[2], 0, targetViewPlaneNormal[0], targetViewPlaneNormal[1], targetViewPlaneNormal[2], 0, 0, 0, 0, 1);
+        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.cross */ .eR.cross(targetUp, targetForward, targetRight);
+        gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .vec3.normalize */ .eR.normalize(targetUp, targetUp);
+        const targetMatrix = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .mat4.fromValues */ .pB.fromValues(targetRight[0], targetRight[1], targetRight[2], 0, targetUp[0], targetUp[1], targetUp[2], 0, targetForward[0], targetForward[1], targetForward[2], 0, 0, 0, 0, 1);
         const startQuat = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .mat4.getRotation */ .pB.getRotation(gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.create */ .Yu.create(), startMatrix);
         const targetQuat = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .mat4.getRotation */ .pB.getRotation(gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.create */ .Yu.create(), targetMatrix);
         let dotProduct = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.dot */ .Yu.dot(startQuat, targetQuat);
@@ -13063,13 +13094,21 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
         if (dotProduct > threshold) {
             return;
         }
-        const steps = 10;
         const duration = 150;
-        const stepDuration = duration / steps;
-        let currentStep = 0;
-        const animate = () => {
-            currentStep++;
-            const t = currentStep / steps;
+        const animationStart = performance.now();
+        const finalNormal = [
+            targetForward[0],
+            targetForward[1],
+            targetForward[2],
+        ];
+        const finalUp = [targetUp[0], targetUp[1], targetUp[2]];
+        const animate = (now) => {
+            if (this.animationTokens.get(viewportId) !== nextToken) {
+                return;
+            }
+            const elapsed = now - animationStart;
+            const t = Math.min(1, elapsed / duration);
+            const isLastStep = t >= 1;
             const easedT = t < 0.5 ? 2 * t * t : 1 - Math.pow(-2 * t + 2, 2) / 2;
             const interpolatedQuat = gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.create */ .Yu.create();
             gl_matrix__WEBPACK_IMPORTED_MODULE_4__/* .quat.slerp */ .Yu.slerp(interpolatedQuat, startQuat, targetQuat, easedT);
@@ -13078,16 +13117,21 @@ class OrientationControllerTool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Ba
             const interpolatedForward = interpolatedMatrix.slice(8, 11);
             const interpolatedUp = interpolatedMatrix.slice(4, 7);
             viewport.setCamera({
-                viewPlaneNormal: interpolatedForward,
-                viewUp: interpolatedUp,
+                viewPlaneNormal: isLastStep ? finalNormal : interpolatedForward,
+                viewUp: isLastStep ? finalUp : interpolatedUp,
             });
             viewport.resetCamera(ANIMATE_RESET_CAMERA_OPTIONS);
             viewport.render();
-            if (currentStep < steps) {
-                setTimeout(animate, stepDuration);
+            if (!isLastStep) {
+                const handle = requestAnimationFrame(animate);
+                this.animationFrameHandles.set(viewportId, handle);
+            }
+            else {
+                this.animationFrameHandles.delete(viewportId);
             }
         };
-        animate();
+        const handle = requestAnimationFrame(animate);
+        this.animationFrameHandles.set(viewportId, handle);
     }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (OrientationControllerTool);
@@ -16524,6 +16568,8 @@ VolumeCroppingControlTool.toolName = 'VolumeCroppingControl';
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(29857);
 /* harmony import */ var _utilities_volumeCropping__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(88380);
 /* harmony import */ var _utilities_draw3D__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(68304);
+/* harmony import */ var _utilities_interactionDragCoordinator__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(51970);
+
 
 
 
@@ -16567,6 +16613,7 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
         this.originalClippingPlanes = [];
         this.draggingSphereIndex = null;
         this.rotatePlanesOnDrag = false;
+        this.suppressPlaneRotationForCurrentDrag = false;
         this.cornerDragOffset = null;
         this.faceDragOffset = null;
         this.volumeDirectionVectors = null;
@@ -16589,8 +16636,11 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
             const { element } = eventDetail;
             const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_8__.getEnabledElement)(element);
             const { viewport } = enabledElement;
-            const actorEntry = viewport.getDefaultActor();
-            const actor = actorEntry.actor;
+            this.suppressPlaneRotationForCurrentDrag = (0,_utilities_interactionDragCoordinator__WEBPACK_IMPORTED_MODULE_13__/* .isDragOwnedBy */ .lq)(viewport.id, 'orientation-controller');
+            const actor = this._getVolumeActor(viewport);
+            if (!actor) {
+                return false;
+            }
             const mapper = actor.getMapper();
             const mouseCanvas = [
                 evt.detail.currentPoints.canvas[0],
@@ -16661,6 +16711,7 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
                     this.draggingSphereIndex = null;
                     this.cornerDragOffset = null;
                     this.faceDragOffset = null;
+                    this.suppressPlaneRotationForCurrentDrag = false;
                     viewport.render();
                     this._hasResolutionChanged = false;
                 };
@@ -16818,12 +16869,12 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
             if (!viewport) {
                 return;
             }
-            const volumeActors = viewport.getActors();
-            if (!volumeActors || volumeActors.length === 0) {
+            const volumeActor = this._getVolumeActor(viewport);
+            if (!volumeActor) {
                 console.warn('VolumeCroppingTool: No volume actors found in the viewport.');
                 return;
             }
-            const imageData = volumeActors[0].actor.getMapper().getInputData();
+            const imageData = volumeActor.getMapper().getInputData();
             if (!imageData) {
                 console.warn('VolumeCroppingTool: No image data found for volume actor.');
                 return;
@@ -16945,9 +16996,7 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
                     this.edgeLines[uid] = { actor, source, key1, key2 };
                 }
             });
-            const mapper = viewport
-                .getDefaultActor()
-                .actor.getMapper();
+            const mapper = volumeActor.getMapper();
             mapper.addClippingPlane(planeXMin);
             mapper.addClippingPlane(planeXMax);
             mapper.addClippingPlane(planeYMin);
@@ -17294,6 +17343,23 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
     getHandlesVisible() {
         return this.configuration.showHandles;
     }
+    setHandleRadius(radius) {
+        this.configuration.sphereRadius = radius;
+        this.sphereStates.forEach((state) => {
+            if (state?.sphereSource?.setRadius) {
+                state.sphereSource.setRadius(radius);
+                state.sphereSource.modified();
+            }
+        });
+        const viewportsInfo = this._getViewportsInfo();
+        const [viewport3D] = viewportsInfo;
+        if (!viewport3D) {
+            return;
+        }
+        const renderingEngine = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_8__.getRenderingEngine)(viewport3D.renderingEngineId);
+        const viewport = renderingEngine?.getViewport(viewport3D.viewportId);
+        viewport?.render();
+    }
     getClippingPlanesVisible() {
         return this.configuration.showClippingPlanes;
     }
@@ -17329,7 +17395,8 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
         }
         else {
             const shiftKey = evt.detail.event?.shiftKey ?? false;
-            if (this.rotatePlanesOnDrag === true || shiftKey) {
+            if ((this.rotatePlanesOnDrag === true || shiftKey) &&
+                !this.suppressPlaneRotationForCurrentDrag) {
                 this._rotateClippingPlanes(evt);
                 return;
             }
@@ -17387,9 +17454,11 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
         }
     }
     _updateClippingPlanes(viewport) {
-        const actorEntry = viewport.getDefaultActor();
-        const actor = actorEntry.actor;
-        const mapper = actor.getMapper();
+        const actor = this._getVolumeActor(viewport);
+        const mapper = this._getVolumeMapper(viewport);
+        if (!actor || !mapper) {
+            return;
+        }
         const matrix = actor.getMatrix();
         if (!this.configuration.showClippingPlanes) {
             mapper.removeAllClippingPlanes();
@@ -17526,7 +17595,10 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
     }
     _getVolumeActor(viewport) {
         const vp = viewport || this._getViewport();
-        return vp?.getDefaultActor()?.actor;
+        return vp
+            ?.getActors?.()
+            ?.find((entry) => entry.actor?.getClassName?.() === 'vtkVolume')
+            ?.actor;
     }
     _getVolumeMapper(viewport) {
         const actor = this._getVolumeActor(viewport);
@@ -17543,7 +17615,10 @@ class VolumeCroppingTool extends _base__WEBPACK_IMPORTED_MODULE_7__/* .BaseTool
         }
     }
     _updateClippingPlanesFromFaceSpheres(viewport) {
-        const mapper = viewport.getDefaultActor().actor.getMapper();
+        const mapper = this._getVolumeMapper(viewport);
+        if (!mapper) {
+            return;
+        }
         this.originalClippingPlanes[_utilities_volumeCropping__WEBPACK_IMPORTED_MODULE_11__.PLANEINDEX.XMIN].origin = [
             ...this.sphereStates[_utilities_volumeCropping__WEBPACK_IMPORTED_MODULE_11__.SPHEREINDEX.XMIN].point,
         ];
@@ -47473,7 +47548,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   r: () => (/* binding */ version)
 /* harmony export */ });
-const version = '4.21.7';
+const version = '4.22.3';
 
 
 /***/ },