@ohif/app 3.7.0-beta.8 → 3.7.0-beta.81

package/dist/{192.bundle.2dc14a6e3c4c6be913b0.js → 348.bundle.46d4c41b9ae681c50903.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[192],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[348],{
 
-/***/ 6192:
+/***/ 14348:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -14,10 +14,10 @@ __webpack_require__.d(__webpack_exports__, {
   toolbarButtons: () => (/* reexport */ src_toolbarButtons)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
+var src = __webpack_require__(34491);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l
@@ -33,7 +33,7 @@ const {
  * @param {*} icon
  * @param {*} label
  */
-function _createButton(type, id, icon, label, commands, tooltip, uiType) {
+function _createButton(type, id, icon, label, commands, tooltip, uiType, isActive) {
   return {
     id,
     icon,
@@ -41,7 +41,8 @@ function _createButton(type, id, icon, label, commands, tooltip, uiType) {
     type,
     commands,
     tooltip,
-    uiType
+    uiType,
+    isActive
   };
 }
 const _createActionButton = _createButton.bind(null, 'action');
@@ -323,11 +324,27 @@ const toolbarButtons = [
       context: 'CORNERSTONE'
     }]), _createToggleButton('ReferenceLines', 'tool-referenceLines',
     // change this with the new icon
-    'Reference Lines', [{
-      commandName: 'toggleReferenceLines',
+    'Reference Lines',
+    // two commands for the reference lines tool:
+    // - the first to set the source viewport for the tool when it is enabled
+    // - the second to toggle the tool
+    [{
+      commandName: 'setSourceViewportForReferenceLinesTool',
       commandOptions: {},
       context: 'CORNERSTONE'
-    }]), _createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
+    }, {
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'ReferenceLines'
+      },
+      context: 'CORNERSTONE'
+    }]), _createToggleButton('ImageOverlayViewer', 'toggle-dicom-overlay', 'Image Overlay', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'ImageOverlayViewer'
+      },
+      context: 'CORNERSTONE'
+    }], 'Image Overlay', null, true), _createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'StackScroll'
@@ -446,7 +463,18 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -473,28 +501,21 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.CalibrationLine
     }],
     // enabled
+    enabled: [{
+      toolName: toolNames.ImageOverlayViewer
+    }],
     // disabled
     disabled: [{
       toolName: toolNames.ReferenceLines
     }]
   };
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const SRUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone-dicom-sr.utilityModule.tools');
+  if (!SRUtilityModule) {
+    return;
+  }
   const CS3DUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
   const {
     toolNames: SRToolNames
@@ -541,21 +562,8 @@ function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
   const toolGroupId = 'SRToolGroup';
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -586,7 +594,18 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -609,7 +628,14 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
+      }
     }, {
       toolName: toolNames.ReferenceLines
     }]
@@ -618,27 +644,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
 function initVolume3DToolGroup(extensionManager, toolGroupService) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -724,7 +730,10 @@ const extensionDependencies = {
   '@ohif/extension-dicom-pdf': '^3.0.1',
   '@ohif/extension-dicom-video': '^3.0.1'
 };
