@ohif/app 3.8.0-beta.70 → 3.8.0-beta.71

package/dist/{41.bundle.6ec0794a483e9a30eb94.js → 41.bundle.b5a6c70f88cf565cad3e.js}

@@ -93,14 +93,22 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.Angle
     }, {
       toolName: toolNames.CobbAngle
-    }, {
-      toolName: toolNames.PlanarFreehandROI
     }, {
       toolName: toolNames.Magnify
     }, {
       toolName: toolNames.SegmentationDisplay
     }, {
       toolName: toolNames.CalibrationLine
+    }, {
+      toolName: toolNames.AdvancedMagnify
+    }, {
+      toolName: toolNames.UltrasoundDirectional
+    }, {
+      toolName: toolNames.PlanarFreehandROI
+    }, {
+      toolName: toolNames.SplineROI
+    }, {
+      toolName: toolNames.LivewireContour
     }],
     // enabled
     enabled: [{
@@ -359,6 +367,27 @@ const toolbarButtons = [{
       tooltip: 'Circle Tool',
       commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'PlanarFreehandROI',
+      icon: 'icon-tool-freehand-roi',
+      label: 'Freehand ROI',
+      tooltip: 'Freehand ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'SplineROI',
+      icon: 'icon-tool-spline-roi',
+      label: 'Spline ROI',
+      tooltip: 'Spline ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'LivewireContour',
+      icon: 'icon-tool-livewire',
+      label: 'Livewire tool',
+      tooltip: 'Livewire tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
     })]
   }
 }, {
@@ -561,7 +590,7 @@ const moreTools = [{
       commands: 'invertViewport',
       evaluate: 'evaluate.viewportProperties.toggle'
     }), moreTools_createButton({
-      id: 'Probe',
+      id: 'DragProbe',
       icon: 'tool-probe',
       label: 'Probe',
       tooltip: 'Probe',
@@ -604,10 +633,24 @@ const moreTools = [{
       evaluate: 'evaluate.cornerstoneTool'
     }), moreTools_createButton({
       id: 'TagBrowser',
-      icon: 'list-bullets',
+      icon: 'dicom-tag-browser',
       label: 'Dicom Tag Browser',
       tooltip: 'Dicom Tag Browser',
       commands: 'openDICOMTagViewer'
+    }), moreTools_createButton({
+      id: 'AdvancedMagnify',
+      icon: 'icon-tool-loupe',
+      label: 'Loupe',
+      tooltip: 'Loupe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'UltrasoundDirectionalTool',
+      icon: 'icon-tool-ultrasound-bidirectional',
+      label: 'Ultrasound Directional',
+      tooltip: 'Ultrasound Directional',
+      commands: setToolActiveToolbar,
+      evaluate: ['evaluate.cornerstoneTool', 'evaluate.isUS']
     })]
   }
 }];

package/dist/{448.bundle.9177b9d909654efbc8d5.js → 448.bundle.599d81471e1d7f7962bc.js}

