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

package/dist/{699.bundle.b3b25017819be681ef3d.js → 699.bundle.efc67171e6d212f25a24.js}

@@ -20,14 +20,21 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/mode-segme
 
 const id = package_namespaceObject.UU;
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
-var ui_src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../ui/src/index.js + 497 modules
+var ui_src = __webpack_require__(58046);
 ;// CONCATENATED MODULE: ../../../modes/segmentation/src/toolbarButtons.ts
 
 
 const {
   windowLevelPresets
 } = src.defaults;
+const {
+  createButton
+} = src.ToolbarService;
+const ReferenceLinesListeners = [{
+  commandName: 'setSourceViewportForReferenceLinesTool',
+  context: 'CORNERSTONE'
+}];
 function _createWwwcPreset(preset, title, subtitle) {
   return {
     id: preset.toString(),
@@ -42,23 +49,19 @@ function _createWwwcPreset(preset, title, subtitle) {
     }]
   };
 }
-function _createSetToolActiveCommands(toolName, toolGroupIds = ['default', 'mpr', 'SRToolGroup']) {
-  return toolGroupIds.map(toolGroupId => ({
-    commandName: 'setToolActive',
-    commandOptions: {
-      toolGroupId,
-      toolName
-    },
-    context: 'CORNERSTONE'
-  }));
-}
+const setToolActiveToolbar = {
+  commandName: 'setToolActiveToolbar',
+  commandOptions: {
+    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
+  }
+};
 const toolbarButtons = [{
   id: 'Zoom',
   uiType: 'ohif.radioGroup',
   props: {
     icon: 'tool-zoom',
     label: 'Zoom',
-    commands: _createSetToolActiveCommands('Zoom'),
+    commands: setToolActiveToolbar,
     evaluate: 'evaluate.cornerstoneTool'
   }
 }, {
@@ -66,12 +69,12 @@ const toolbarButtons = [{
   uiType: 'ohif.splitButton',
   props: {
     groupId: 'WindowLevel',
-    primary: src.ToolbarService.createButton({
+    primary: createButton({
       id: 'WindowLevel',
       icon: 'tool-window-level',
       label: 'Window Level',
       tooltip: 'Window Level',
-      commands: _createSetToolActiveCommands('WindowLevel'),
+      commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
     }),
     secondary: {
@@ -87,7 +90,17 @@ const toolbarButtons = [{
   props: {
     icon: 'tool-move',
     label: 'Pan',
-    commands: _createSetToolActiveCommands('Pan'),
+    commands: setToolActiveToolbar,
+    evaluate: 'evaluate.cornerstoneTool'
+  }
+}, {
+  id: 'TrackballRotate',
+  uiType: 'ohif.radioGroup',
+  props: {
+    type: 'tool',
+    icon: 'tool-3d-rotate',
+    label: '3D Rotate',
+    commands: setToolActiveToolbar,
     evaluate: 'evaluate.cornerstoneTool'
   }
 }, {
@@ -96,10 +109,7 @@ const toolbarButtons = [{
   props: {
     icon: 'tool-capture',
     label: 'Capture',
-    commands: [{
-      commandName: 'showDownloadViewportModal',
-      context: 'CORNERSTONE'
-    }],
+    commands: 'showDownloadViewportModal',
     evaluate: 'evaluate.action'
   }
 }, {
@@ -107,26 +117,9 @@ const toolbarButtons = [{
   uiType: 'ohif.layoutSelector',
   props: {
     rows: 3,
-    columns: 3,
+    columns: 4,
     evaluate: 'evaluate.action',
-    commands: [{
-      commandName: 'setViewportGridLayout'
-    }]
-  }
-}, {
-  id: 'MPR',
-  uiType: 'ohif.radioGroup',
-  props: {
-    icon: 'icon-mpr',
-    label: 'MPR',
-    commands: [{
-      commandName: 'toggleHangingProtocol',
-      commandOptions: {
-        protocolId: 'mpr'
-      },
-      context: 'DEFAULT'
-    }],
-    evaluate: 'evaluate.mpr'
+    commands: 'setViewportGridLayout'
   }
 }, {
   id: 'Crosshairs',
@@ -134,7 +127,12 @@ const toolbarButtons = [{
   props: {
     icon: 'tool-crosshair',
     label: 'Crosshairs',
-    commands: _createSetToolActiveCommands('Crosshairs', ['mpr']),
+    commands: {
+      commandName: 'setToolActiveToolbar',
+      commandOptions: {
+        toolGroupIds: ['mpr']
+      }
+    },
     evaluate: 'evaluate.cornerstoneTool'
   }
 }, {
@@ -143,91 +141,138 @@ const toolbarButtons = [{
   props: {
     groupId: 'MoreTools',
     evaluate: 'evaluate.group.promoteToPrimaryIfCornerstoneToolNotActiveInTheList',
-    primary: src.ToolbarService.createButton({
+    primary: createButton({
       id: 'Reset',
       icon: 'tool-reset',
-      label: 'Reset View',
-      tooltip: 'Reset',
-      commands: [{
-        commandName: 'resetViewport',
-        context: 'CORNERSTONE'
-      }],
+      tooltip: 'Reset View',
+      label: 'Reset',
+      commands: 'resetViewport',
       evaluate: 'evaluate.action'
     }),
     secondary: {
       icon: 'chevron-down',
+      label: '',
       tooltip: 'More Tools'
     },
-    items: [src.ToolbarService.createButton({
-      id: 'RotateRight',
+    items: [createButton({
+      id: 'Reset',
+      icon: 'tool-reset',
+      label: 'Reset View',
+      tooltip: 'Reset View',
+      commands: 'resetViewport',
+      evaluate: 'evaluate.action'
+    }), createButton({
+      id: 'rotate-right',
       icon: 'tool-rotate-right',
       label: 'Rotate Right',
       tooltip: 'Rotate +90',
-      commands: [{
-        commandName: 'rotateViewportCW',
-        context: 'CORNERSTONE'
-      }],
+      commands: 'rotateViewportCW',
       evaluate: 'evaluate.action'
-    }), src.ToolbarService.createButton({
-      id: 'FlipHorizontal',
+    }), createButton({
+      id: 'flipHorizontal',
       icon: 'tool-flip-horizontal',
-      label: 'Flip Horizontally',
-      tooltip: 'Flip Horizontal',
-      commands: [{
-        commandName: 'flipViewportHorizontal',
-        context: 'CORNERSTONE'
-      }],
-      evaluate: 'evaluate.action'
-    }), src.ToolbarService.createButton({
+      label: 'Flip Horizontal',
+      tooltip: 'Flip Horizontally',
+      commands: 'flipViewportHorizontal',
+      evaluate: ['evaluate.viewportProperties.toggle', 'evaluate.not3D']
+    }), createButton({
+      id: 'ReferenceLines',
+      icon: 'tool-referenceLines',
+      label: 'Reference Lines',
+      tooltip: 'Show Reference Lines',
+      commands: {
+        commandName: 'setToolEnabled',
+        commandOptions: {
+          toolName: 'ReferenceLines',
+          toggle: true // Toggle the tool on/off upon click
+        }
+      },
+      listeners: {
+        [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesListeners,
+        [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: ReferenceLinesListeners
+      },
+      evaluate: 'evaluate.cornerstoneTool.toggle'
+    }), createButton({
+      id: 'ImageOverlay',
+      icon: 'toggle-dicom-overlay',
+      label: 'Image Overlay',
+      tooltip: 'Toggle Image Overlay',
+      commands: {
+        commandName: 'setToolEnabled',
+        commandOptions: {
+          toolName: 'ImageOverlayViewer',
+          toggle: true // Toggle the tool on/off upon click
+        }
+      },
+      evaluate: 'evaluate.cornerstoneTool.toggle'
+    }), createButton({
       id: 'StackScroll',
       icon: 'tool-stack-scroll',
       label: 'Stack Scroll',
       tooltip: 'Stack Scroll',
-      commands: _createSetToolActiveCommands('StackScroll'),
-      evaluate: 'evaluate.cornerstoneTool'
-    }), src.ToolbarService.createButton({
-      id: 'Magnify',
-      icon: 'tool-magnify',
-      label: 'Magnify',
-      tooltip: 'Magnify',
-      commands: _createSetToolActiveCommands('Magnify'),
+      commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
-    }), src.ToolbarService.createButton({
-      id: 'Invert',
+    }), createButton({
+      id: 'invert',
       icon: 'tool-invert',
       label: 'Invert',
       tooltip: 'Invert Colors',
-      commands: [{
-        commandName: 'invertViewport',
-        context: 'CORNERSTONE'
-      }],
-      evaluate: 'evaluate.action'
-    }), src.ToolbarService.createButton({
+      commands: 'invertViewport',
+      evaluate: 'evaluate.viewportProperties.toggle'
+    }), createButton({
+      id: 'Probe',
+      icon: 'tool-probe',
+      label: 'Probe',
+      tooltip: 'Probe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
       id: 'Cine',
       icon: 'tool-cine',
       label: 'Cine',
       tooltip: 'Cine',
-      commands: [{
-        commandName: 'toggleCine',
-        context: 'CORNERSTONE'
-      }],
-      evaluate: 'evaluate.action'
-    }), src.ToolbarService.createButton({
-      id: 'DicomTagBrowser',
+      commands: 'toggleCine',
+      evaluate: ['evaluate.cine', 'evaluate.not3D']
+    }), createButton({
+      id: 'Angle',
+      icon: 'tool-angle',
+      label: 'Angle',
+      tooltip: 'Angle',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'Magnify',
+      icon: 'tool-magnify',
+      label: 'Magnify',
+      tooltip: 'Magnify',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'RectangleROI',
+      icon: 'tool-rectangle',
+      label: 'Rectangle',
+      tooltip: 'Rectangle',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'CalibrationLine',
+      icon: 'tool-calibration',
+      label: 'Calibration',
+      tooltip: 'Calibration Line',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'TagBrowser',
       icon: 'list-bullets',
       label: 'Dicom Tag Browser',
       tooltip: 'Dicom Tag Browser',
-      commands: [{
-        commandName: 'openDICOMTagViewer',
-        context: 'DEFAULT'
-      }],
-      evaluate: 'evaluate.action'
+      commands: 'openDICOMTagViewer'
     })]
   }
 }];
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
 ;// CONCATENATED MODULE: ../../../modes/segmentation/src/segmentationButtons.ts
-function segmentationButtons_createSetToolActiveCommands(toolName) {
+function _createSetToolActiveCommands(toolName) {
   return [{
     commandName: 'setToolActive',
     commandOptions: {
@@ -250,7 +295,7 @@ const segmentationButtons_toolbarButtons = [{
           toolNames: ['CircularBrush', 'SphereBrush']
         }
       },
-      commands: segmentationButtons_createSetToolActiveCommands('CircularBrush'),
+      commands: _createSetToolActiveCommands('CircularBrush'),
       options: [{
         name: 'Radius (mm)',
         id: 'brush-radius',
@@ -289,7 +334,7 @@ const segmentationButtons_toolbarButtons = [{
           toolNames: ['CircularEraser', 'SphereEraser']
         }
       },
-      commands: segmentationButtons_createSetToolActiveCommands('CircularEraser'),
+      commands: _createSetToolActiveCommands('CircularEraser'),
       options: [{
         name: 'Radius (mm)',
         id: 'eraser-radius',
@@ -328,7 +373,7 @@ const segmentationButtons_toolbarButtons = [{
           toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
         }
       },
-      commands: segmentationButtons_createSetToolActiveCommands('ThresholdCircularBrush'),
+      commands: _createSetToolActiveCommands('ThresholdCircularBrush'),
       options: [{
         name: 'Radius (mm)',
         id: 'threshold-radius',
@@ -403,7 +448,7 @@ const segmentationButtons_toolbarButtons = [{
       }
     },
     icon: 'icon-tool-shape',
-    commands: segmentationButtons_createSetToolActiveCommands('CircleScissor'),
+    commands: _createSetToolActiveCommands('CircleScissor'),
     options: [{
       name: 'Shape',
       type: 'radio',
@@ -518,6 +563,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     toolName: utilityModule.exports.toolNames.Crosshairs,
     configuration: {
       viewportIndicators: false,
+      disableOnPassive: true,
       autoPan: {
         enabled: false,
         panSize: 10
@@ -528,9 +574,36 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   });
   toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
+function initVolume3DToolGroup(extensionManager, toolGroupService) {
+  const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
+  const {
+    toolNames,
+    Enums
+  } = utilityModule.exports;
+  const tools = {
+    active: [{
+      toolName: toolNames.TrackballRotateTool,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Primary
+      }]
+    }, {
+      toolName: toolNames.Zoom,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Secondary
+      }]
+    }, {
+      toolName: toolNames.Pan,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Auxiliary
+      }]
+    }]
+  };
+  toolGroupService.createToolGroupAndAddTools('volume3d', tools);
+}
 function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
   initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
+  initVolume3DToolGroup(extensionManager, toolGroupService);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
 ;// CONCATENATED MODULE: ../../../modes/segmentation/src/index.tsx
@@ -539,6 +612,8 @@ function initToolGroups(extensionManager, toolGroupService, commandsManager) {
 
 
 
+const DEFAULT_TOOL_GROUP_ID = 'default';
+const VOLUME3D_TOOL_GROUP_ID = 'volume3d';
 const ohif = {
   layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
   sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
@@ -600,7 +675,7 @@ function modeFactory({
       src_initToolGroups(extensionManager, toolGroupService, commandsManager);
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.addButtons(segmentationButtons);
-      toolbarService.createButtonSection('primary', ['Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'Zoom', 'MoreTools']);
+      toolbarService.createButtonSection('primary', ['WindowLevel', 'Pan', 'Zoom', 'TrackballRotate', 'Capture', 'Layout', 'Crosshairs', 'MoreTools']);
       toolbarService.createButtonSection('segmentationToolbox', ['BrushTools', 'Shapes']);
     },
     onModeExit: ({

package/dist/{701.bundle.b7ebc1629fc121e13c58.js → 701.bundle.bc40f1a7d5d6b1a4dd38.js}

@@ -119,8 +119,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
-var ui_src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../ui/src/index.js + 497 modules
+var ui_src = __webpack_require__(58046);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -5189,6 +5189,9 @@ function commandsModule({
       if (!toolGroup) {
         return;
       }
+      if (!toolGroup.hasTool(toolName)) {
+        return;
+      }
       const activeToolName = toolGroup.getActivePrimaryMouseButtonTool();
       if (activeToolName) {
         const activeToolOptions = toolGroup.getToolConfiguration(activeToolName);
@@ -5702,7 +5705,9 @@ function commandsModule({
 const fourUp = {
   id: 'fourUp',
   locked: true,
-  name: 'fourUp',
+  name: '3D four up',
+  icon: 'layout-advanced-3d-four-up',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},
@@ -5810,7 +5815,9 @@ const fourUp = {
 const main3D = {
   id: 'main3D',
   locked: true,
-  name: 'main3D',
+  name: '3D main',
+  icon: 'layout-advanced-3d-main',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},
@@ -5938,8 +5945,10 @@ const main3D = {
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/hps/mpr.ts
 const mpr = {
   id: 'mpr',
-  name: 'Multi-Planar Reconstruction',
+  name: 'MPR',
   locked: true,
+  icon: 'layout-advanced-mpr',
+  isPreset: true,
   createdDate: '2021-02-23',
   modifiedDate: '2023-08-15',
   availableTo: {},
@@ -6177,7 +6186,9 @@ const mprAnd3DVolumeViewport = {
 const only3D = {
   id: 'only3D',
   locked: true,
-  name: 'only3D',
+  name: '3D only',
+  icon: 'layout-advanced-3d-only',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},
@@ -6231,7 +6242,9 @@ const only3D = {
 const primary3D = {
   id: 'primary3D',
   locked: true,
-  name: 'primary3D',
+  name: '3D primary',
+  icon: 'layout-advanced-3d-primary',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},
@@ -6360,7 +6373,9 @@ const primary3D = {
 const primaryAxial = {
   id: 'primaryAxial',
   locked: true,
-  name: 'primaryAxial',
+  name: 'Axial Primary',
+  icon: 'layout-advanced-axial-primary',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},
@@ -6653,6 +6668,20 @@ function getToolbarModule({
         className: getToggledClassName(isEnabled)
       };
     }
+  }, {
+    name: 'evaluate.not3D',
+    evaluate: ({
+      viewportId,
+      button
+    }) => {
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+      if (viewport?.type === 'volume3d') {
+        return {
+          disabled: true,
+          className: '!text-common-bright ohif-disabled'
+        };
+      }
+    }
   }, {
     name: 'evaluate.viewportProperties.toggle',
     evaluate: ({

package/dist/{724.bundle.cd011bc1838a2bde1d66.js → 724.bundle.3945f8d2e9c8b0b23628.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
 var src = __webpack_require__(78198);
-// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
-var ui_src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../ui/src/index.js + 497 modules
+var ui_src = __webpack_require__(58046);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
 const toolGroupIds = {
   CT: 'ctToolGroup',
@@ -223,21 +223,6 @@ const toolbarButtons = [{
     commands: setToolActiveToolbar,
     evaluate: 'evaluate.cornerstoneTool'
   }
-}, {
-  id: 'MPR',
-  uiType: 'ohif.radioGroup',
-  props: {
-    icon: 'icon-mpr',
-    label: 'MPR',
-    commands: [{
-      commandName: 'toggleHangingProtocol',
-      commandOptions: {
-        protocolId: 'mpr'
-      },
-      context: 'DEFAULT'
-    }],
-    evaluate: 'evaluate.mpr'
-  }
 },
 // Window Level + Presets
 {

package/dist/{862.bundle.d2e78b70286b59569e83.js → 862.bundle.d787dac01f4567560a42.js}

@@ -12,7 +12,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11374);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(78198);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(65967);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(58046);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80619);
 /* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(20767);
 /* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4573);

package/dist/{889.bundle.2aefa0a3eb114db0de3f.js → 889.bundle.ffc727aa6d1a74f2138d.js}

@@ -25,8 +25,8 @@ var esm = __webpack_require__(20767);
 var dist_esm = __webpack_require__(50719);
 // EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
 var src = __webpack_require__(78198);
-// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
-var ui_src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../ui/src/index.js + 497 modules
+var ui_src = __webpack_require__(58046);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(71353);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css