-function modeFactory() {
+function modeFactory(_ref) {
+  let {
+    modeConfiguration
+  } = _ref;
   let _activatePanelTriggersSubscriptions = [];
   return {
     // TODO: We're using this as a route segment
@@ -735,18 +744,18 @@ function modeFactory() {
     /**
      * Lifecycle hooks
      */
-    onModeEnter: _ref => {
+    onModeEnter: _ref2 => {
       let {
         servicesManager,
         extensionManager,
         commandsManager
-      } = _ref;
+      } = _ref2;
       const {
         measurementService,
         toolbarService,
         toolGroupService,
         panelService,
-        segmentationService
+        customizationService
       } = servicesManager.services;
       measurementService.clearMeasurements();
 
@@ -756,7 +765,6 @@ function modeFactory() {
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',
@@ -780,6 +788,10 @@ function modeFactory() {
       toolbarService.init(extensionManager);
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools']);
+      customizationService.addModeCustomizations([{
+        id: 'segmentation.disableEditing',
+        value: true
+      }]);
 
       // // ActivatePanel event trigger for when a segmentation or measurement is added.
       // // Do not force activation so as to respect the state the user may have left the UI in.
@@ -804,10 +816,10 @@ function modeFactory() {
       // ];
     },
 
-    onModeExit: _ref2 => {
+    onModeExit: _ref3 => {
       let {
         servicesManager
-      } = _ref2;
+      } = _ref3;
       const {
         toolGroupService,
         syncGroupService,
@@ -826,10 +838,10 @@ function modeFactory() {
       study: [],
       series: []
     },
-    isValidMode: function (_ref3) {
+    isValidMode: function (_ref4) {
       let {
         modalities
-      } = _ref3;
+      } = _ref4;
       const modalities_list = modalities.split('\\');
 
       // Exclude non-image modalities
@@ -878,7 +890,8 @@ function modeFactory() {
     // general handler needs to come last.  For this case, the dicomvideo must
     // come first to remove video transfer syntax before ohif uses images
     sopClassHandlers: [dicomvideo.sopClassHandler, dicomSeg.sopClassHandler, ohif.sopClassHandler, dicompdf.sopClassHandler, dicomsr.sopClassHandler, dicomRt.sopClassHandler],
-    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings]
+    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings],
+    ...modeConfiguration
   };
 }
 const mode = {

package/dist/{404.bundle.5d57295bc05206092d42.js → 359.bundle.408fa86b95fd1597552c.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[404],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[359],{
 
-/***/ 92404:
+/***/ 22359:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -12,10 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ tmtv_src)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
+var src = __webpack_require__(34491);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
 const toolGroupIds = {
   CT: 'ctToolGroup',
@@ -50,7 +50,20 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => {
+          commandsManager.runCommand('arrowTextCallback', {
+            callback,
+            eventDetails
+          });
+        },
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -74,32 +87,17 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
-    }]
-  };
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
       }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => {
-        commandsManager.runCommand('arrowTextCallback', {
-          callback,
-          eventDetails
-        });
-      },
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
+    }]
   };
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.CT, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.CT, tools);
   toolGroupService.createToolGroupAndAddTools(toolGroupIds.PT, {
     active: tools.active,
     passive: [...tools.passive, {
@@ -107,14 +105,20 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
     }],
     enabled: tools.enabled,
     disabled: tools.disabled
-  }, toolsConfig);
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.Fusion, tools, toolsConfig);
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.default, tools, toolsConfig);
+  });
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.Fusion, tools);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.default, tools);
   const mipTools = {
     active: [{
-      toolName: toolNames.VolumeRotateMouseWheel
+      toolName: toolNames.VolumeRotateMouseWheel,
+      configuration: {
+        rotateIncrementDegrees: 0.1
+      }
     }, {
       toolName: toolNames.MipJumpToClick,
+      configuration: {
+        toolGroupId: toolGroupIds.PT
+      },
       bindings: [{
         mouseButton: Enums.MouseBindings.Primary
       }]
@@ -123,93 +127,11 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }]
   };
-  const mipToolsConfig = {
-    [toolNames.VolumeRotateMouseWheel]: {
-      rotateIncrementDegrees: 0.1
-    },
-    [toolNames.MipJumpToClick]: {
-      targetViewportIds: ['ptAXIAL', 'ptCORONAL', 'ptSAGITTAL']
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools, mipToolsConfig);
-}
-function initMPRToolGroup(toolNames, Enums, toolGroupService, commandsManager) {
-  const tools = {
-    active: [{
-      toolName: toolNames.WindowLevel,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Primary
-      }]
-    }, {
-      toolName: toolNames.Pan,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Auxiliary
-      }]
-    }, {
-      toolName: toolNames.Zoom,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Secondary
-      }]
-    }, {
-      toolName: toolNames.StackScrollMouseWheel,
-      bindings: []
-    }],
-    passive: [{
-      toolName: toolNames.Length
-    }, {
-      toolName: toolNames.ArrowAnnotate
-    }, {
-      toolName: toolNames.Bidirectional
-    }, {
-      toolName: toolNames.DragProbe
-    }, {
-      toolName: toolNames.EllipticalROI
-    }, {
-      toolName: toolNames.RectangleROI
-    }, {
-      toolName: toolNames.StackScroll
-    }, {
-      toolName: toolNames.Angle
-    }, {
-      toolName: toolNames.CobbAngle
-    }, {
-      toolName: toolNames.SegmentationDisplay
-    }],
-    disabled: [{
-      toolName: toolNames.Crosshairs
-    }]
-
-    // enabled
-    // disabled
-  };
-
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools);
 }
 function initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
   _initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