@@ -108,6 +108,27 @@ const toolbarButtons = [{
       tooltip: 'Circle Tool',
       commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'PlanarFreehandROI',
+      icon: 'icon-tool-freehand-roi',
+      label: 'Freehand ROI',
+      tooltip: 'Freehand ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'SplineROI',
+      icon: 'icon-tool-spline-roi',
+      label: 'Spline ROI',
+      tooltip: 'Spline ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'LivewireContour',
+      icon: 'icon-tool-livewire',
+      label: 'Livewire tool',
+      tooltip: 'Livewire tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
     })]
   }
 }, {
@@ -278,6 +299,16 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.Magnify
     }, {
       toolName: toolNames.SegmentationDisplay
+    }, {
+      toolName: toolNames.AdvancedMagnify
+    }, {
+      toolName: toolNames.UltrasoundDirectional
+    }, {
+      toolName: toolNames.PlanarFreehandROI
+    }, {
+      toolName: toolNames.SplineROI
+    }, {
+      toolName: toolNames.LivewireContour
     }],
     // enabled
     enabled: [{
@@ -567,7 +598,7 @@ const moreTools = [{
       commands: 'invertViewport',
       evaluate: 'evaluate.viewportProperties.toggle'
     }), moreTools_createButton({
-      id: 'Probe',
+      id: 'DragProbe',
       icon: 'tool-probe',
       label: 'Probe',
       tooltip: 'Probe',
@@ -610,10 +641,24 @@ const moreTools = [{
       evaluate: 'evaluate.cornerstoneTool'
     }), moreTools_createButton({
       id: 'TagBrowser',
-      icon: 'list-bullets',
+      icon: 'dicom-tag-browser',
       label: 'Dicom Tag Browser',
       tooltip: 'Dicom Tag Browser',
       commands: 'openDICOMTagViewer'
+    }), moreTools_createButton({
+      id: 'AdvancedMagnify',
+      icon: 'icon-tool-loupe',
+      label: 'Loupe',
+      tooltip: 'Loupe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'UltrasoundDirectionalTool',
+      icon: 'icon-tool-ultrasound-bidirectional',
+      label: 'Ultrasound Directional',
+      tooltip: 'Ultrasound Directional',
+      commands: setToolActiveToolbar,
+      evaluate: ['evaluate.cornerstoneTool', 'evaluate.isUS']
     })]
   }
 }];

package/dist/{574.bundle.83afbc7922736fc6846d.js → 574.bundle.b262cbe9f2afd7275271.js}

