@ohif/app 3.8.0-beta.80 → 3.8.0-beta.82

package/dist/{121.bundle.787f5a848ed632a4d5fc.js → 121.bundle.47f05840a5b3cdf75543.js}

@@ -257,7 +257,10 @@ function OHIFCornerstoneRTViewport(props) {
         orientation: viewportOptions.orientation,
         viewportId: viewportOptions.viewportId
       },
-      onElementEnabled: onElementEnabled,
+      onElementEnabled: evt => {
+        props.onElementEnabled?.(evt);
+        onElementEnabled(evt);
+      },
       onElementDisabled: onElementDisabled
     }));
   }, [viewportId, rtDisplaySet, toolGroupId]);

package/dist/{183.bundle.72bf18ad23ee6624986d.js → 183.bundle.a3e238998be71c4b2af8.js}

@@ -9019,6 +9019,7 @@ class AnnotationTool extends _AnnotationDisplayTool__WEBPACK_IMPORTED_MODULE_2__
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
         const { viewport } = enabledElement;
         const { data } = annotation;
+        const { isCanvasAnnotation } = data;
         const { points, textBox } = data.handles;
         if (textBox) {
             const { worldBoundingBox } = textBox;
@@ -9040,7 +9041,9 @@ class AnnotationTool extends _AnnotationDisplayTool__WEBPACK_IMPORTED_MODULE_2__
         }
         for (let i = 0; i < points?.length; i++) {
             const point = points[i];
-            const annotationCanvasCoordinate = viewport.worldToCanvas(point);
+            const annotationCanvasCoordinate = isCanvasAnnotation
+                ? point.slice(0, 2)
+                : viewport.worldToCanvas(point);
             const near = gl_matrix__WEBPACK_IMPORTED_MODULE_1__/* .vec2.distance */ .Zc.distance(canvasCoords, annotationCanvasCoordinate) < proximity;
             if (near === true) {
                 data.handles.activeHandleIndex = i;
@@ -9490,6 +9493,11 @@ function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLU
     const { activeSegmentIndex } = _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__.getSegmentation(segmentationRepresentation.segmentationId);
     const outlineWidths = new Array(numColors - 1);
     for (let i = 1; i < numColors; i++) {
+        const isHidden = segmentsHidden.has(i);
+        if (isHidden) {
+            outlineWidths[i - 1] = 0;
+            continue;
+        }
         outlineWidths[i - 1] =
             i === activeSegmentIndex
                 ? outlineWidth + toolGroupLabelmapConfig.activeSegmentOutlineWidthDelta
@@ -12138,8 +12146,8 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             shadow: true,
             magnifyingGlass: {
                 radius: 125,
-                zoomFactor: 2.5,
-                zoomFactorList: [2.5, 3, 3.5, 4, 4.5, 5],
+                zoomFactor: 3,
+                zoomFactorList: [1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5],
                 autoPan: {
                     enabled: true,
                     padding: 10,
@@ -12168,7 +12176,7 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             const canvasPos = currentPoints.canvas;
             const { magnifyingGlass: config } = this.configuration;
             const { radius, zoomFactor, autoPan } = config;
-            const worldHandlesPoints = this._getWorldHandlesPoints(viewport, canvasPos, radius);
+            const canvasHandlePoints = this._getCanvasHandlePoints(canvasPos, radius);
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
             const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
@@ -12190,8 +12198,9 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                     sourceViewportId: viewport.id,
                     magnifyViewportId,
                     zoomFactor,
+                    isCanvasAnnotation: true,
                     handles: {
-                        points: worldHandlesPoints,
+                        points: canvasHandlePoints,
                         activeHandleIndex: null,
                     },
                 },
@@ -12207,11 +12216,12 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                     padding: autoPan.padding,
                     callback: (data) => {
                         const annotationPoints = annotation.data.handles.points;
-                        const { world: worldDelta } = data.delta;
+                        const { canvas: canvasDelta } = data.delta;
                         for (let i = 0, len = annotationPoints.length; i < len; i++) {
-                            annotationPoints[i][0] += worldDelta[0];
-                            annotationPoints[i][1] += worldDelta[1];
-                            annotationPoints[i][2] += worldDelta[2];
+                            const point = annotationPoints[i];
+                            point[0] += canvasDelta[0];
+                            point[1] += canvasDelta[1];
+                            annotation.invalidated = true;
                         }
                     },
                 },
@@ -12232,11 +12242,9 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             });
         };
         this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
