@ohif/app 3.8.0-beta.80 → 3.8.0-beta.81

package/dist/{540.bundle.079d43a6717e95c24392.js → 669.bundle.b17e8a621e38d92c653f.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[540],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[669],{
 
-/***/ 53540:
+/***/ 61669:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -9,7 +9,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  createReferencedImageDisplaySet: () => (/* reexport */ utils_createReferencedImageDisplaySet),
+  createReferencedImageDisplaySet: () => (/* reexport */ createReferencedImageDisplaySet/* default */.A),
   "default": () => (/* binding */ cornerstone_dicom_sr_src),
   hydrateStructuredReport: () => (/* reexport */ hydrateStructuredReport/* default */.A),
   srProtocol: () => (/* reexport */ srProtocol)
@@ -82,7 +82,7 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
       const activeTrackingUniqueIdentifier = trackingUniqueIdentifiers[activeIndex];
 
       // Filter toolData to only render the data for the active SR.
-      const filteredAnnotations = annotations.filter(annotation => trackingUniqueIdentifiers.includes(annotation.data?.cachedStats?.TrackingUniqueIdentifier));
+      const filteredAnnotations = annotations.filter(annotation => trackingUniqueIdentifiers.includes(annotation.data?.TrackingUniqueIdentifier));
       if (!viewport._actors?.size) {
         return;
       }
@@ -98,10 +98,8 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
         const annotation = filteredAnnotations[i];
         const annotationUID = annotation.annotationUID;
         const {
-          renderableData
-        } = annotation.data.cachedStats;
-        const {
-          cachedStats
+          renderableData,
+          TrackingUniqueIdentifier
         } = annotation.data;
         const {
           referencedImageId
@@ -110,7 +108,7 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
         const groupStyle = annotationStyle.getToolGroupToolStyles(this.toolGroupId)[this.getToolName()];
         const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
         const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
-        const color = cachedStats.TrackingUniqueIdentifier === activeTrackingUniqueIdentifier ? 'rgb(0, 255, 0)' : this.getStyle('color', styleSpecifier, annotation);
+        const color = TrackingUniqueIdentifier === activeTrackingUniqueIdentifier ? 'rgb(0, 255, 0)' : this.getStyle('color', styleSpecifier, annotation);
         const options = {
           color,
           lineDash,
@@ -367,10 +365,9 @@ function addDICOMSRDisplayAnnotation(measurement, imageId, frameNumber) {
       handles: {
         textBox: measurement.textBox ?? {}
       },
-      cachedStats: {
-        TrackingUniqueIdentifier: measurementData.TrackingUniqueIdentifier,
-        renderableData: measurementData.renderableData
-      },
+      cachedStats: {},
+      TrackingUniqueIdentifier: measurementData.TrackingUniqueIdentifier,
+      renderableData: measurementData.renderableData,
       frameNumber
     }
   };
@@ -1405,9 +1402,90 @@ function init({
 }
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js + 1 modules
 var hydrateStructuredReport = __webpack_require__(77089);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/createReferencedImageDisplaySet.ts
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/createReferencedImageDisplaySet.ts
+var createReferencedImageDisplaySet = __webpack_require__(92643);
+;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx
+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); }
+
+
+
+
+
+
+
+
+
+
+const Component = /*#__PURE__*/react.lazy(() => {
+  return __webpack_require__.e(/* import() */ 530).then(__webpack_require__.bind(__webpack_require__, 58530));
+});
+const OHIFCornerstoneSRViewport = props => {
+  return /*#__PURE__*/react.createElement(react.Suspense, {
+    fallback: /*#__PURE__*/react.createElement("div", null, "Loading...")
+  }, /*#__PURE__*/react.createElement(Component, props));
+};
 
-const createReferencedImageDisplaySet_ImageSet = src.classes.ImageSet;
+/**
+ *
+ */
+const dicomSRExtension = {
+  /**
+   * Only required property. Should be a unique value across all extensions.
+   */
+  id: id,
+  onModeEnter: onModeEnter,
+  preRegistration: init,
+  /**
+   *
+   *
+   * @param {object} [configuration={}]
+   * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
+   */
+  getViewportModule({
+    servicesManager,
+    extensionManager
+  }) {
+    const ExtendedOHIFCornerstoneSRViewport = props => {
+      return /*#__PURE__*/react.createElement(OHIFCornerstoneSRViewport, _extends({
+        servicesManager: servicesManager,
+        extensionManager: extensionManager
+      }, props));
+    };
+    return [{
+      name: 'dicom-sr',
+      component: ExtendedOHIFCornerstoneSRViewport
+    }];
+  },
+  getCommandsModule: src_commandsModule,
+  getSopClassHandlerModule: src_getSopClassHandlerModule,
+  // Include dynamically computed values such as toolNames not known till instantiation
+  getUtilityModule({
+    servicesManager
+  }) {
+    return [{
+      name: 'tools',
+      exports: {
+        toolNames: tools_toolNames
+      }
+    }];
+  }
+};
+/* harmony default export */ const cornerstone_dicom_sr_src = (dicomSRExtension);
+
+// Put static exports here so they can be type checked
+
+
+/***/ }),
+
+/***/ 92643:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55411);
+
+const ImageSet = _ohif_core__WEBPACK_IMPORTED_MODULE_0__.classes.ImageSet;
 const findInstance = (measurement, displaySetService) => {
   const {
     displaySetInstanceUID,
@@ -1463,7 +1541,7 @@ const createReferencedImageDisplaySet = (displaySetService, displaySet) => {
     this.images.splice(0, this.images.length, ...findReferencedInstances(displaySetService, displaySet));
     this.numImageFrames = this.images.length;
   };
-  const imageSet = new createReferencedImageDisplaySet_ImageSet(instances);
+  const imageSet = new ImageSet(instances);
   const instance = instances[0];
   imageSet.setAttributes({
     displaySetInstanceUID: imageSet.uid,
@@ -1489,77 +1567,7 @@ const createReferencedImageDisplaySet = (displaySetService, displaySet) => {
   displaySetService.addDisplaySets(imageSet);
   return imageSet;
 };
-/* harmony default export */ const utils_createReferencedImageDisplaySet = (createReferencedImageDisplaySet);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx
-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); }
-
-
-
-
-
-
-
-
-
-
-const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 530).then(__webpack_require__.bind(__webpack_require__, 58530));
-});
-const OHIFCornerstoneSRViewport = props => {
-  return /*#__PURE__*/react.createElement(react.Suspense, {
-    fallback: /*#__PURE__*/react.createElement("div", null, "Loading...")
-  }, /*#__PURE__*/react.createElement(Component, props));
-};
-
-/**
- *
- */
-const dicomSRExtension = {
-  /**
-   * Only required property. Should be a unique value across all extensions.
-   */
-  id: id,
-  onModeEnter: onModeEnter,
-  preRegistration: init,
-  /**
-   *
-   *
-   * @param {object} [configuration={}]
-   * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
-   */
-  getViewportModule({
-    servicesManager,
-    extensionManager
-  }) {
-    const ExtendedOHIFCornerstoneSRViewport = props => {
-      return /*#__PURE__*/react.createElement(OHIFCornerstoneSRViewport, _extends({
-        servicesManager: servicesManager,
-        extensionManager: extensionManager
-      }, props));
-    };
-    return [{
-      name: 'dicom-sr',
-      component: ExtendedOHIFCornerstoneSRViewport
-    }];
-  },
-  getCommandsModule: src_commandsModule,
-  getSopClassHandlerModule: src_getSopClassHandlerModule,
-  // Include dynamically computed values such as toolNames not known till instantiation
-  getUtilityModule({
-    servicesManager
-  }) {
-    return [{
-      name: 'tools',
-      exports: {
-        toolNames: tools_toolNames
-      }
-    }];
-  }
-};
-/* harmony default export */ const cornerstone_dicom_sr_src = (dicomSRExtension);
-
-// Put static exports here so they can be type checked
-
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (createReferencedImageDisplaySet);
 
 /***/ }),
 

