@ohif/app 3.8.0-beta.86 → 3.8.0-beta.87

package/dist/{724.bundle.634bee9667a518d1202f.js → 724.bundle.275035c2002c8fd78471.js}

@@ -21,7 +21,6 @@ const toolGroupIds = {
   Fusion: 'fusionToolGroup',
   MIP: 'mipToolGroup',
   default: 'default'
-  // MPR: 'mpr',
 };
 function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig) {
   const tools = {
@@ -87,6 +86,60 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mo
       toolName: toolNames.CobbAngle
     }, {
       toolName: toolNames.Magnify
+    }, {
+      toolName: 'CircularBrush',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'FILL_INSIDE_CIRCLE'
+      }
+    }, {
+      toolName: 'CircularEraser',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'ERASE_INSIDE_CIRCLE'
+      }
+    }, {
+      toolName: 'SphereBrush',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'FILL_INSIDE_SPHERE'
+      }
+    }, {
+      toolName: 'SphereEraser',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'ERASE_INSIDE_SPHERE'
+      }
+    }, {
+      toolName: 'ThresholdCircularBrush',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'THRESHOLD_INSIDE_CIRCLE'
+      }
+    }, {
+      toolName: 'ThresholdSphereBrush',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'THRESHOLD_INSIDE_SPHERE'
+      }
+    }, {
+      toolName: 'ThresholdCircularBrushDynamic',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'THRESHOLD_INSIDE_CIRCLE',
+        // preview: {
+        //   enabled: true,
+        // },
+        strategySpecificConfiguration: {
+          // to use the use the center segment index to determine
+          // if inside -> same segment, if outside -> eraser
+          // useCenterSegmentIndex: true,
+          THRESHOLD: {
+            isDynamic: true,
+            dynamicRadius: 3
+          }
+        }
+      }
     }],
     enabled: [{
       toolName: toolNames.SegmentationDisplay
@@ -149,15 +202,21 @@ function initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mod
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/toolbarButtons.js
 
 
-const {
-  windowLevelPresets
-} = src.defaults;
 const setToolActiveToolbar = {
   commandName: 'setToolActiveToolbar',
   commandOptions: {
     toolGroupIds: [toolGroupIds.CT, toolGroupIds.PT, toolGroupIds.Fusion]
   }
 };
+function _createSetToolActiveCommands(toolName) {
+  return [{
+    commandName: 'setToolActiveToolbar',
+    commandOptions: {
+      toolName,
+      toolGroupIds: [toolGroupIds.CT, toolGroupIds.PT, toolGroupIds.Fusion]
+    }
+  }];
+}
 const toolbarButtons = [{
   id: 'MeasurementTools',
   uiType: 'ohif.splitButton',
@@ -249,12 +308,180 @@ const toolbarButtons = [{
     icon: 'tool-create-threshold',
     label: 'Rectangle ROI Threshold',
     commands: setToolActiveToolbar,
-    evaluate: {
+    evaluate: ['evaluate.cornerstone.segmentation',
+    // need to put the disabled text last, since each evaluator will
+    // merge the result text into the final result
+    {
       name: 'evaluate.cornerstoneTool',
       disabledText: 'Select the PT Axial to enable this tool'
-    },
+    }],
     options: 'tmtv.RectangleROIThresholdOptions'
   }
+}, {
+  id: 'BrushTools',
+  uiType: 'ohif.buttonGroup',
+  props: {
+    groupId: 'BrushTools',
+    items: [{
+      id: 'Brush',
+      icon: 'icon-tool-brush',
+      label: 'Brush',
+      evaluate: {
+        name: 'evaluate.cornerstone.segmentation',
+        toolNames: ['CircularBrush', 'SphereBrush'],
+        disabledText: 'Create new segmentation to enable this tool.'
+      },
+      commands: _createSetToolActiveCommands('CircularBrush'),
+      options: [{
+        name: 'Radius (mm)',
+        id: 'brush-radius',
+        type: 'range',
+        min: 0.5,
+        max: 99.5,
+        step: 0.5,
+        value: 25,
+        commands: {
+          commandName: 'setBrushSize',
+          commandOptions: {
+            toolNames: ['CircularBrush', 'SphereBrush']
+          }
+        }
+      }, {
+        name: 'Shape',
+        type: 'radio',
+        id: 'brush-mode',
+        value: 'CircularBrush',
+        values: [{
+          value: 'CircularBrush',
+          label: 'Circle'
+        }, {
+          value: 'SphereBrush',
+          label: 'Sphere'
+        }],
+        commands: 'setToolActiveToolbar'
+      }]
+    }, {
+      id: 'Eraser',
+      icon: 'icon-tool-eraser',
+      label: 'Eraser',
+      evaluate: {
+        name: 'evaluate.cornerstone.segmentation',
+        toolNames: ['CircularEraser', 'SphereEraser']
+      },
+      commands: _createSetToolActiveCommands('CircularEraser'),
+      options: [{
+        name: 'Radius (mm)',
+        id: 'eraser-radius',
+        type: 'range',
+        min: 0.5,
+        max: 99.5,
+        step: 0.5,
+        value: 25,
+        commands: {
+          commandName: 'setBrushSize',
+          commandOptions: {
+            toolNames: ['CircularEraser', 'SphereEraser']
+          }
+        }
+      }, {
+        name: 'Shape',
+        type: 'radio',
+        id: 'eraser-mode',
+        value: 'CircularEraser',
+        values: [{
+          value: 'CircularEraser',
+          label: 'Circle'
+        }, {
+          value: 'SphereEraser',
+          label: 'Sphere'
+        }],
+        commands: 'setToolActiveToolbar'
+      }]
+    }, {
+      id: 'Threshold',
+      icon: 'icon-tool-threshold',
+      label: 'Threshold Tool',
+      evaluate: {
+        name: 'evaluate.cornerstone.segmentation',
+        toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
+      },
+      commands: _createSetToolActiveCommands('ThresholdCircularBrush'),
+      options: [{
+        name: 'Radius (mm)',
+        id: 'threshold-radius',
+        type: 'range',
+        min: 0.5,
+        max: 99.5,
+        step: 0.5,
+        value: 25,
+        commands: {
+          commandName: 'setBrushSize',
+          commandOptions: {
+            toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush', 'ThresholdCircularBrushDynamic']
+          }
+        }
+      }, {
+        name: 'Threshold',
+        type: 'radio',
+        id: 'dynamic-mode',
+        value: 'ThresholdRange',
+        values: [{
+          value: 'ThresholdDynamic',
+          label: 'Dynamic'
+        }, {
+          value: 'ThresholdRange',
+          label: 'Range'
+        }],
+        commands: ({
+          value,
+          commandsManager
+        }) => {
+          if (value === 'ThresholdDynamic') {
+            commandsManager.run('setToolActive', {
+              toolName: 'ThresholdCircularBrushDynamic'
+            });
+          } else {
+            commandsManager.run('setToolActive', {
+              toolName: 'ThresholdCircularBrush'
+            });
+          }
+        }
+      }, {
+        name: 'Shape',
+        type: 'radio',
+        id: 'eraser-mode',
+        value: 'ThresholdCircularBrush',
+        values: [{
+          value: 'ThresholdCircularBrush',
+          label: 'Circle'
+        }, {
+          value: 'ThresholdSphereBrush',
+          label: 'Sphere'
+        }],
+        condition: ({
+          options
+        }) => options.find(option => option.id === 'dynamic-mode').value === 'ThresholdRange',
+        commands: 'setToolActiveToolbar'
+      }, {
+        name: 'ThresholdRange',
+        type: 'double-range',
+        id: 'threshold-range',
+        min: 0,
+        max: 50,
+        step: 0.5,
+        values: [2.5, 50],
+        condition: ({
+          options
+        }) => options.find(option => option.id === 'dynamic-mode').value === 'ThresholdRange',
+        commands: {
+          commandName: 'setThresholdRange',
+          commandOptions: {
+            toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
+          }
+        }
+      }]
+    }]
+  }
 }];
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/package.json
@@ -396,7 +623,7 @@ function modeFactory({
       unsubscriptions.push(unsubscribe);
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'WindowLevel', 'Crosshairs', 'Pan', 'SyncToggle']);
-      toolbarService.createButtonSection('ROIThresholdToolbox', ['RectangleROIStartEndThreshold']);
+      toolbarService.createButtonSection('ROIThresholdToolbox', ['RectangleROIStartEndThreshold', 'BrushTools']);
       customizationService.addModeCustomizations([{
         id: 'segmentation.panel',
         segmentationPanelMode: 'expanded',

package/dist/{726.bundle.0b3d9277d22fe7e15b89.js → 726.bundle.c8de818cf1a3ff0cf7d2.js}

@@ -1126,7 +1126,7 @@ module.exports = baseIsEqual;
 var Stack = __webpack_require__(2951),
     equalArrays = __webpack_require__(74997),
     equalByTag = __webpack_require__(98416),
-    equalObjects = __webpack_require__(31163),
+    equalObjects = __webpack_require__(53544),
     getTag = __webpack_require__(32803),
     isArray = __webpack_require__(15343),
     isBuffer = __webpack_require__(65698),
@@ -2461,7 +2461,7 @@ module.exports = equalByTag;
 
 /***/ }),
 
-/***/ 31163:
+/***/ 53544:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 var getAllKeys = __webpack_require__(75652);

package/dist/{164.bundle.288b10692cc72b81a98d.js → 783.bundle.b28ae6b134602470e2f1.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[164],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[783],{
 
 /***/ 164:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

package/dist/{835.bundle.15aff0b7433bb0dd6d6d.js → 835.bundle.4c0eaa2c1a427ee41817.js}

@@ -477,7 +477,7 @@ function createActorContext(machine, interpreterOptions, observerOrListener) {
 
 /***/ }),
 
-/***/ 2465:
+/***/ 24846:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 /**
@@ -520,7 +520,7 @@ u(function(){f.hasValue=!0;f.value=d},[d]);w(d);return d};
 
 
 if (true) {
-  module.exports = __webpack_require__(2465);
+  module.exports = __webpack_require__(24846);
 } else {}
 
 

package/dist/{862.bundle.217ce894d955626c78c5.js → 862.bundle.4be5d148c2b1adf4dbf3.js}

@@ -12,9 +12,9 @@ __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_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5085);
-/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24542);
+/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39371);
 /* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(219);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(73868);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(92136);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(80619);
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 

package/dist/{889.bundle.e2700d7456565ce71dad.js → 889.bundle.1a646aa901e073328cad.js}

@@ -2576,7 +2576,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(433), __webpack_require__.e(183), __webpack_require__.e(644), __webpack_require__.e(931), __webpack_require__.e(206), __webpack_require__.e(544)]).then(__webpack_require__.bind(__webpack_require__, 17919));
+  return Promise.all(/* import() */[__webpack_require__.e(203), __webpack_require__.e(473), __webpack_require__.e(483), __webpack_require__.e(236), __webpack_require__.e(644), __webpack_require__.e(931), __webpack_require__.e(206), __webpack_require__.e(544)]).then(__webpack_require__.bind(__webpack_require__, 17919));
 });
 const MicroscopyViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{94.bundle.b35c818d871de99336d8.js → 94.bundle.d6749c52eb6327bd45de.js}

@@ -442,7 +442,7 @@ const segmentationButtons_toolbarButtons = [{
       },
       commands: _createSetToolActiveCommands('CircularBrush'),
       options: [{
-        name: 'Radius (mm)',
+        name: 'Size (mm)',
         id: 'brush-radius',
         type: 'range',
         min: 0.5,
@@ -547,9 +547,9 @@ const segmentationButtons_toolbarButtons = [{
         type: 'double-range',
         id: 'threshold-range',
         min: 0,
-        max: 10,
-        step: 1,
-        values: [2, 5],
+        max: 100,
+        step: 0.5,
+        values: [2, 50],
         commands: {
           commandName: 'setThresholdRange',
           commandOptions: {