-  // initMPRToolGroup(toolNames, Enums, toolGroupService, commandsManager);
 }
-
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
@@ -239,9 +161,8 @@ function _createButton(type, id, icon, label, commands, tooltip) {
 }
 function _createColormap(label, colormap) {
   return {
-    id: label.toString(),
-    title: label,
-    subtitle: label,
+    id: label,
+    label,
     type: 'action',
     commands: [{
       commandName: 'setFusionPTColormap',
@@ -249,12 +170,6 @@ function _createColormap(label, colormap) {
         toolGroupId: toolGroupIds.Fusion,
         colormap
       }
-    }, {
-      commandName: 'setFusionPTColormap',
-      commandOptions: {
-        toolGroupId: toolGroupIds.Fusion,
-        colormap
-      }
     }]
   };
 }
@@ -433,7 +348,6 @@ const toolbarButtons = [
     },
     isAction: true,
     // ?
-    renderer: ui_src/* WindowLevelMenuItem */.eJ,
     items: [_createColormap('HSV', 'hsv'), _createColormap('Hot Iron', 'hot_iron'), _createColormap('S PET', 's_pet'), _createColormap('Red Hot', 'red_hot'), _createColormap('Perfusion', 'perfusion'), _createColormap('Rainbow', 'rainbow_2'), _createColormap('SUV', 'suv'), _createColormap('GE 256', 'ge_256'), _createColormap('GE', 'ge'), _createColormap('Siemens', 'siemens')]
   }
 }];
@@ -559,7 +473,6 @@ function modeFactory(_ref) {
       const setWindowLevelActive = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',
@@ -678,7 +591,8 @@ function modeFactory(_ref) {
         return {
           id: ohif.layout,
           props: {
-            // leftPanels: [ohif.thumbnailList],
+            leftPanels: [ohif.thumbnailList],
+            leftPanelDefaultClosed: true,
             rightPanels: [tmtv.ROIThresholdPanel, tmtv.petSUV],
             viewports: [{
               namespace: cs3d.viewport,
@@ -691,7 +605,8 @@ function modeFactory(_ref) {
     extensions: extensionDependencies,
     hangingProtocol: tmtv.hangingProtocol,
     sopClassHandlers: [ohif.sopClassHandler],
-    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings]
+    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings],
+    ...modeConfiguration
   };
 }
 const mode = {

package/dist/{790.bundle.cedf27deeed29266a92b.js → 410.bundle.bf702dcec9db605d0d72.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[790],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[410],{
 
-/***/ 17790:
+/***/ 15410:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -12,10 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_dev_mode_src)
 });
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var src = __webpack_require__(28619);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var core_src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var src = __webpack_require__(71783);
+// EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
+var core_src = __webpack_require__(34491);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l
@@ -346,18 +346,20 @@ function modeFactory(_ref) {
           toolName: toolNames.StackScroll
         }, {
           toolName: toolNames.CalibrationLine
-        }]
+        }],
         // enabled
+        enabled: [{
+          toolName: toolNames.ImageOverlayViewer
+        }]
         // disabled
       };
 
       const toolGroupId = 'default';
-      toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, configs);
+      toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
       let unsubscribe;
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',