package/dist/{699.bundle.4f01772e7ce6637de339.js → 699.bundle.9367d7ef9f7615b2e733.js}

@@ -32,19 +32,7 @@ const ReferenceLinesListeners = [{
 const setToolActiveToolbar = {
   commandName: 'setToolActiveToolbar',
   commandOptions: {
-    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
-  }
-};
-const toggleEnabledDisabledToolbar = {
-  commandName: 'toggleEnabledDisabledToolbar',
-  commandOptions: {
-    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
-  }
-};
-const toggleActiveDisabledToolbar = {
-  commandName: 'toggleActiveDisabledToolbar',
-  commandOptions: {
-    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
+    toolGroupIds: ['default', 'mpr', 'SRToolGroup', 'volume3d']
   }
 };
 const toolbarButtons = [{
@@ -167,7 +155,7 @@ const toolbarButtons = [{
       icon: 'tool-referenceLines',
       label: 'Reference Lines',
       tooltip: 'Show Reference Lines',
-      commands: toggleEnabledDisabledToolbar,
+      commands: 'toggleEnabledDisabledToolbar',
       listeners: {
         [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesListeners,
         [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: ReferenceLinesListeners
@@ -178,7 +166,7 @@ const toolbarButtons = [{
       icon: 'toggle-dicom-overlay',
       label: 'Image Overlay',
       tooltip: 'Toggle Image Overlay',
-      commands: toggleEnabledDisabledToolbar,
+      commands: 'toggleEnabledDisabledToolbar',
       evaluate: 'evaluate.cornerstoneTool.toggle'
     }), createButton({
       id: 'StackScroll',
@@ -247,8 +235,8 @@ const toolbarButtons = [{
       icon: 'icon-tool-loupe',
       label: 'Loupe',
       tooltip: 'Loupe',
-      commands: toggleActiveDisabledToolbar,
-      evaluate: 'evaluate.cornerstoneTool'
+      commands: 'toggleActiveDisabledToolbar',
+      evaluate: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled'
     }), createButton({
       id: 'UltrasoundDirectionalTool',
       icon: 'icon-tool-ultrasound-bidirectional',
@@ -280,9 +268,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Brush',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['CircularBrush', 'SphereBrush']
-        },
+        toolNames: ['CircularBrush', 'SphereBrush'],
         disabledText: 'Create new segmentation to enable this tool.'
       },
       commands: _createSetToolActiveCommands('CircularBrush'),
@@ -320,9 +306,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Eraser',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['CircularEraser', 'SphereEraser']
-        }
+        toolNames: ['CircularEraser', 'SphereEraser']
       },
       commands: _createSetToolActiveCommands('CircularEraser'),
       options: [{
@@ -359,9 +343,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Threshold Tool',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
-        }
+        toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
       },
       commands: _createSetToolActiveCommands('ThresholdCircularBrush'),
       options: [{
@@ -403,8 +385,19 @@ const segmentationButtons_toolbarButtons = [{
           value: 'ThresholdRange',
           label: 'Range'
         }],
-        commands: {
-          commandName: 'toggleThresholdRangeAndDynamic'
+        commands: ({
+          value,
+          commandsManager
+        }) => {
+          if (value === 'ThresholdDynamic') {
+            commandsManager.run('setToolActive', {
+              toolName: 'ThresholdCircularBrushDynamic'
+            });
+          } else {
+            commandsManager.run('setToolActive', {
+              toolName: 'ThresholdCircularBrush'
+            });
+          }
         }
       }, {
         name: 'ThresholdRange',
@@ -433,9 +426,7 @@ const segmentationButtons_toolbarButtons = [{
     label: 'Shapes',
     evaluate: {
       name: 'evaluate.cornerstone.segmentation',
-      options: {
-        toolNames: ['CircleScissor', 'SphereScissor', 'RectangleScissor']
-      }
+      toolNames: ['CircleScissor', 'SphereScissor', 'RectangleScissor']
     },
     icon: 'icon-tool-shape',
     commands: _createSetToolActiveCommands('CircleScissor'),
@@ -513,15 +504,28 @@ function createTools(utilityModule) {
       toolName: 'ThresholdCircularBrush',
       parentTool: 'Brush',
       configuration: {
-        activeStrategy: 'THRESHOLD_INSIDE_CIRCLE',
-        dynamicRadius: 3
+        activeStrategy: 'THRESHOLD_INSIDE_CIRCLE'
       }
     }, {
       toolName: 'ThresholdSphereBrush',
       parentTool: 'Brush',
       configuration: {
-        activeStrategy: 'THRESHOLD_INSIDE_SPHERE',
-        dynamicRadius: 3
+        activeStrategy: 'THRESHOLD_INSIDE_SPHERE'
+      }
+    }, {
+      toolName: 'ThresholdCircularBrushDynamic',
+      parentTool: 'Brush',
+      configuration: {
+        activeStrategy: 'THRESHOLD_INSIDE_CIRCLE',
+        preview: {
+          enabled: true
+        },
+        strategySpecificConfiguration: {
+          THRESHOLD: {
+            isDynamic: true,
+            dynamicRadius: 3
+          }
+        }
       }
     }, {
       toolName: toolNames.CircleScissors
@@ -535,13 +539,13 @@ function createTools(utilityModule) {
       toolName: toolNames.Magnify
     }, {
       toolName: toolNames.SegmentationDisplay
-    }, {
-      toolName: toolNames.AdvancedMagnify
     }, {
       toolName: toolNames.UltrasoundDirectional
     }],
     disabled: [{
       toolName: toolNames.ReferenceLines
+    }, {
+      toolName: toolNames.AdvancedMagnify
     }]
   };
 }

package/dist/{724.bundle.e5794460c391ee9cba2c.js → 724.bundle.55f9f49816de931af91a.js}

@@ -471,7 +471,7 @@ function modeFactory({
     }) => {
       const modalities_list = modalities.split('\\');
       const invalidModalities = ['SM'];
-      const isValid = modalities_list.includes('CT') && modalities_list.includes('PT') && !invalidModalities.some(modality => modalities_list.includes(modality)) &&
+      const isValid = modalities_list.includes('CT') && study.mrn !== 'M1' && modalities_list.includes('PT') && !invalidModalities.some(modality => modalities_list.includes(modality)) &&
       // This is study is a 4D study with PT and CT and not a 3D study for the tmtv
       // mode, until we have a better way to identify 4D studies we will use the
       // StudyInstanceUID to identify the study

package/dist/{862.bundle.c0ee6e1d4d97e1353213.js → 862.bundle.d32ab08e64806b2e964d.js}

@@ -196,7 +196,10 @@ function TrackedCornerstoneViewport(props) {
       component: Component
     } = extensionManager.getModuleEntry('@ohif/extension-cornerstone.viewportModule.cornerstone');
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(Component, _extends({}, props, {
-      onElementEnabled: onElementEnabled,
+      onElementEnabled: evt => {
+        props.onElementEnabled?.(evt);
+        onElementEnabled(evt);
+      },
       onElementDisabled: onElementDisabled
     }));
   };

package/dist/{94.bundle.c452d9b0645277c2cf4e.js → 94.bundle.f5f2479c214180d05d42.js}

@@ -438,9 +438,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Brush',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['CircularBrush', 'SphereBrush']
-        }
+        toolNames: ['CircularBrush', 'SphereBrush']
       },
       commands: _createSetToolActiveCommands('CircularBrush'),
       options: [{
@@ -477,9 +475,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Eraser',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['CircularEraser', 'SphereEraser']
-        }
+        toolNames: ['CircularEraser', 'SphereEraser']
       },
       commands: _createSetToolActiveCommands('CircularEraser'),
       options: [{
@@ -516,9 +512,7 @@ const segmentationButtons_toolbarButtons = [{
       label: 'Eraser',
       evaluate: {
         name: 'evaluate.cornerstone.segmentation',
-        options: {
-          toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
-        }
+        toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush']
       },
       commands: _createSetToolActiveCommands('ThresholdCircularBrush'),
       options: [{
@@ -572,9 +566,7 @@ const segmentationButtons_toolbarButtons = [{
     label: 'Shapes',
     evaluate: {
       name: 'evaluate.cornerstone.segmentation',
-      options: {
-        toolNames: ['CircleScissor', 'SphereScissor', 'RectangleScissor']
-      }
+      toolNames: ['CircleScissor', 'SphereScissor', 'RectangleScissor']
     },
     icon: 'icon-tool-shape',
     commands: _createSetToolActiveCommands('CircleScissor'),
@@ -681,7 +673,9 @@ function modeFactory({
       } = cornerstoneViewportService.subscribe(cornerstoneViewportService.EVENTS.VIEWPORT_VOLUMES_CHANGED, () => {
         const viewportId = viewportGridService.getActiveViewportId();
         const csViewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-        cineService.playClip(csViewport.element);
+        cineService.playClip(csViewport.element, {
+          viewportId
+        });
         // cineService.setIsCineEnabled(true);
 
         unsubscribe();