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

package/dist/{295.bundle.6f734abf8fa85b1a310d.js → 295.bundle.5ace95771ced62bdcab8.js}

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

package/dist/{325.bundle.84909a08305556e9f924.js → 325.bundle.fd8e0c18db4708d03a91.js}

@@ -802,8 +802,8 @@ function promptSaveReport({
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptSaveReport = (promptSaveReport);
-// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 15 modules
-var cornerstone_dicom_sr_src = __webpack_require__(53540);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 14 modules
+var cornerstone_dicom_sr_src = __webpack_require__(61669);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js
 
 
@@ -1854,14 +1854,10 @@ function _findTabAndStudyOfDisplaySet(displaySetInstanceUID, tabs) {
 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);

package/dist/{335.bundle.c39d4aefe33aecab958f.js → 335.bundle.8400aa5a88697a6b9d53.js}

@@ -1026,8 +1026,8 @@ function PanelRoiThresholdSegmentation({
     const suvPeak = cachedStats?.['1']?.suvPeak?.suvPeak;
     if (Number.isNaN(suvPeak)) {
       uiNotificationService.show({
-        title: 'Unable to calculate SUV Peak',
-        message: 'The resulting threshold is not big enough.',
+        title: 'SUV Peak',
+        message: 'Segmented volume does not allow SUV Peak calculation',
         type: 'warning'
       });
     }

package/dist/{41.bundle.7c943bb857ed37831905.js → 41.bundle.0905b258a90a7c6437bb.js}

@@ -3974,8 +3974,8 @@ function initCineService(servicesManager) {
   const playClip = (element, playClipOptions) => {
     return dist_esm.utilities.cine.playClip(element, playClipOptions);
   };
-  const stopClip = element => {
-    return dist_esm.utilities.cine.stopClip(element);
+  const stopClip = (element, stopClipOptions) => {
+    return dist_esm.utilities.cine.stopClip(element, stopClipOptions);
   };
   cineService.setServiceImplementation({
     getSyncedViewports,
@@ -4097,20 +4097,28 @@ function interleaveCenterLoader({
    * listen to it and as the other viewports are created we can set the volumes for them
    * since volumes are already started loading.
    */
-  if (matchDetails.size !== viewportIdVolumeInputArrayMap.size) {
-    return;
-  }
-
-  // Check if all the matched volumes are loaded
-  for (const [_, details] of displaySetsMatchDetails.entries()) {
+  const uniqueViewportVolumeDisplaySetUIDs = new Set();
+  viewportIdVolumeInputArrayMap.forEach((volumeInputArray, viewportId) => {
+    volumeInputArray.forEach(volumeInput => {
+      const {
+        volumeId
+      } = volumeInput;
+      uniqueViewportVolumeDisplaySetUIDs.add(volumeId);
+    });
+  });
+  const uniqueMatchedDisplaySetUIDs = new Set();
+  matchDetails.forEach(matchDetail => {
     const {
-      SeriesInstanceUID
-    } = details;
-
-    // HangingProtocol has matched, but don't have all the volumes created yet, so return
-    if (!Array.from(volumeIdMapsToLoad.values()).includes(SeriesInstanceUID)) {
-      return;
-    }
+      displaySetsInfo
+    } = matchDetail;
+    displaySetsInfo.forEach(({
+      displaySetInstanceUID
+    }) => {
+      uniqueMatchedDisplaySetUIDs.add(displaySetInstanceUID);
+    });
+  });
+  if (uniqueViewportVolumeDisplaySetUIDs.size !== uniqueMatchedDisplaySetUIDs.size) {
+    return;
   }
   const volumeIds = Array.from(volumeIdMapsToLoad.keys()).slice();
   // get volumes from cache
@@ -4413,21 +4421,28 @@ function interleaveTopToBottom({
    * listen to it and as the other viewports are created we can set the volumes for them
    * since volumes are already started loading.
    */
-  if (filteredMatchDetails.length !== interleaveTopToBottom_viewportIdVolumeInputArrayMap.size) {
-    return;
-  }
-
-  // Check if all the matched volumes are loaded
-  for (const [_, details] of displaySetsMatchDetails.entries()) {
+  const uniqueViewportVolumeDisplaySetUIDs = new Set();
+  interleaveTopToBottom_viewportIdVolumeInputArrayMap.forEach((volumeInputArray, viewportId) => {
+    volumeInputArray.forEach(volumeInput => {
+      const {
+        volumeId
+      } = volumeInput;
+      uniqueViewportVolumeDisplaySetUIDs.add(volumeId);
+    });
+  });
+  const uniqueMatchedDisplaySetUIDs = new Set();
+  matchDetails.forEach(matchDetail => {
     const {
-      SeriesInstanceUID,
+      displaySetsInfo
+    } = matchDetail;
+    displaySetsInfo.forEach(({
       displaySetInstanceUID
-    } = details;
-
-    // HangingProtocol has matched, but don't have all the volumes created yet, so return
-    if (displaySetsToLoad.has(displaySetInstanceUID) && !Array.from(interleaveTopToBottom_volumeIdMapsToLoad.values()).includes(SeriesInstanceUID)) {
-      return;
-    }
+    }) => {
+      uniqueMatchedDisplaySetUIDs.add(displaySetInstanceUID);
+    });
+  });
+  if (uniqueViewportVolumeDisplaySetUIDs.size !== uniqueMatchedDisplaySetUIDs.size) {
+    return;
   }
   const volumeIds = Array.from(interleaveTopToBottom_volumeIdMapsToLoad.keys()).slice();
   // get volumes from cache
@@ -4824,6 +4839,7 @@ const colormaps = [{
 
 
 
+
 const {
   registerColormap
 } = esm.utilities.colormap;
@@ -5053,6 +5069,22 @@ async function init({
   esm.eventTarget.addEventListener(esm.EVENTS.ELEMENT_ENABLED, elementEnabledHandler.bind(null));
   esm.eventTarget.addEventListener(esm.EVENTS.ELEMENT_DISABLED, elementDisabledHandler.bind(null));
   colormaps.forEach(registerColormap);
+
+  // Create a debounced function that shows the notification
+  const debouncedShowNotification = (0,lodash.debounce)(detail => {
+    uiNotificationService.show({
+      title: detail.type,
+      message: detail.message,
+      type: 'error'
+    });
+  }, 300);
+
+  // Event listener
+  esm.eventTarget.addEventListener(esm.EVENTS.ERROR_EVENT, ({
+    detail
+  }) => {
+    debouncedShowNotification(detail);
+  });
 }
 function CPUModal() {
   return /*#__PURE__*/react.createElement("div", null, /*#__PURE__*/react.createElement("p", null, "Your computer does not have enough GPU power to support the default GPU rendering mode. OHIF has switched to CPU rendering mode. Please note that CPU rendering does not support all features such as Volume Rendering, Multiplanar Reconstruction, and Segmentation Overlays."));
@@ -5940,7 +5972,8 @@ const CornerstoneViewportDownloadForm = ({
   const activeViewportEnabledElement = (0,esm.getEnabledElement)(activeViewportElement);
   const {
     viewportId: activeViewportId,
-    renderingEngineId
+    renderingEngineId,
+    viewport: activeViewport
   } = activeViewportEnabledElement;
   const toolGroup = dist_esm.ToolGroupManager.getToolGroupForViewport(activeViewportId, renderingEngineId);
   const toolModeAndBindings = Object.keys(toolGroup.toolOptions).reduce((acc, toolName) => {
@@ -6012,7 +6045,7 @@ const CornerstoneViewportDownloadForm = ({
     renderingEngine.resize();
 
     // Trigger the render on the viewport to update the on screen
-    downloadViewport.resetCamera();
+    // downloadViewport.resetCamera();
     downloadViewport.render();
     downloadViewportElement.addEventListener(esm.Enums.Events.IMAGE_RENDERED, function updateViewport(event) {
       const enabledElement = (0,esm.getEnabledElement)(event.target);
@@ -6038,6 +6071,12 @@ const CornerstoneViewportDownloadForm = ({
         height: newHeight
       });
       downloadViewportElement.removeEventListener(esm.Enums.Events.IMAGE_RENDERED, updateViewport);
+
+      // for some reason we need a reset camera here, and I don't know why
+      downloadViewport.resetCamera();
+      const presentation = activeViewport.getViewPresentation();
+      downloadViewport.setView(activeViewport.getViewReference(), presentation);
+      downloadViewport.render();
     });
   });
   const loadImage = (activeViewportElement, viewportElement, width, height) => new Promise(resolve => {
@@ -6074,7 +6113,6 @@ const CornerstoneViewportDownloadForm = ({
         actors.forEach(actor => {
           downloadViewport.addActor(actor);
         });
-        downloadViewport.setCamera(viewport.getCamera());
         downloadViewport.render();
         const newWidth = Math.min(width || image.width, MAX_TEXTURE_SIZE);
         const newHeight = Math.min(height || image.height, MAX_TEXTURE_SIZE);
@@ -6365,6 +6403,10 @@ function commandsModule({
   function _getActiveViewportEnabledElement() {
     return getActiveViewportEnabledElement(viewportGridService);
   }
+  function _getActiveViewportToolGroupId() {
+    const viewport = _getActiveViewportEnabledElement();
+    return toolGroupService.getToolGroupForViewport(viewport.id);
+  }
   const actions = {
     /**
      * Generates the selector props for the context menu, specific to
@@ -6641,47 +6683,45 @@ function commandsModule({
     toggleEnabledDisabledToolbar({
       value,
       itemId,
-      toolGroupIds = []
+      toolGroupId
     }) {
       const toolName = itemId || value;
-      toolGroupIds = toolGroupIds.length ? toolGroupIds : toolGroupService.getToolGroupIds();
-      toolGroupIds.forEach(toolGroupId => {
-        const toolGroup = toolGroupService.getToolGroup(toolGroupId);
-        if (!toolGroup || !toolGroup.hasTool(toolName)) {
-          return;
-        }
-        const toolIsEnabled = toolGroup.getToolOptions(toolName).mode === dist_esm.Enums.ToolModes.Enabled;
-        toolIsEnabled ? toolGroup.setToolDisabled(toolName) : toolGroup.setToolEnabled(toolName);
-      });
+      toolGroupId = toolGroupId ?? _getActiveViewportToolGroupId();
+      const toolGroup = toolGroupService.getToolGroup(toolGroupId);
+      if (!toolGroup || !toolGroup.hasTool(toolName)) {
+        return;
+      }
+      const toolIsEnabled = toolGroup.getToolOptions(toolName).mode === dist_esm.Enums.ToolModes.Enabled;
+      toolIsEnabled ? toolGroup.setToolDisabled(toolName) : toolGroup.setToolEnabled(toolName);
     },
     toggleActiveDisabledToolbar({
       value,
       itemId,
-      toolGroupIds = []
+      toolGroupId
     }) {
       const toolName = itemId || value;
-      toolGroupIds = toolGroupIds.length ? toolGroupIds : toolGroupService.getToolGroupIds();
-      toolGroupIds.forEach(toolGroupId => {
-        const toolGroup = toolGroupService.getToolGroup(toolGroupId);
-        if (!toolGroup || !toolGroup.hasTool(toolName)) {
-          return;
-        }
-        const toolIsActive = toolGroup.getToolOptions(toolName).mode === dist_esm.Enums.ToolModes.Active;
-        toolIsActive ? toolGroup.setToolDisabled(toolName) : actions.setToolActive({
-          toolName,
-          toolGroupId
-        });
+      toolGroupId = toolGroupId ?? _getActiveViewportToolGroupId();
+      const toolGroup = toolGroupService.getToolGroup(toolGroupId);
+      if (!toolGroup || !toolGroup.hasTool(toolName)) {
+        return;
+      }
+      const toolIsActive = [dist_esm.Enums.ToolModes.Active, dist_esm.Enums.ToolModes.Enabled, dist_esm.Enums.ToolModes.Passive].includes(toolGroup.getToolOptions(toolName).mode);
+      toolIsActive ? toolGroup.setToolDisabled(toolName) : actions.setToolActive({
+        toolName,
+        toolGroupId
+      });
 
-        // we should set the previously active tool to active after we set the
-        // current tool disabled
-        if (toolIsActive) {
-          const prevToolName = toolGroup.getPrevActivePrimaryToolName();
+      // we should set the previously active tool to active after we set the
+      // current tool disabled
+      if (toolIsActive) {
+        const prevToolName = toolGroup.getPrevActivePrimaryToolName();
+        if (prevToolName !== toolName) {
           actions.setToolActive({
             toolName: prevToolName,
             toolGroupId
           });
         }
-      });
+      }
     },
     setToolActiveToolbar: ({
       value,
@@ -6793,15 +6833,13 @@ function commandsModule({
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
-        const {
-          flipHorizontal
-        } = viewport.getCamera();
-        viewport.setCamera({
-          flipHorizontal: !flipHorizontal
-        });
-        viewport.render();
-      }
+      const {
+        flipHorizontal
+      } = viewport.getCamera();
+      viewport.setCamera({
+        flipHorizontal: !flipHorizontal
+      });
+      viewport.render();
     },
     flipViewportVertical: () => {
       const enabledElement = _getActiveViewportEnabledElement();
@@ -6811,15 +6849,13 @@ function commandsModule({
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
-        const {
-          flipVertical
-        } = viewport.getCamera();
-        viewport.setCamera({
-          flipVertical: !flipVertical
-        });
-        viewport.render();
-      }
+      const {
+        flipVertical
+      } = viewport.getCamera();
+      viewport.setCamera({
+        flipVertical: !flipVertical
+      });
+      viewport.render();
     },
     invertViewport: ({
       element
@@ -7215,7 +7251,7 @@ function commandsModule({
         getCrosshairInstances(toolGroup.id);
       }
       crosshairInstances.forEach(ins => {
-        ins.resetCrosshairs();
+        ins?.resetCrosshairs();
       });
     }
   };
@@ -8391,30 +8427,32 @@ function getToolbarModule({
         className: '!text-common-bright hover:!bg-primary-dark hover:text-primary-light'
       };
     }
+  }, {
+    name: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled',
+    evaluate: ({
+      viewportId,
+      button,
+      disabledText
+    }) => _evaluateToggle({
+      viewportId,
+      button,
+      disabledText,
+      offModes: [dist_esm.Enums.ToolModes.Disabled],
+      toolGroupService
+    })
   }, {
     name: 'evaluate.cornerstoneTool.toggle',
     evaluate: ({
       viewportId,
       button,
       disabledText
-    }) => {
-      const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
-      if (!toolGroup) {
-        return;
-      }
-      const toolName = getToolNameForButton(button);
-      if (!toolGroup || !toolGroup.hasTool(toolName)) {
-        return {
-          disabled: true,
-          className: '!text-common-bright ohif-disabled',
-          disabledText: disabledText ?? 'Not available on the current viewport'
-        };
-      }
-      const isOff = [dist_esm.Enums.ToolModes.Disabled, dist_esm.Enums.ToolModes.Passive].includes(toolGroup.getToolOptions(toolName).mode);
-      return {
-        className: getToggledClassName(!isOff)
-      };
-    }
+    }) => _evaluateToggle({
+      viewportId,
+      button,
+      disabledText,
+      offModes: [dist_esm.Enums.ToolModes.Disabled, dist_esm.Enums.ToolModes.Passive],
+      toolGroupService
+    })
   }, {
     name: 'evaluate.cornerstone.synchronizer',
     evaluate: ({
@@ -8427,7 +8465,8 @@ function getToolbarModule({
           className: getToggledClassName(false)
         };
       }
-      const synchronizerType = button?.commands?.[0]?.commandOptions?.type;
+      const isArray = Array.isArray(button.commands);
+      const synchronizerType = isArray ? button.commands?.[0].commandOptions.type : button.commands?.commandOptions.type;
       synchronizers = syncGroupService.getSynchronizersOfType(synchronizerType);
       if (!synchronizers?.length) {
         return {
@@ -8536,6 +8575,32 @@ function getToolbarModule({
     }
   }];
 }
+function _evaluateToggle({
+  viewportId,
+  button,
+  disabledText,
+  offModes,
+  toolGroupService
+}) {
+  const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
+  if (!toolGroup) {
+    return;
+  }
+  const toolName = getToolNameForButton(button);
+  if (!toolGroup.hasTool(toolName)) {
+    return {
+      disabled: true,
+      className: '!text-common-bright ohif-disabled',
+      disabledText: disabledText ?? 'Not available on the current viewport'
+    };
+  }
+  const isOff = offModes.includes(toolGroup.getToolOptions(toolName).mode);
+  return {
+    className: getToggledClassName(!isOff)
+  };
+}
+
+// Todo: this is duplicate, we should move it to a shared location
 function getToolNameForButton(button) {
   const {
     props
@@ -8543,11 +8608,7 @@ function getToolNameForButton(button) {
   const commands = props?.commands || button.commands;
   const commandsArray = Array.isArray(commands) ? commands : [commands];
   const firstCommand = commandsArray[0];
-  if (typeof firstCommand === 'string') {
-    // likely not a cornerstone tool
-    return null;
-  }
-  if ('commandOptions' in firstCommand) {
+  if (firstCommand?.commandOptions) {
     return firstCommand.commandOptions.toolName ?? props?.id ?? button.id;
   }
 
@@ -10677,7 +10738,10 @@ class CornerstoneCacheService {
     // as a reference volume, if so, we should hang a volume viewport
     // instead of a stack viewport
     if (this._shouldRenderSegmentation(displaySets)) {
-      viewportType = 'volume';
+      // if the viewport type is volume 3D, we should let it be as it is
+      // Todo: in future here we should kick start the conversion of the
+      // segmentation to closed surface
+      viewportType = viewportType === esm.Enums.ViewportType.VOLUME_3D ? esm.Enums.ViewportType.VOLUME_3D : 'volume';
 
       // update viewportOptions to reflect the new viewport type
       viewportOptions.viewportType = viewportType;
@@ -11228,7 +11292,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       const {
         presentation
       } = lutPresentation;
-      if (viewport instanceof esm.VolumeViewport) {
+      if (viewport instanceof esm.BaseVolumeViewport) {
         if (presentation instanceof Map) {
           presentation.forEach((properties, volumeId) => {
             viewport.setProperties(properties, volumeId);
@@ -12939,13 +13003,19 @@ const cornerstoneExtension = {
    * Only required property. Should be a unique value across all extensions.
    */
   id: id,
-  onModeExit: () => {
+  onModeExit: ({
+    servicesManager
+  }) => {
+    const {
+      cineService
+    } = servicesManager.services;
     // Empty out the image load and retrieval pools to prevent memory leaks
     // on the mode exits
     Object.values(esm.Enums.RequestType).forEach(type => {
       esm.imageLoadPoolManager.clearRequestStack(type);
       esm.imageRetrievalPoolManager.clearRequestStack(type);
     });
+    cineService.setIsCineEnabled(false);
     (0,state/* reset */.cL)();
   },
   /**

package/dist/{422.bundle.bd6529c536f59807fbee.js → 422.bundle.c6fd037b075dd54f1ba7.js}

@@ -101,11 +101,6 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.SegmentationDisplay
     }, {
       toolName: toolNames.CalibrationLine
-    }, {
-      toolName: toolNames.AdvancedMagnify,
-      configuration: {
-        disableOnPassive: true
-      }
     }, {
       toolName: toolNames.UltrasoundDirectional
     }, {
@@ -115,11 +110,13 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
     }, {
       toolName: toolNames.LivewireContour
     }],
-    // enabled
     enabled: [{
       toolName: toolNames.ImageOverlayViewer
     }, {
       toolName: toolNames.ReferenceLines
+    }],
+    disabled: [{
+      toolName: toolNames.AdvancedMagnify
     }]
   };
   toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
@@ -265,12 +262,11 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
           panSize: 10
         }
       }
+    }, {
+      toolName: toolNames.AdvancedMagnify
     }, {
       toolName: toolNames.ReferenceLines
     }]
-
-    // enabled
-    // disabled
   };
   toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
@@ -499,18 +495,6 @@ const ReferenceLinesListeners = [{
   commandName: 'setSourceViewportForReferenceLinesTool',
   context: 'CORNERSTONE'
 }];
-const toggleEnabledDisabledToolbar = {
-  commandName: 'toggleEnabledDisabledToolbar',
-  commandOptions: {
-    toolGroupIds: ['default', 'mpr', 'SRToolGroup', 'volume3d']
-  }
-};
-const toggleActiveDisabledToolbar = {
-  commandName: 'toggleActiveDisabledToolbar',
-  commandOptions: {
-    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
-  }
-};
 const moreTools = [{
   id: 'MoreTools',
   uiType: 'ohif.splitButton',
@@ -576,7 +560,7 @@ const moreTools = [{
       icon: 'tool-referenceLines',
       label: 'Reference Lines',
       tooltip: 'Show Reference Lines',
-      commands: toggleEnabledDisabledToolbar,
+      commands: 'toggleEnabledDisabledToolbar',
       listeners: {
         [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesListeners,
         [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: ReferenceLinesListeners
@@ -587,7 +571,7 @@ const moreTools = [{
       icon: 'toggle-dicom-overlay',
       label: 'Image Overlay',
       tooltip: 'Toggle Image Overlay',
-      commands: toggleEnabledDisabledToolbar,
+      commands: 'toggleEnabledDisabledToolbar',
       evaluate: 'evaluate.cornerstoneTool.toggle'
     }), moreTools_createButton({
       id: 'StackScroll',
@@ -649,8 +633,8 @@ const moreTools = [{
       icon: 'icon-tool-loupe',
       label: 'Loupe',
       tooltip: 'Loupe',
-      commands: toggleActiveDisabledToolbar,
-      evaluate: 'evaluate.cornerstoneTool.toggle'
+      commands: 'toggleActiveDisabledToolbar',
+      evaluate: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled'
     }), moreTools_createButton({
       id: 'UltrasoundDirectionalTool',
       icon: 'icon-tool-ultrasound-bidirectional',