-            const enabledElement = (0,esm.getEnabledElement)(element);
-            const { viewport } = enabledElement;
             const { data } = annotation;
             const { points } = data.handles;
-            const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+            const canvasCoordinates = points;
             const canvasTop = canvasCoordinates[0];
             const canvasBottom = canvasCoordinates[2];
             const canvasLeft = canvasCoordinates[3];
@@ -12246,7 +12254,7 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                 canvasTop[1] + radius,
             ];
             const radiusPoint = (0,circle/* getCanvasCircleRadius */.r)([center, canvasCoords]);
-            if (Math.abs(radiusPoint - radius) < proximity * 1.5) {
+            if (Math.abs(radiusPoint - radius) < proximity * 2) {
                 return true;
             }
             return false;
@@ -12308,15 +12316,14 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             this.isDrawing = true;
             const eventDetail = evt.detail;
             const { element, deltaPoints } = eventDetail;
-            const worldPosDelta = deltaPoints?.world ?? [0, 0, 0];
+            const canvasDelta = deltaPoints?.canvas ?? [0, 0, 0];
             const enabledElement = (0,esm.getEnabledElement)(element);
             const { renderingEngine } = enabledElement;
             const { annotation, viewportIdsToRender } = this.editData;
             const { points } = annotation.data.handles;
             points.forEach((point) => {
-                point[0] += worldPosDelta[0];
-                point[1] += worldPosDelta[1];
-                point[2] += worldPosDelta[2];
+                point[0] += canvasDelta[0];
+                point[1] += canvasDelta[1];
             });
             annotation.invalidated = true;
             this.editData.hasMoved = true;
@@ -12330,12 +12337,11 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             const { data } = annotation;
             if (handleIndex === undefined) {
                 const { deltaPoints } = eventDetail;
-                const worldPosDelta = deltaPoints.world;
+                const canvasDelta = deltaPoints.canvas;
                 const points = data.handles.points;
                 points.forEach((point) => {
-                    point[0] += worldPosDelta[0];
-                    point[1] += worldPosDelta[1];
-                    point[2] += worldPosDelta[2];
+                    point[0] += canvasDelta[0];
+                    point[1] += canvasDelta[1];
                 });
                 annotation.invalidated = true;
             }
@@ -12349,14 +12355,10 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
         };
         this._dragHandle = (evt) => {
             const eventDetail = evt.detail;
-            const { element } = eventDetail;
-            const enabledElement = (0,esm.getEnabledElement)(element);
-            const { viewport } = enabledElement;
-            const { worldToCanvas } = viewport;
             const { annotation } = this.editData;
             const { data } = annotation;
             const { points } = data.handles;
-            const canvasCoordinates = points.map((p) => worldToCanvas(p));
+            const canvasCoordinates = points;
             const canvasTop = canvasCoordinates[0];
             const canvasBottom = canvasCoordinates[2];
             const canvasLeft = canvasCoordinates[3];
@@ -12371,11 +12373,11 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                 canvasCenter,
                 currentCanvasPoints,
             ]);
