@ohif/app 3.8.0-beta.5 → 3.8.0-beta.51

package/dist/{221.bundle.da7732c6f158b6f2b0d8.js → 466.bundle.43f3b29a2e1665bb9a65.js}

@@ -1,9 +1,9 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[221,579],{
+"use strict";
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[466,579],{
 
 /***/ 9943:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -24,8 +24,10 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 376 modules
+var esm = __webpack_require__(64225);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
@@ -49,6 +51,7 @@ function dicomlabToRGB(cielab) {
 
 
 
+
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4'];
 let loadPromises = {};
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
@@ -119,12 +122,9 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     displaySet.referencedVolumeId = referencedVolumeId;
     return referencedDisplaySet;
   };
-  displaySet.load = async _ref => {
-    let {
-      headers
-    } = _ref;
-    return await _load(displaySet, servicesManager, extensionManager, headers);
-  };
+  displaySet.load = async ({
+    headers
+  }) => await _load(displaySet, servicesManager, extensionManager, headers);
   return [displaySet];
 }
 function _load(segDisplaySet, servicesManager, extensionManager, headers) {
@@ -161,16 +161,16 @@ function _load(segDisplaySet, servicesManager, extensionManager, headers) {
   });
   return loadPromises[SOPInstanceUID];
 }
-async function _loadSegments(_ref2) {
-  let {
-    extensionManager,
-    servicesManager,
-    segDisplaySet,
-    headers
-  } = _ref2;
+async function _loadSegments({
+  extensionManager,
+  servicesManager,
+  segDisplaySet,
+  headers
+}) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.common');
   const {
-    segmentationService
+    segmentationService,
+    uiNotificationService
   } = servicesManager.services;
   const {
     dicomLoaderService
@@ -201,22 +201,44 @@ async function _loadSegments(_ref2) {
     eventTarget: esm.eventTarget,
     triggerEvent: esm.triggerEvent
   });
+  let usedRecommendedDisplayCIELabValue = true;
   results.segMetadata.data.forEach((data, i) => {
     if (i > 0) {
-      data.rgba = dicomlabToRGB(data.RecommendedDisplayCIELabValue);
+      data.rgba = data.RecommendedDisplayCIELabValue;
+      if (data.rgba) {
+        data.rgba = dicomlabToRGB(data.rgba);
+      } else {
+        usedRecommendedDisplayCIELabValue = false;
+        data.rgba = dist_esm.CONSTANTS.COLOR_LUT[i % dist_esm.CONSTANTS.COLOR_LUT.length];
+      }
     }
   });
+  if (results.overlappingSegments) {
+    uiNotificationService.show({
+      title: 'Overlapping Segments',
+      message: 'Unsupported overlapping segments detected, segmentation rendering results may be incorrect.',
+      type: 'warning'
+    });
+  }
+  if (!usedRecommendedDisplayCIELabValue) {
+    // Display a notification about the non-utilization of RecommendedDisplayCIELabValue
+    uiNotificationService.show({
+      title: 'DICOM SEG import',
+      message: 'RecommendedDisplayCIELabValue not found for one or more segments. The default color was used instead.',
+      type: 'warning',
+      duration: 5000
+    });
+  }
   Object.assign(segDisplaySet, results);
 }
 function _segmentationExists(segDisplaySet, segmentationService) {
   // This should be abstracted with the CornerstoneCacheService
   return segmentationService.getSegmentation(segDisplaySet.displaySetInstanceUID);
 }