@@ -295,9 +295,9 @@ function CustomizableViewportOverlay({
   const topRightCustomization = customizationService.getModeCustomization('cornerstoneOverlayTopRight');
   const bottomLeftCustomization = customizationService.getModeCustomization('cornerstoneOverlayBottomLeft');
   const bottomRightCustomization = customizationService.getModeCustomization('cornerstoneOverlayBottomRight');
-  const instance = (0,react.useMemo)(() => {
+  const instances = (0,react.useMemo)(() => {
     if (viewportData != null) {
-      return _getViewportInstance(viewportData, imageIndex);
+      return _getViewportInstances(viewportData);
     } else {
       return null;
     }
@@ -383,7 +383,7 @@ function CustomizableViewportOverlay({
         formatTime: formatDICOMTime,
         formatNumberPrecision: formatNumberPrecision
       },
-      instance,
+      instance: instances ? instances[item?.instanceIndex] : null,
       voi,
       scale,
       instanceNumber
@@ -403,47 +403,60 @@ function CustomizableViewportOverlay({
         return renderItem.content(overlayItemProps);
       }
     }
-  }, [element, viewportData, imageSliceData, viewportId, servicesManager, customizationService, instance, voi, scale, instanceNumber]);
+  }, [element, viewportData, imageSliceData, viewportId, servicesManager, customizationService, instances, voi, scale, instanceNumber]);
   const getContent = (0,react.useCallback)((customization, defaultItems, keyPrefix) => {
     const items = customization?.items ?? defaultItems;
     return /*#__PURE__*/react.createElement(react.Fragment, null, items.map((item, index) => /*#__PURE__*/react.createElement("div", {
       key: `${keyPrefix}_${index}`
     }, item?.condition ? item.condition({
-      instance,
+      instance: instances ? instances[item?.instanceIndex] : null,
       formatters: {
         formatDate: formatDICOMDate
       }
     }) ? _renderOverlayItem(item) : null : _renderOverlayItem(item))));
   }, [_renderOverlayItem]);
+  const studyDateItem = {
+    id: 'StudyDate',
+    customizationType: 'ohif.overlayItem',
+    label: '',
+    title: 'Study date',
+    condition: ({
+      instance
+    }) => instance && instance.StudyDate,
+    contentF: ({
+      instance,
+      formatters: {
+        formatDate
+      }
+    }) => formatDate(instance.StudyDate)
+  };
+  const seriesDescriptionItem = {
+    id: 'SeriesDescription',
+    customizationType: 'ohif.overlayItem',
+    label: '',
+    title: 'Series description',
+    attribute: 'SeriesDescription',
+    condition: ({
+      instance
+    }) => {
+      return instance && instance.SeriesDescription;
+    }
+  };
+  const topLeftItems = instances ? instances.map((instance, index) => {
+    return [{
+      ...studyDateItem,
+      instanceIndex: index
+    }, {
+      ...seriesDescriptionItem,
+      instanceIndex: index
+    }];
+  }).flat() : [];
   return /*#__PURE__*/react.createElement(ui_src/* ViewportOverlay */.pU, {
     topLeft:
     /**
      * Inline default overlay items for a more standard expansion
      */
-    getContent(topLeftCustomization, [{
-      id: 'StudyDate',
-      customizationType: 'ohif.overlayItem',
-      label: '',
-      title: 'Study date',
-      condition: ({
-        instance
-      }) => instance && instance.StudyDate,
-      contentF: ({
-        instance,
-        formatters: {
-          formatDate
-        }
-      }) => formatDate(instance.StudyDate)
-    }, {
-      id: 'SeriesDescription',
-      customizationType: 'ohif.overlayItem',
-      label: '',
-      title: 'Series description',
-      attribute: 'SeriesDescription',
-      condition: ({
-        instance
-      }) => instance && instance.SeriesDescription
-    }], 'topLeftOverlayItem'),
+    getContent(topLeftCustomization, [...topLeftItems], 'topLeftOverlayItem'),
     topRight: getContent(topRightCustomization, [], 'topRightOverlayItem'),
     bottomLeft: getContent(bottomLeftCustomization, [{
       id: 'WindowLevel',
@@ -462,18 +475,25 @@ function CustomizableViewportOverlay({
     }], 'bottomRightOverlayItem')
   });
 }
-function _getViewportInstance(viewportData, imageIndex) {
-  let imageId = null;
+function _getViewportInstances(viewportData) {
+  const imageIds = [];
   if (viewportData.viewportType === dist_esm.Enums.ViewportType.STACK) {
-    imageId = viewportData.data.imageIds[imageIndex];
+    imageIds.push(viewportData.data.imageIds[0]);
   } else if (viewportData.viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC) {
     const volumes = viewportData.data;
-    if (volumes && volumes.length == 1) {
-      const volume = volumes[0];
-      imageId = volume.imageIds[imageIndex];
-    }
+    volumes.forEach(volume => {
+      if (!volume?.imageIds) {
+        return;
+      }
+      imageIds.push(volume.imageIds[0]);
+    });
   }
-  return imageId ? dist_esm.metaData.get('instance', imageId) || {} : {};
+  const instances = [];
+  imageIds.forEach(imageId => {
+    const instance = dist_esm.metaData.get('instance', imageId) || {};
+    instances.push(instance);
+  });
+  return instances;
 }
 const getInstanceNumber = (viewportData, viewportId, imageIndex, cornerstoneViewportService) => {
   let instanceNumber;
@@ -482,7 +502,7 @@ const getInstanceNumber = (viewportData, viewportId, imageIndex, cornerstoneView
       instanceNumber = _getInstanceNumberFromStack(viewportData, imageIndex);
       break;
     case dist_esm.Enums.ViewportType.ORTHOGRAPHIC:
-      instanceNumber = _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService);
+      instanceNumber = _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService, imageIndex);
       break;
   }
   return instanceNumber ?? null;
@@ -507,14 +527,16 @@ function _getInstanceNumberFromStack(viewportData, imageIndex) {
 // Since volume viewports can be in any view direction, they can render
 // a reconstructed image which don't have imageIds; therefore, no instance and instanceNumber
 // Here we check if viewport is in the acquisition direction and if so, we get the instanceNumber
-function _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService) {
-  const volumes = viewportData.volumes;
-
-  // Todo: support fusion of acquisition plane which has instanceNumber
-  if (!volumes || volumes.length > 1) {
+function _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService, imageIndex) {
+  const volumes = viewportData.data;
+  if (!volumes) {
     return;
   }
-  const volume = volumes[0];
+
+  // Todo: support fusion of acquisition plane which has instanceNumber
+  const {
+    volume
+  } = volumes[0];
   const {
     direction,
     imageIds
@@ -610,9 +632,9 @@ function InstanceNumberOverlayItem({
     style: {
       color: customization && customization.color || undefined
     }
-  }, /*#__PURE__*/react.createElement("span", {
+  }, /*#__PURE__*/react.createElement("span", null, instanceNumber !== undefined && instanceNumber !== null ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
     className: "mr-1 shrink-0"
-  }, "I:"), /*#__PURE__*/react.createElement("span", null, instanceNumber !== undefined && instanceNumber !== null ? `${instanceNumber} (${imageIndex + 1}/${numberOfSlices})` : `${imageIndex + 1}/${numberOfSlices}`));
+  }, "I:"), /*#__PURE__*/react.createElement("span", null, `${instanceNumber} (${imageIndex + 1}/${numberOfSlices})`)) : `${imageIndex + 1}/${numberOfSlices}`));
 }
 CustomizableViewportOverlay.propTypes = {
   viewportData: (prop_types_default()).object,

package/dist/{595.bundle.1c1a50c4ff87763b786a.js → 595.bundle.c25147a450c67defb3d5.js}

@@ -843,7 +843,6 @@ function initCornerstoneTools(configuration = {}) {
   (0,dist_esm.addTool)(dist_esm.DragProbeTool);
   (0,dist_esm.addTool)(dist_esm.AngleTool);
   (0,dist_esm.addTool)(dist_esm.CobbAngleTool);
-  (0,dist_esm.addTool)(dist_esm.PlanarFreehandROITool);
   (0,dist_esm.addTool)(dist_esm.MagnifyTool);
   (0,dist_esm.addTool)(dist_esm.CrosshairsTool);
   (0,dist_esm.addTool)(dist_esm.SegmentationDisplayTool);
@@ -854,6 +853,11 @@ function initCornerstoneTools(configuration = {}) {
   (0,dist_esm.addTool)(dist_esm.RectangleScissorsTool);
   (0,dist_esm.addTool)(dist_esm.SphereScissorsTool);
   (0,dist_esm.addTool)(tools_ImageOverlayViewerTool);
+  (0,dist_esm.addTool)(dist_esm.AdvancedMagnifyTool);
+  (0,dist_esm.addTool)(dist_esm.UltrasoundDirectionalTool);
+  (0,dist_esm.addTool)(dist_esm.PlanarFreehandROITool);
+  (0,dist_esm.addTool)(dist_esm.SplineROITool);
+  (0,dist_esm.addTool)(dist_esm.LivewireContourTool);
 
   // Modify annotation tools to use dashed lines on SR
   const annotationStyle = {
@@ -886,7 +890,6 @@ const toolNames = {
   Bidirectional: dist_esm.BidirectionalTool.toolName,
   Angle: dist_esm.AngleTool.toolName,
   CobbAngle: dist_esm.CobbAngleTool.toolName,
-  PlanarFreehandROI: dist_esm.PlanarFreehandROITool.toolName,
   Magnify: dist_esm.MagnifyTool.toolName,
   Crosshairs: dist_esm.CrosshairsTool.toolName,
   SegmentationDisplay: dist_esm.SegmentationDisplayTool.toolName,
@@ -896,7 +899,12 @@ const toolNames = {
   CircleScissors: dist_esm.CircleScissorsTool.toolName,
   RectangleScissors: dist_esm.RectangleScissorsTool.toolName,
   SphereScissors: dist_esm.SphereScissorsTool.toolName,
-  ImageOverlayViewer: tools_ImageOverlayViewerTool.toolName
+  ImageOverlayViewer: tools_ImageOverlayViewerTool.toolName,
+  AdvancedMagnify: dist_esm.AdvancedMagnifyTool.toolName,
+  UltrasoundDirectional: dist_esm.UltrasoundDirectionalTool.toolName,
+  SplineROI: dist_esm.SplineROITool.toolName,
+  LivewireContour: dist_esm.LivewireContourTool.toolName,
+  PlanarFreehandROI: dist_esm.PlanarFreehandROITool.toolName
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/constants/supportedTools.js
@@ -7290,6 +7298,26 @@ function getToolbarModule({
         };
       }
     }
+  }, {
+    name: 'evaluate.isUS',
+    evaluate: ({
+      viewportId,
+      disabledText
+    }) => {
+      const displaySetUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
+      if (!displaySetUIDs?.length) {
+        return;
+      }
+      const displaySets = displaySetUIDs.map(displaySetService.getDisplaySetByUID);
+      const isUS = displaySets.some(displaySet => displaySet.Modality === 'US');
+      if (!isUS) {
+        return {
+          disabled: true,
+          className: '!text-common-bright ohif-disabled',
+          disabledText: disabledText ?? 'Not available on the current viewport'
+        };
+      }
+    }
   }, {
     name: 'evaluate.viewportProperties.toggle',
     evaluate: ({

package/dist/{699.bundle.db05df7b8e2ad605e928.js → 699.bundle.02c15c3cc4c04dbf7f51.js}

@@ -212,7 +212,7 @@ const toolbarButtons = [{
       commands: 'invertViewport',
       evaluate: 'evaluate.viewportProperties.toggle'
     }), createButton({
-      id: 'Probe',
+      id: 'DragProbe',
       icon: 'tool-probe',
       label: 'Probe',
       tooltip: 'Probe',
@@ -255,10 +255,24 @@ const toolbarButtons = [{
       evaluate: 'evaluate.cornerstoneTool'
     }), createButton({
       id: 'TagBrowser',
-      icon: 'list-bullets',
+      icon: 'dicom-tag-browser',
       label: 'Dicom Tag Browser',
       tooltip: 'Dicom Tag Browser',
       commands: 'openDICOMTagViewer'
+    }), createButton({
+      id: 'AdvancedMagnify',
+      icon: 'icon-tool-loupe',
+      label: 'Loupe',
+      tooltip: 'Loupe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'UltrasoundDirectionalTool',
+      icon: 'icon-tool-ultrasound-bidirectional',
+      label: 'Ultrasound Directional',
+      tooltip: 'Ultrasound Directional',
+      commands: setToolActiveToolbar,
+      evaluate: ['evaluate.cornerstoneTool', 'evaluate.isUS']
     })]
   }
 }];
@@ -538,6 +552,10 @@ function createTools(utilityModule) {
       toolName: toolNames.Magnify
     }, {
       toolName: toolNames.SegmentationDisplay
+    }, {
+      toolName: toolNames.AdvancedMagnify
+    }, {
+      toolName: toolNames.UltrasoundDirectional
     }],
     disabled: [{
       toolName: toolNames.ReferenceLines

package/dist/{90.bundle.f41c8c4fc78cdfd4de30.js → 90.bundle.27637ef740946d5c8948.js}

@@ -2529,8 +2529,7 @@ function Toolbar({
       servicesManager: servicesManager
     }, componentProps));
     return /*#__PURE__*/react.createElement("div", {
-      key: id,
-      className: "mr-1"
+      key: id
     }, tool);
   }));
 }
@@ -2589,8 +2588,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.70";
-  const commitHash = "56b1eae6356a6534960df1196bdd1e95b0a9a470";
+  const versionNumber = "3.8.0-beta.71";
+  const commitHash = "cea27d438d1de2c1ec90cbaefdc2b31a1d9980a1";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',