@ohif/app 3.8.0-beta.3 → 3.8.0-beta.31

package/dist/{12.bundle.9b2ef667aa885a578371.js → 12.bundle.baf03be6fd41c521f9b0.js}

@@ -1,5 +1,5 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[12],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[12],{
 
 /***/ 85012:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -107,11 +107,10 @@ const _getDisplaySetsFromSeries = (instances, servicesManager, extensionManager)
     return displaySet;
   });
 };
-function getSopClassHandlerModule(_ref) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+function getSopClassHandlerModule({
+  servicesManager,
+  extensionManager
+}) {
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -149,11 +148,10 @@ const dicomVideoExtension = {
    * @param {object} [configuration={}]
    * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
    */
-  getViewportModule(_ref) {
-    let {
-      servicesManager,
-      extensionManager
-    } = _ref;
+  getViewportModule({
+    servicesManager,
+    extensionManager
+  }) {
     const ExtendedOHIFCornerstoneVideoViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneVideoViewport, _extends({
         servicesManager: servicesManager,

package/dist/{125.bundle.253395f320b72180da63.js → 125.bundle.df666cb677e5a8982157.js}

@@ -1,5 +1,5 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[125],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[125],{
 
 /***/ 39125:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -13,10 +13,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
 
 
-function OHIFCornerstonePdfViewport(_ref) {
-  let {
-    displaySets
-  } = _ref;
+function OHIFCornerstonePdfViewport({
+  displaySets
+}) {
   const [url, setUrl] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null);
   if (displaySets && displaySets.length > 1) {
     throw new Error('OHIFCornerstonePdfViewport: only one display set is supported for dicom pdf right now');

package/dist/{663.bundle.81cfb1c981897d109629.js → 170.bundle.5fffe3391db9fff495bf.js}

@@ -1,9 +1,9 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[663],{
+"use strict";
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[170],{
 
 /***/ 42170:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -29,10 +29,10 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(45451);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var core_dist_esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 424 modules
+var dist_esm = __webpack_require__(74566);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 364 modules
+var core_dist_esm = __webpack_require__(27968);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
 var dicomSRModule = __webpack_require__(64035);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/constants/scoordTypes.js
@@ -49,11 +49,9 @@ var dicomSRModule = __webpack_require__(64035);
 
 
 class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
-  constructor() {
-    let toolProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let defaultToolProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      configuration: {}
-    };
+  constructor(toolProps = {}, defaultToolProps = {
+    configuration: {}
+  }) {
     super(toolProps, defaultToolProps);
     // This tool should not inherit from AnnotationTool and we should not need
     // to add the following lines.
@@ -173,7 +171,6 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
     });
     return allCanvasCoordinates; // used for drawing textBox
   }
-
   renderMultipoint(svgDrawingHelper, viewport, renderableData, annotationUID, referencedImageId, options) {
     let canvasCoordinates;
     renderableData.map((data, index) => {
@@ -216,7 +213,6 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
     });
     return canvasCoordinates; // used for drawing textBox
   }
-
   renderEllipse(svgDrawingHelper, viewport, renderableData, annotationUID, referencedImageId, options) {
     let canvasCoordinates;
     renderableData.map((data, index) => {
@@ -242,8 +238,7 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
     });
     return canvasCoordinates;
   }
-  renderTextBox(svgDrawingHelper, viewport, canvasCoordinates, canvasCoordinatesAdapter, annotation, styleSpecifier) {
-    let options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+  renderTextBox(svgDrawingHelper, viewport, canvasCoordinates, canvasCoordinatesAdapter, annotation, styleSpecifier, options = {}) {
     if (!canvasCoordinates || !annotation) {
       return;
     }
@@ -264,7 +259,9 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
     }
     const textLines = this._getTextBoxLinesFromLabels(label);
     const canvasTextBoxCoords = dist_esm.utilities.drawing.getTextBoxCoordsCanvas(adaptedCanvasCoordinates);
-    annotation.data.handles.textBox.worldPosition = viewport.canvasToWorld(canvasTextBoxCoords);
+    if (!annotation.data?.handles?.textBox?.worldPosition) {
+      annotation.data.handles.textBox.worldPosition = viewport.canvasToWorld(canvasTextBoxCoords);
+    }
     const textBoxPosition = viewport.worldToCanvas(annotation.data.handles.textBox.worldPosition);
     const textBoxUID = '1';
     const textBoxOptions = this.getLinkedTextBoxStyle(styleSpecifier, annotation);
@@ -360,7 +357,7 @@ function addMeasurement(measurement, imageId, displaySetInstanceUID) {
     data: {
       label: measurement.labels,
       handles: {
-        textBox: {}
+        textBox: measurement.textBox ?? {}
       },
       cachedStats: {
         TrackingUniqueIdentifier: measurementData.TrackingUniqueIdentifier,
@@ -565,7 +562,6 @@ const sopClassUids = ['1.2.840.10008.5.1.4.1.1.88.11',
 //COMPREHENSIVE_SR:
 '1.2.840.10008.5.1.4.1.1.88.34' //COMPREHENSIVE_3D_SR:
 ];
-
 const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
 const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
 const validateSameStudyUID = (uid, instances) => {
@@ -589,7 +585,6 @@ const CodeNameCodeSequenceValues = {
   // SRT
   CornerstoneFreeText: Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT //
 };
-
 const CodingSchemeDesignators = {
   SRT: 'SRT',
   CornerstoneCodeSchemes: [Cornerstone3DCodeScheme.CodingSchemeDesignator, 'CST4']
@@ -699,7 +694,7 @@ function _load(displaySet, servicesManager, extensionManager) {
 
   // Check currently added displaySets and add measurements if the sources exist.
   displaySetService.activeDisplaySets.forEach(activeDisplaySet => {
-    _checkIfCanAddMeasurementsToDisplaySet(displaySet, activeDisplaySet, dataSource);
+    _checkIfCanAddMeasurementsToDisplaySet(displaySet, activeDisplaySet, dataSource, servicesManager);
   });
 
   // Subscribe to new displaySets as the source may come in after.
@@ -710,11 +705,14 @@ function _load(displaySet, servicesManager, extensionManager) {
     // If there are still some measurements that have not yet been loaded into cornerstone,
     // See if we can load them onto any of the new displaySets.
     displaySetsAdded.forEach(newDisplaySet => {
-      _checkIfCanAddMeasurementsToDisplaySet(displaySet, newDisplaySet, dataSource);
+      _checkIfCanAddMeasurementsToDisplaySet(displaySet, newDisplaySet, dataSource, servicesManager);
     });
   });
 }
-function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dataSource) {
+function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dataSource, servicesManager) {
+  const {
+    customizationService
+  } = servicesManager.services;
   let unloadedMeasurements = srDisplaySet.measurements.filter(measurement => measurement.loaded === false);
   if (unloadedMeasurements.length === 0) {
     // All already loaded!
@@ -724,9 +722,11 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     // This also filters out _this_ displaySet, as it is not an ImageSet.
     return;
   }
+  if (newDisplaySet.unsupported) {
+    return;
+  }
   const {
-    sopClassUids,
-    images
+    sopClassUids
   } = newDisplaySet;
 
   // Check if any have the newDisplaySet is the correct SOPClass.
@@ -759,7 +759,15 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     } = metadataProvider.getUIDsFromImageID(imageId);
     if (SOPInstanceUIDs.includes(SOPInstanceUID)) {
       for (let j = unloadedMeasurements.length - 1; j >= 0; j--) {
-        const measurement = unloadedMeasurements[j];
+        let measurement = unloadedMeasurements[j];
+        const onBeforeSRAddMeasurement = customizationService.getModeCustomization('onBeforeSRAddMeasurement')?.value;
+        if (typeof onBeforeSRAddMeasurement === 'function') {
+          measurement = onBeforeSRAddMeasurement({
+            measurement,
+            StudyInstanceUID: srDisplaySet.StudyInstanceUID,
+            SeriesInstanceUID: srDisplaySet.SeriesInstanceUID
+          });
+        }
         if (_measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frameNumber)) {
           addMeasurement(measurement, imageId, newDisplaySet.displaySetInstanceUID);
           unloadedMeasurements.splice(j, 1);
@@ -789,11 +797,10 @@ function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frame
     }
   }
 }
-function getSopClassHandlerModule(_ref) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+function getSopClassHandlerModule({
+  servicesManager,
+  extensionManager
+}) {
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -978,7 +985,6 @@ function _getLabelFromMeasuredValueSequence(ConceptNameCodeSequence, MeasuredVal
     value: `${formatedNumericValue} ${CodeValue}`
   }; // E.g. Long Axis: 31.0 mm
 }
-
 function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
   const ImageLibrary = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.ImageLibrary);
   const ImageLibraryGroup = _getSequenceAsArray(ImageLibrary.ContentSequence).find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.ImageLibraryGroup);
@@ -1078,10 +1084,9 @@ function getHangingProtocolModule() {
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/onModeEnter.js
 
-function onModeEnter(_ref) {
-  let {
-    servicesManager
-  } = _ref;
+function onModeEnter({
+  servicesManager
+}) {
   const {
     displaySetService
   } = servicesManager.services;
@@ -1200,8 +1205,7 @@ const {
  * @param options Naturalized DICOM JSON headers to merge into the displaySet.
  *
  */
-const _generateReport = function (measurementData, additionalFindingTypes) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+const _generateReport = (measurementData, additionalFindingTypes, options = {}) => {
   const filteredToolState = utils_getFilteredCornerstoneToolState(measurementData, additionalFindingTypes);
   const report = MeasurementReport.generateReport(filteredToolState, core_dist_esm.metaData, core_dist_esm.utilities.worldToImageCoords, options);
   const {
@@ -1215,8 +1219,13 @@ const _generateReport = function (measurementData, additionalFindingTypes) {
   }
   return dataset;
 };
-const commandsModule = _ref => {
-  let {} = _ref;
+const commandsModule = props => {
+  const {
+    servicesManager
+  } = props;
+  const {
+    customizationService
+  } = servicesManager.services;
   const actions = {
     /**
      *
@@ -1226,12 +1235,11 @@ const commandsModule = _ref => {
      * as opposed to Finding Sites.
      * that you wish to serialize.
      */
-    downloadReport: _ref2 => {
-      let {
-        measurementData,
-        additionalFindingTypes,
-        options = {}
-      } = _ref2;
+    downloadReport: ({
+      measurementData,
+      additionalFindingTypes,
+      options = {}
+    }) => {
       const srDataset = actions.generateReport(measurementData, additionalFindingTypes, options);
       const reportBlob = dcmjs_es["default"].data.datasetToBlob(srDataset);
 
@@ -1248,13 +1256,12 @@ const commandsModule = _ref => {
      * @param options Naturalized DICOM JSON headers to merge into the displaySet.
      * @return The naturalized report
      */
-    storeMeasurements: async _ref3 => {
-      let {
-        measurementData,
-        dataSource,
-        additionalFindingTypes,
-        options = {}
-      } = _ref3;
+    storeMeasurements: async ({
+      measurementData,
+      dataSource,
+      additionalFindingTypes,
+      options = {}
+    }) => {
       // Use the @cornerstonejs adapter for converting to/from DICOM
       // But it is good enough for now whilst we only have cornerstone as a datasource.
       commandsModule_log.info('[DICOMSR] storeMeasurements');
@@ -1275,7 +1282,15 @@ const commandsModule = _ref => {
           console.log('naturalizedReport missing imaging content', naturalizedReport);
           throw new Error('Invalid report, no content');
         }
-        await dataSource.store.dicom(naturalizedReport);
+        const onBeforeDicomStore = customizationService.getModeCustomization('onBeforeDicomStore')?.value;
+        let dicomDict;
+        if (typeof onBeforeDicomStore === 'function') {
+          dicomDict = onBeforeDicomStore({
+            measurementData,
+            naturalizedReport
+          });
+        }
+        await dataSource.store.dicom(naturalizedReport, null, dicomDict);
         if (StudyInstanceUID) {
           dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
         }
@@ -1327,10 +1342,9 @@ function addToolInstance(name, toolClass, configuration) {
 /**
  * @param {object} configuration
  */
-function init(_ref) {
-  let {
-    configuration = {}
-  } = _ref;
+function init({
+  configuration = {}
+}) {
   (0,dist_esm.addTool)(DICOMSRDisplayTool);
   addToolInstance(tools_toolNames.SRLength, dist_esm.LengthTool, {});
   addToolInstance(tools_toolNames.SRBidirectional, dist_esm.BidirectionalTool);
@@ -1484,11 +1498,10 @@ const dicomSRExtension = {
    * @param {object} [configuration={}]
    * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
    */
-  getViewportModule(_ref) {
-    let {
-      servicesManager,
-      extensionManager
-    } = _ref;
+  getViewportModule({
+    servicesManager,
+    extensionManager
+  }) {
     const ExtendedOHIFCornerstoneSRViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneSRViewport, _extends({
         servicesManager: servicesManager,
@@ -1503,10 +1516,9 @@ const dicomSRExtension = {
   getCommandsModule: src_commandsModule,
   getSopClassHandlerModule: src_getSopClassHandlerModule,
   // Include dynamically computed values such as toolNames not known till instantiation
-  getUtilityModule(_ref2) {
-    let {
-      servicesManager
-    } = _ref2;
+  getUtilityModule({
+    servicesManager
+  }) {
     return [{
       name: 'tools',
       exports: {
@@ -1525,13 +1537,12 @@ const dicomSRExtension = {
 /***/ 64035:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   l2: () => (/* binding */ setTrackingUniqueIdentifiersForElement),
 /* harmony export */   yR: () => (/* binding */ getTrackingUniqueIdentifiersForElement)
 /* harmony export */ });
 /* unused harmony export setActiveTrackingUniqueIdentifierForElement */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3743);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27968);
 
 const state = {
   TrackingUniqueIdentifier: null,
@@ -1546,8 +1557,7 @@ const state = {
  * of the SR tools in state here, so that we can filter them later.
  */
 
-function setTrackingUniqueIdentifiersForElement(element, trackingUniqueIdentifiers) {
-  let activeIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+function setTrackingUniqueIdentifiersForElement(element, trackingUniqueIdentifiers, activeIndex = 0) {
   const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
   const {
     viewport
@@ -1587,15 +1597,14 @@ function getTrackingUniqueIdentifiersForElement(element) {
 /***/ 38965:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   Z: () => (/* binding */ hydrateStructuredReport)
 });
 
-// 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 + 364 modules
+var esm = __webpack_require__(27968);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
@@ -1622,8 +1631,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
 }
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 424 modules
+var dist_esm = __webpack_require__(74566);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 
@@ -1676,12 +1685,11 @@ const convertSites = (codingValues, sites) => {
  * Hydrates a structured report, for default viewports.
  *
  */
-function hydrateStructuredReport(_ref, displaySetInstanceUID) {
-  let {
-    servicesManager,
-    extensionManager,
-    appConfig
-  } = _ref;
+function hydrateStructuredReport({
+  servicesManager,
+  extensionManager,
+  appConfig
+}, displaySetInstanceUID) {
   const annotationManager = dist_esm.annotation.state.getAnnotationManager();
   const disableEditing = appConfig?.disableEditing;
   const dataSource = extensionManager.getActiveDataSource()[0];
@@ -1718,12 +1726,19 @@ function hydrateStructuredReport(_ref, displaySetInstanceUID) {
   const datasetToUse = _mapLegacyDataSet(instance);
 
   // Use dcmjs to generate toolState.
-  const storedMeasurementByAnnotationType = MeasurementReport.generateToolState(datasetToUse,
+  let storedMeasurementByAnnotationType = MeasurementReport.generateToolState(datasetToUse,
   // NOTE: we need to pass in the imageIds to dcmjs since the we use them
   // for the imageToWorld transformation. The following assumes that the order
   // that measurements were added to the display set are the same order as
   // the measurementGroups in the instance.
   sopInstanceUIDToImageId, esm.utilities.imageToWorldCoords, esm.metaData);
+  const onBeforeSRHydration = customizationService.getModeCustomization('onBeforeSRHydration')?.value;
+  if (typeof onBeforeSRHydration === 'function') {
+    storedMeasurementByAnnotationType = onBeforeSRHydration({
+      storedMeasurementByAnnotationType,
+      displaySet
+    });
+  }
 
   // Filter what is found by DICOM SR to measurements we support.
   const mappingDefinitions = mappings.map(m => m.annotationType);
@@ -1860,13 +1875,6 @@ const codeMeaningEquals = codeMeaningName => {
   };
 };
 
-/***/ }),
-
-/***/ 78753:
-/***/ (() => {
-
-/* (ignored) */
-
 /***/ })
 
 }]);