-function getSopClassHandlerModule(_ref3) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref3;
+function getSopClassHandlerModule({
+  servicesManager,
+  extensionManager
+}) {
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -293,23 +315,22 @@ function getHangingProtocolModule() {
 
 // EXTERNAL MODULE: ./state/index.js + 1 modules
 var state = __webpack_require__(62657);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 76 modules
-var default_src = __webpack_require__(56342);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 78 modules
+var default_src = __webpack_require__(78738);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
-var ui_src = __webpack_require__(71783);
+// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
+var ui_src = __webpack_require__(18414);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
 
 
 function callInputDialog(uiDialogService, label, callback) {
   const dialogId = 'enter-segment-label';
-  const onSubmitHandler = _ref => {
-    let {
-      action,
-      value
-    } = _ref;
+  const onSubmitHandler = ({
+    action,
+    value
+  }) => {
     switch (action.id) {
       case 'save':
         callback(value.label, action.id);
@@ -348,11 +369,10 @@ function callInputDialog(uiDialogService, label, callback) {
           type: ui_src/* ButtonEnums.type */.LZ.dt.primary
         }],
         onSubmit: onSubmitHandler,
-        body: _ref2 => {
-          let {
-            value,
-            setValue
-          } = _ref2;
+        body: ({
+          value,
+          setValue
+        }) => {
           return /*#__PURE__*/react.createElement(ui_src/* Input */.II, {
             label: "Enter the segment label",
             labelClassName: "text-white text-[14px] leading-[1.2]",
@@ -396,11 +416,10 @@ var es = __webpack_require__(22831);
 
 function callColorPickerDialog(uiDialogService, rgbaColor, callback) {
   const dialogId = 'pick-color';
-  const onSubmitHandler = _ref => {
-    let {
-      action,
-      value
-    } = _ref;
+  const onSubmitHandler = ({
+    action,
+    value
+  }) => {
     switch (action.id) {
       case 'save':
         callback(value.rgbaColor, action.id);
@@ -439,11 +458,10 @@ function callColorPickerDialog(uiDialogService, rgbaColor, callback) {
           type: 'secondary'
         }],
         onSubmit: onSubmitHandler,
-        body: _ref2 => {
-          let {
-            value,
-            setValue
-          } = _ref2;
+        body: ({
+          value,
+          setValue
+        }) => {
           const handleChange = color => {
             setValue({
               rgbaColor: color.rgb
@@ -471,13 +489,12 @@ var dist_es = __webpack_require__(69190);
 
 
 
-function PanelSegmentation(_ref) {
-  let {
-    servicesManager,
-    commandsManager,
-    extensionManager,
-    configuration
-  } = _ref;
+function PanelSegmentation({
+  servicesManager,
+  commandsManager,
+  extensionManager,
+  configuration
+}) {
   const {
     segmentationService,
     viewportGridService,
@@ -567,7 +584,6 @@ function PanelSegmentation(_ref) {
       );
     });
   };
-
   const onSegmentColorClick = (segmentationId, segmentIndex) => {
     const segmentation = segmentationService.getSegmentation(segmentationId);
     const segment = segmentation.segments[segmentIndex];
@@ -698,8 +714,6 @@ PanelSegmentation.propTypes = {
     }).isRequired
   }).isRequired
 };
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/SegmentationToolbox.tsx
 
 
@@ -727,20 +741,17 @@ const initialState = {
     brushSize: 15,
     mode: 'CircularBrush' // Can be 'CircularBrush' or 'SphereBrush'
   },
-
   Eraser: {
     brushSize: 15,
     mode: 'CircularEraser' // Can be 'CircularEraser' or 'SphereEraser'
   },
-
   Shapes: {
     brushSize: 15,
     mode: 'CircleScissor' // E.g., 'CircleScissor', 'RectangleScissor', or 'SphereScissor'
   },
-
   ThresholdBrush: {
     brushSize: 15,
-    thresholdRange: [-500, 500]
+    thresholdRange: null
   },
   activeTool: null
 };
@@ -767,11 +778,10 @@ function toolboxReducer(state, action) {
       return state;
   }
 }
-function SegmentationToolbox(_ref) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+function SegmentationToolbox({
+  servicesManager,
+  extensionManager
+}) {
   const {
     toolbarService,
     segmentationService,
@@ -798,6 +808,7 @@ function SegmentationToolbox(_ref) {
     });
   }, [activeViewportId, viewports, toolGroupService, dispatch]);
   const setToolActive = (0,react.useCallback)(toolName => {
+    initializeThresholdValue(toolName);
     toolbarService.recordInteraction({
       interactionType: 'tool',
       commands: [{
@@ -869,6 +880,25 @@ function SegmentationToolbox(_ref) {
       segmentationUtils.setBrushSizeForToolGroup(toolGroupId, brushSize, toolName);
     });
   }, [toolGroupService]);
+  function initializeThresholdValue(toolName) {
+    if (state.ThresholdBrush.thresholdRange === null) {
+      // set the default threshold range from the tool configuration
+      const toolGroupIds = toolGroupService.getToolGroupIds();
+      const toolGroupId = toolGroupIds[0];
+      const toolGroup = toolGroupService.getToolGroup(toolGroupId);
+      const toolConfig = toolGroup.getToolConfiguration(toolName);
+      const defaultThresholdRange = toolConfig?.strategySpecificConfiguration?.THRESHOLD?.threshold;
+      dispatch({
+        type: ACTIONS.SET_TOOL_CONFIG,
+        payload: {
+          tool: 'ThresholdBrush',
+          config: {
+            thresholdRange: defaultThresholdRange
+          }
+        }
+      });
+    }
+  }
   const onBrushSizeChange = (0,react.useCallback)((valueAsStringOrNumber, toolCategory) => {
     const value = Number(valueAsStringOrNumber);
     _getToolNamesFromCategory(toolCategory).forEach(toolName => {
@@ -885,7 +915,7 @@ function SegmentationToolbox(_ref) {
     });
   }, [toolGroupService, dispatch]);
   const handleRangeChange = (0,react.useCallback)(newRange => {
-    if (newRange[0] === state.ThresholdBrush.thresholdRange[0] && newRange[1] === state.ThresholdBrush.thresholdRange[1]) {
+    if (newRange[0] === state.ThresholdBrush.thresholdRange?.[0] && newRange[1] === state.ThresholdBrush.thresholdRange?.[1]) {
       return;
     }
     const toolNames = _getToolNamesFromCategory('ThresholdBrush');
@@ -894,7 +924,7 @@ function SegmentationToolbox(_ref) {
         const toolGroup = toolGroupService.getToolGroup(toolGroupId);
         toolGroup.setToolConfiguration(toolName, {
           strategySpecificConfiguration: {
-            THRESHOLD_INSIDE_CIRCLE: {
+            THRESHOLD: {
               threshold: newRange
             }
           }
@@ -1033,7 +1063,8 @@ function SegmentationToolbox(_ref) {
           }, "Threshold"), /*#__PURE__*/react.createElement(ui_src/* InputDoubleRange */.R0, {
             values: state.ThresholdBrush.thresholdRange,
             onChange: handleRangeChange,
-            minValue: -1000,
+            minValue: -1000 // Todo: these should be configurable
+            ,
             maxValue: 1000,
             step: 1,
             showLabel: true,
@@ -1068,13 +1099,12 @@ function _getToolNamesFromCategory(category) {
 
 
 
-const getPanelModule = _ref => {
-  let {
-    commandsManager,
-    servicesManager,
-    extensionManager,
-    configuration
-  } = _ref;
+const getPanelModule = ({
+  commandsManager,
+  servicesManager,
+  extensionManager,
+  configuration
+}) => {
   const {
     customizationService
   } = servicesManager.services;
@@ -1124,8 +1154,8 @@ const getPanelModule = _ref => {
   }];
 };
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
-// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Filters/General/ImageMarchingSquares.js + 2 modules
-var ImageMarchingSquares = __webpack_require__(49399);
+// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Filters/General/ImageMarchingSquares.js + 1 modules
+var ImageMarchingSquares = __webpack_require__(96538);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/DataArray.js
 var DataArray = __webpack_require__(54131);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/DataModel/ImageData.js + 2 modules
@@ -1147,13 +1177,12 @@ var ImageData = __webpack_require__(96372);
  *
  * @returns Returns true upon successful update of viewports for segmentation rendering.
  */
-async function updateViewportsForSegmentationRendering(_ref) {
-  let {
-    viewportId,
-    loadFn,
-    servicesManager,
-    referencedDisplaySetInstanceUID
-  } = _ref;
+async function updateViewportsForSegmentationRendering({
+  viewportId,
+  loadFn,
+  servicesManager,
+  referencedDisplaySetInstanceUID
+}) {
   const {
     cornerstoneViewportService,
     segmentationService,
@@ -1221,11 +1250,10 @@ async function updateViewportsForSegmentationRendering(_ref) {
   viewportGridService.setDisplaySetsForViewports(updatedViewports);
   return true;
 }
-const getTargetViewport = _ref2 => {
-  let {
-    viewportId,
-    viewportGridService
-  } = _ref2;
+const getTargetViewport = ({
+  viewportId,
+  viewportGridService
+}) => {
   const {
     viewports,
     activeViewportId
@@ -1247,12 +1275,11 @@ const getTargetViewport = _ref2 => {
  *
  * @returns {Array} Returns an array of viewports that require updates for segmentation rendering.
  */
-function getUpdatedViewportsForSegmentation(_ref3) {
-  let {
-    viewportId,
-    servicesManager,
-    referencedDisplaySetInstanceUID
-  } = _ref3;
+function getUpdatedViewportsForSegmentation({
+  viewportId,
+  servicesManager,
+  referencedDisplaySetInstanceUID
+}) {
   const {
     hangingProtocolService,
     displaySetService,
@@ -1323,11 +1350,10 @@ const {
 const {
   downloadDICOMData
 } = adapters_es.helpers;
-const commandsModule = _ref => {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+const commandsModule = ({
+  servicesManager,
+  extensionManager
+}) => {
   const {
     uiNotificationService,
     segmentationService,
@@ -1360,10 +1386,9 @@ const commandsModule = _ref => {
      * @param params.viewportId - the target viewport ID.
      *
      */
-    createEmptySegmentationForViewport: async _ref2 => {
-      let {
-        viewportId
-      } = _ref2;
+    createEmptySegmentationForViewport: async ({
+      viewportId
+    }) => {
       const viewport = getTargetViewport({
         viewportId,
         viewportGridService
@@ -1412,11 +1437,10 @@ const commandsModule = _ref => {
      * @param params.viewportId - the target viewport ID.
      *
      */
-    loadSegmentationsForViewport: async _ref3 => {
-      let {
-        segmentations,
-        viewportId
-      } = _ref3;
+    loadSegmentationsForViewport: async ({
+      segmentations,
+      viewportId
+    }) => {
       updateViewportsForSegmentationRendering({
         viewportId,
         servicesManager,
@@ -1479,11 +1503,10 @@ const commandsModule = _ref => {
      * @param params.displaySets - Array of display sets to be loaded for segmentation.
      *
      */
-    loadSegmentationDisplaySetsForViewport: async _ref4 => {
-      let {
-        viewportId,
-        displaySets
-      } = _ref4;
+    loadSegmentationDisplaySetsForViewport: async ({
+      viewportId,
+      displaySets
+    }) => {
       // Todo: handle adding more than one segmentation
       const displaySet = displaySets[0];
       updateViewportsForSegmentationRendering({
@@ -1513,11 +1536,10 @@ const commandsModule = _ref => {
      *
      * @returns Returns the generated segmentation data.
      */
-    generateSegmentation: _ref5 => {
-      let {
-        segmentationId,
-        options = {}
-      } = _ref5;
+    generateSegmentation: ({
+      segmentationId,
+      options = {}
+    }) => {
       const segmentation = dist_esm.segmentation.state.getSegmentation(segmentationId);
       const {
         referencedVolumeId
@@ -1570,10 +1592,9 @@ const commandsModule = _ref => {
      * @param params.segmentationId - ID of the segmentation to be downloaded.
      *
      */
-    downloadSegmentation: _ref6 => {
-      let {
-        segmentationId
-      } = _ref6;
+    downloadSegmentation: ({
+      segmentationId
+    }) => {
       const segmentationInOHIF = segmentationService.getSegmentation(segmentationId);
       const generatedSegmentation = actions.generateSegmentation({
         segmentationId
@@ -1592,11 +1613,10 @@ const commandsModule = _ref => {
      * @returns {Object|void} Returns the naturalized report if successfully stored,
      * otherwise throws an error.
      */
-    storeSegmentation: async _ref7 => {
-      let {
-        segmentationId,
-        dataSource
-      } = _ref7;
+    storeSegmentation: async ({
+      segmentationId,
+      dataSource
+    }) => {
       const promptResult = await (0,default_src.createReportDialogPrompt)(uiDialogService, {
         extensionManager
       });
@@ -1641,14 +1661,13 @@ const commandsModule = _ref => {
      * converts dataset to downloadable blob.
      *
      */
-    downloadRTSS: _ref8 => {
-      let {
-        segmentationId
-      } = _ref8;
+    downloadRTSS: ({
+      segmentationId
+    }) => {
       const segmentations = segmentationService.getSegmentation(segmentationId);
       const vtkUtils = {
         vtkImageMarchingSquares: ImageMarchingSquares/* default */.ZP,
-        vtkDataArray: DataArray/* default */.ZP,
+        vtkDataArray: DataArray["default"],
         vtkImageData: ImageData/* default */.ZP
       };
       const RTSS = generateRTSSFromSegmentations(segmentations, src.classes.MetadataProvider, src.DicomMetadataStore, esm.cache, dist_esm.Enums, vtkUtils);
@@ -1697,10 +1716,9 @@ const commandsModule = _ref => {
 /* harmony default export */ const src_commandsModule = (commandsModule);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/init.ts
 
-function init(_ref) {
-  let {
-    configuration = {}
-  } = _ref;
+function init({
+  configuration = {}
+}) {
   (0,dist_esm.addTool)(dist_esm.BrushTool);
 }
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/index.tsx
@@ -1739,11 +1757,10 @@ const extension = {
    */
   getPanelModule: src_getPanelModule,
   getCommandsModule: src_commandsModule,
-  getViewportModule(_ref) {
-    let {
-      servicesManager,
-      extensionManager
-    } = _ref;
+  getViewportModule({
+    servicesManager,
+    extensionManager
+  }) {
     const ExtendedOHIFCornerstoneSEGViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneSEGViewport, _extends({
         servicesManager: servicesManager,
@@ -1767,13 +1784,6 @@ const extension = {
 };
 /* harmony default export */ const cornerstone_dicom_seg_src = (extension);
 
-/***/ }),
-
-/***/ 78753:
-/***/ (() => {
-
-/* (ignored) */
-
 /***/ })
 
 }]);