-            const newWorldHandlesPoints = this._getWorldHandlesPoints(viewport, canvasCenter, newRadius);
-            points[0] = newWorldHandlesPoints[0];
-            points[1] = newWorldHandlesPoints[1];
-            points[2] = newWorldHandlesPoints[2];
-            points[3] = newWorldHandlesPoints[3];
+            const newCanvasHandlePoints = this._getCanvasHandlePoints(canvasCenter, newRadius);
+            points[0] = newCanvasHandlePoints[0];
+            points[1] = newCanvasHandlePoints[1];
+            points[2] = newCanvasHandlePoints[2];
+            points[3] = newCanvasHandlePoints[3];
         };
         this.cancel = (element) => {
             if (!this.isDrawing) {
@@ -12423,10 +12425,10 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             if (!annotations?.length) {
                 return renderStatus;
             }
-            annotations = this.filterInteractableAnnotationsForElement(element, annotations);
             annotations = annotations?.filter((annotation) => annotation.data.sourceViewportId ===
                 viewport.id);
-            if (!annotations?.length) {
+            const filteredAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
+            if (!filteredAnnotations?.length) {
                 return renderStatus;
             }
             const styleSpecifier = {
@@ -12434,8 +12436,8 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                 toolName: this.getToolName(),
                 viewportId: enabledElement.viewport.id,
             };
-            for (let i = 0; i < annotations.length; i++) {
-                const annotation = annotations[i];
+            for (let i = 0; i < filteredAnnotations.length; i++) {
+                const annotation = filteredAnnotations[i];
                 const { annotationUID, data } = annotation;
                 const { magnifyViewportId, zoomFactor, handles } = data;
                 const { points, activeHandleIndex } = handles;
@@ -12443,7 +12445,7 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
                 const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
                 const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
                 const color = this.getStyle('color', styleSpecifier, annotation);
-                const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+                const canvasCoordinates = points;
                 const canvasTop = canvasCoordinates[0];
                 const canvasBottom = canvasCoordinates[2];
                 const canvasLeft = canvasCoordinates[3];
@@ -12486,15 +12488,13 @@ class AdvancedMagnifyTool extends base/* AnnotationTool */.EC {
             }
             return renderStatus;
         };
-        this._getWorldHandlesPoints = (viewport, canvasCenterPos, canvasRadius) => {
-            const canvasHandlesPoints = [
-                [canvasCenterPos[0], canvasCenterPos[1] - canvasRadius],
-                [canvasCenterPos[0] + canvasRadius, canvasCenterPos[1]],
-                [canvasCenterPos[0], canvasCenterPos[1] + canvasRadius],
-                [canvasCenterPos[0] - canvasRadius, canvasCenterPos[1]],
+        this._getCanvasHandlePoints = (canvasCenterPos, canvasRadius) => {
+            return [
+                [canvasCenterPos[0], canvasCenterPos[1] - canvasRadius, 0],
+                [canvasCenterPos[0] + canvasRadius, canvasCenterPos[1], 0],
+                [canvasCenterPos[0], canvasCenterPos[1] + canvasRadius, 0],
+                [canvasCenterPos[0] - canvasRadius, canvasCenterPos[1], 0],
             ];
-            const worldHandlesPoints = canvasHandlesPoints.map((p) => viewport.canvasToWorld(p));
-            return worldHandlesPoints;
         };
         this.magnifyViewportManager = AdvancedMagnifyViewportManager/* default */.A.getInstance();
     }
@@ -22131,7 +22131,11 @@ class OrientationMarkerTool extends base/* BaseTool */.oS {
         }
         let viewports = renderingEngine.getViewports();
         viewports = (0,viewportFilters.filterViewportsWithToolEnabled)(viewports, this.getToolName());
-        viewports.forEach((viewport) => this.addAxisActorInViewport(viewport));
+        viewports.forEach((viewport) => {
+            if (!viewport.getWidget(this.getToolName())) {
+                this.addAxisActorInViewport(viewport);
+            }
+        });
     }
     async addAxisActorInViewport(viewport) {
         const viewportId = viewport.id;
@@ -22172,6 +22176,7 @@ class OrientationMarkerTool extends base/* BaseTool */.oS {
             orientationWidget,
             actor,
         };
+        viewport.addWidget(this.getToolName(), orientationWidget);
         renderWindow.render();
         viewport.getRenderingEngine().render();
         this.configuration_invalidated = false;
@@ -22453,7 +22458,6 @@ class BrushTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .BaseTool */ .oS {
             strategySpecificConfiguration: {
                 THRESHOLD: {
                     threshold: [-150, -70],
-                    dynamicRadius: 0,
                 },
             },
             defaultStrategy: 'FILL_INSIDE_CIRCLE',
@@ -22634,6 +22638,18 @@ class BrushTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .BaseTool */ .oS {
         if ((0,_strategies_utils_stackVolumeCheck__WEBPACK_IMPORTED_MODULE_12__/* .isVolumeSegmentation */ .r)(labelmapData, viewport)) {
             const { volumeId } = representationData[type];
             const actors = viewport.getActors();
+            const isStackViewport = viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.StackViewport;
+            if (isStackViewport) {
+                const event = new CustomEvent(_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.Enums.Events.ERROR_EVENT, {
+                    detail: {
+                        type: 'Segmentation',
+                        message: 'Cannot perform brush operation on the selected viewport',
+                    },
+                    cancelable: true,
+                });
+                _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget.dispatchEvent(event);
+                return null;
+            }
             const volumes = actors.map((actorEntry) => _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolume(actorEntry.referenceId));
             const segmentationVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.getVolume(volumeId);
             const referencedVolumeIdToThreshold = volumes.find((volume) => _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isEqual(volume.dimensions, segmentationVolume.dimensions))?.volumeId || volumes[0]?.volumeId;
@@ -24735,10 +24751,10 @@ function playClip(element, playClipOptions) {
     };
     triggerEvent(element, events.CLIP_STARTED, eventDetail);
 }
-function stopClip(element, viewportId) {
+function stopClip(element, options = {}) {
     _stopClip(element, {
         stopDynamicCine: true,
-        viewportId,
+        ...options,
     });
 }
 function _stopClip(element, options = { stopDynamicCine: true, viewportId: undefined }) {

package/dist/{206.bundle.f957e0d1cdff66dbac69.js → 206.bundle.279366b01ccb5b9ed76d.js}

@@ -2750,8 +2750,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.80";
-  const commitHash = "e80fc6f47708e1d6b1a1e1de438196a4b74ec637";
+  const versionNumber = "3.8.0-beta.82";
+  const commitHash = "3754c224b4dab28182adb0a41e37d890942144d8";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -2770,6 +2770,7 @@ function ViewerHeader({
     onClick: () => show({
       title: t('UserPreferencesModal:User preferences'),
       content: ui_src/* UserPreferences */.im,
+      containerDimensions: 'w-[70%] max-w-[900px]',
       contentProps: {
         hotkeyDefaults: hotkeysManager.getValidHotkeyDefinitions(hotkeyDefaults),
         hotkeyDefinitions,
@@ -3419,14 +3420,10 @@ function _createStudyBrowserTabs(primaryStudyInstanceUIDs, studyDisplayList, dis
 function getImageSrcFromImageId(cornerstone, imageId) {
   return new Promise((resolve, reject) => {
     const canvas = document.createElement('canvas');
-    // Note: the default width and height of the canvas is 300x150
-    // but we need to set the width and height to the same number since
-    // the thumbnails are usually square and we want to maintain the aspect ratio
-    canvas.width = 128 / window.devicePixelRatio;
-    canvas.height = 128 / window.devicePixelRatio;
     cornerstone.utilities.loadImageToCanvas({
       canvas,
-      imageId
+      imageId,
+      thumbnail: true
     }).then(imageId => {
       resolve(canvas.toDataURL());
     }).catch(reject);
@@ -4003,7 +4000,7 @@ function PanelMeasurementTable({
   })), /*#__PURE__*/react.createElement("div", {
     className: "flex justify-center p-4"
   }, /*#__PURE__*/react.createElement(ui_src/* ActionButtons */.wr, {
-    t: t('MeasurementTable'),
+    t: t,
     actions: [{
       label: 'Export',
       onClick: exportReport
@@ -4503,7 +4500,6 @@ function getSopClassUids(instances) {
   return sopClassUids;
 }
 function _getDisplaySetsFromSeries(instances) {
-  debugger;
   // If the series has no instances, stop here
   if (!instances || !instances.length) {
     throw new Error('No instances were provided');
@@ -4770,18 +4766,39 @@ const defaultCommonPresets = [{
     numCols: 3
   }
 }];
-const generateAdvancedPresets = hangingProtocolService => {
+const _areSelectorsValid = (hp, displaySets, hangingProtocolService) => {
+  if (!hp.displaySetSelectors || Object.values(hp.displaySetSelectors).length === 0) {
+    return true;
+  }
+  return hangingProtocolService.areRequiredSelectorsValid(Object.values(hp.displaySetSelectors), displaySets[0]);
+};
+const generateAdvancedPresets = ({
+  servicesManager
+}) => {
+  const {
+    hangingProtocolService,
+    viewportGridService,
+    displaySetService
+  } = servicesManager.services;
   const hangingProtocols = Array.from(hangingProtocolService.protocols.values());
+  const viewportId = viewportGridService.getActiveViewportId();
+  if (!viewportId) {
+    return [];
+  }
+  const displaySetInsaneUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
+  const displaySets = displaySetInsaneUIDs.map(uid => displaySetService.getDisplaySetByUID(uid));
   return hangingProtocols.map(hp => {
     if (!hp.isPreset) {
       return null;
     }
+    const areValid = _areSelectorsValid(hp, displaySets, hangingProtocolService);
     return {
       icon: hp.icon,
       title: hp.name,
       commandOptions: {
         protocolId: hp.id
-      }
+      },
+      disabled: !areValid
     };
   }).filter(preset => preset !== null);
 };
@@ -4833,11 +4850,12 @@ function LayoutSelector({
 }) {
   const [isOpen, setIsOpen] = (0,react.useState)(false);
   const {
-    customizationService,
-    hangingProtocolService
+    customizationService
   } = servicesManager.services;
   const commonPresets = customizationService.get('commonPresets') || defaultCommonPresets;
-  const advancedPresets = customizationService.get('advancedPresets') || generateAdvancedPresets(hangingProtocolService);
+  const advancedPresets = customizationService.get('advancedPresets') || generateAdvancedPresets({
+    servicesManager
+  });
   const closeOnOutsideClick = () => {
     if (isOpen) {
       setIsOpen(false);
@@ -4886,6 +4904,7 @@ function LayoutSelector({
       classNames: "hover:bg-primary-dark group flex gap-2 p-1 cursor-pointer",
       icon: preset.icon,
       title: preset.title,
+      disabled: preset.disabled,
       commandOptions: preset.commandOptions,
       onSelection: onSelectionPreset
     })))), /*#__PURE__*/react.createElement("div", {
@@ -5010,6 +5029,7 @@ function ToolbarButtonGroupWithServices({
     label: item.label,
     disabled: item.disabled,
     className: item.className,
+    disabledText: item.disabledText,
     id: item.id,
     size: size,
     onClick: () => {
@@ -5547,7 +5567,10 @@ const defaultContextMenu = {
     items: [{
       label: 'Delete measurement',
       commands: [{
-        commandName: 'deleteMeasurement'
+        commandName: 'deleteMeasurement',
+        // we only have support for cornerstoneTools context menu since
+        // they are svg based
+        context: 'CORNERSTONE'
       }]
     }, {
       label: 'Add Label',
@@ -6490,7 +6513,8 @@ const commandsModule = ({
      */
     setViewportGridLayout: ({
       numRows,
-      numCols
+      numCols,
+      isHangingProtocolLayout = false
     }) => {
       const {
         protocol
@@ -6514,7 +6538,8 @@ const commandsModule = ({
         viewportGridService.setLayout({
           numRows,
           numCols,
-          findOrCreateViewport
+          findOrCreateViewport,
+          isHangingProtocolLayout
         });
         stateSyncService.store(stateReduce);
       };
@@ -6579,7 +6604,8 @@ const commandsModule = ({
           numCols: toggleOneUpViewportGridStore.layout.numCols,
           activeViewportId: viewportIdToUpdate,
           layoutOptions,
-          findOrCreateViewport
+          findOrCreateViewport,
+          isHangingProtocolLayout: true
         });
       } else {
         // We are not in one-up, so toggle to one up.
@@ -6603,7 +6629,8 @@ const commandsModule = ({
         viewportGridService.setLayout({
           numRows: 1,
           numCols: 1,
-          findOrCreateViewport
+          findOrCreateViewport,
+          isHangingProtocolLayout: true
         });
 
         // Subscribe to ANY (i.e. manual and hanging protocol) layout changes so that
@@ -6661,7 +6688,7 @@ const commandsModule = ({
           displaySetInstanceUID,
           onClose: UIModalService.hide
         },
-        containerDimensions: 'max-w-4xl max-h-4xl',
+        containerDimensions: 'w-[70%] max-w-[900px]',
         title: 'DICOM Tag Browser'
       });
     },