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

package/dist/{663.bundle.d7be28450db14266cdd0.js → 540.bundle.079d43a6717e95c24392.js}

@@ -1,9 +1,9 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[663],{
+"use strict";
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[540],{
 
-/***/ 42170:
+/***/ 53540:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -11,30 +11,30 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   createReferencedImageDisplaySet: () => (/* reexport */ utils_createReferencedImageDisplaySet),
   "default": () => (/* binding */ cornerstone_dicom_sr_src),
-  hydrateStructuredReport: () => (/* reexport */ hydrateStructuredReport/* default */.Z),
+  hydrateStructuredReport: () => (/* reexport */ hydrateStructuredReport/* default */.A),
   srProtocol: () => (/* reexport */ srProtocol)
 });
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(43001);
+var react = __webpack_require__(41766);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/package.json
-const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-cornerstone-dicom-sr"}');
+const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-cornerstone-dicom-sr"}');
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/id.js
 
-const id = package_namespaceObject.u2;
+const id = package_namespaceObject.UU;
 const SOPClassHandlerName = 'dicom-sr';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
-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: ../../core/src/index.ts + 70 modules
+var src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
+var esm = __webpack_require__(44753);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 18 modules
+var dist_esm = __webpack_require__(24542);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
+var core_dist_esm = __webpack_require__(44656);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
-var dicomSRModule = __webpack_require__(64035);
+var dicomSRModule = __webpack_require__(74334);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/constants/scoordTypes.js
 /* harmony default export */ const scoordTypes = ({
   POINT: 'POINT',
@@ -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.
@@ -76,7 +74,7 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
       if (!annotations?.length) {
         return;
       }
-      const trackingUniqueIdentifiersForElement = (0,dicomSRModule/* getTrackingUniqueIdentifiersForElement */.yR)(element);
+      const trackingUniqueIdentifiersForElement = (0,dicomSRModule/* getTrackingUniqueIdentifiersForElement */.eF)(element);
       const {
         activeIndex,
         trackingUniqueIdentifiers
@@ -93,6 +91,9 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
         toolName: this.getToolName(),
         viewportId: enabledElement.viewport.id
       };
+      const {
+        style: annotationStyle
+      } = dist_esm.annotation.config;
       for (let i = 0; i < filteredAnnotations.length; i++) {
         const annotation = filteredAnnotations[i];
         const annotationUID = annotation.annotationUID;
@@ -106,13 +107,15 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
           referencedImageId
         } = annotation.metadata;
         styleSpecifier.annotationUID = annotationUID;
+        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 options = {
           color,
           lineDash,
-          lineWidth
+          lineWidth,
+          ...groupStyle
         };
         Object.keys(renderableData).forEach(GraphicType => {
           const renderableDataForGraphicType = renderableData[GraphicType];
@@ -145,20 +148,21 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
     };
   }
   _getTextBoxLinesFromLabels(labels) {
-    // TODO -> max 3 for now (label + shortAxis + longAxis), need a generic solution for this!
+    // TODO -> max 5 for now (label + shortAxis + longAxis), need a generic solution for this!
 
-    const labelLength = Math.min(labels.length, 3);
+    const labelLength = Math.min(labels.length, 5);
     const lines = [];
     for (let i = 0; i < labelLength; i++) {
       const labelEntry = labels[i];
-      lines.push(`${_labelToShorthand(labelEntry.label)}${labelEntry.value}`);
+      lines.push(`${_labelToShorthand(labelEntry.label)}: ${labelEntry.value}`);
     }
     return lines;
   }
   renderPolyLine(svgDrawingHelper, viewport, renderableData, annotationUID, referencedImageId, options) {
     const drawingOptions = {
       color: options.color,
-      width: options.lineWidth
+      width: options.lineWidth,
+      lineDash: options.lineDash
     };
     let allCanvasCoordinates = [];
     renderableData.map((data, index) => {
@@ -173,7 +177,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 +219,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) => {
@@ -237,13 +239,13 @@ class DICOMSRDisplayTool extends dist_esm.AnnotationTool {
       const lineUID = `${index}`;
       dist_esm.drawing.drawEllipse(svgDrawingHelper, annotationUID, lineUID, canvasCorners[0], canvasCorners[1], {
         color: options.color,
-        width: options.lineWidth
+        width: options.lineWidth,
+        lineDash: options.lineDash
       });
     });
     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 +266,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);
@@ -316,16 +320,14 @@ const toolNames = {
   SRPlanarFreehandROI: 'SRPlanarFreehandROI'
 };
 /* harmony default export */ const tools_toolNames = (toolNames);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/addMeasurement.ts
+;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/addDICOMSRDisplayAnnotation.ts
 
 
 
 
 
 const EPSILON = 1e-4;
-const supportedLegacyCornerstoneTags = (/* unused pure expression or super */ null && (['cornerstoneTools@^4.0.0']));
-function addMeasurement(measurement, imageId, displaySetInstanceUID) {
-  // TODO -> Render rotated ellipse .
+function addDICOMSRDisplayAnnotation(measurement, imageId, frameNumber) {
   const toolName = tools_toolNames.DICOMSRDisplay;
   const measurementData = {
     TrackingUniqueIdentifier: measurement.TrackingUniqueIdentifier,
@@ -341,48 +343,41 @@ function addMeasurement(measurement, imageId, displaySetInstanceUID) {
     if (measurementData.renderableData[GraphicType] === undefined) {
       measurementData.renderableData[GraphicType] = [];
     }
-    measurementData.renderableData[GraphicType].push(_getRenderableData(GraphicType, GraphicData, imageId, measurement.TrackingIdentifier));
+    measurementData.renderableData[GraphicType].push(_getRenderableData(GraphicType, GraphicData, imageId));
   });
-
-  // Use the metadata provider to grab its imagePlaneModule metadata
   const imagePlaneModule = core_dist_esm.metaData.get('imagePlaneModule', imageId);
-  const annotationManager = dist_esm.annotation.state.getAnnotationManager();
 
-  // Create Cornerstone3D Annotation from measurement
-  const frameNumber = measurement.coords[0].ReferencedSOPSequence && measurement.coords[0].ReferencedSOPSequence[0]?.ReferencedFrameNumber || 1;
+  /**
+   * This annotation (DICOMSRDisplay) is only used by the SR viewport.
+   * This is used before the annotation is hydrated. If hydrated the measurement will be added
+   * to the measurement service and will be available for the other viewports.
+   */
   const SRAnnotation = {
     annotationUID: measurement.TrackingUniqueIdentifier,
+    highlighted: false,
+    isLocked: false,
+    invalidated: false,
     metadata: {
-      FrameOfReferenceUID: imagePlaneModule.frameOfReferenceUID,
       toolName: toolName,
+      FrameOfReferenceUID: imagePlaneModule.frameOfReferenceUID,
       referencedImageId: imageId
     },
     data: {
       label: measurement.labels,
       handles: {
-        textBox: {}
+        textBox: measurement.textBox ?? {}
       },
       cachedStats: {
         TrackingUniqueIdentifier: measurementData.TrackingUniqueIdentifier,
         renderableData: measurementData.renderableData
       },
-      frameNumber: frameNumber
+      frameNumber
     }
   };
+  const annotationManager = dist_esm.annotation.state.getAnnotationManager();
   annotationManager.addAnnotation(SRAnnotation);
-  measurement.loaded = true;
-  measurement.imageId = imageId;
-  measurement.displaySetInstanceUID = displaySetInstanceUID;
-
-  // Remove the unneeded coord now its processed, but keep the SOPInstanceUID.
-  // NOTE: We assume that each SCOORD in the MeasurementGroup maps onto one frame,
-  // It'd be super weird if it didn't anyway as a SCOORD.
-  measurement.ReferencedSOPInstanceUID = measurement.coords[0].ReferencedSOPSequence.ReferencedSOPInstanceUID;
-  measurement.frameNumber = frameNumber;
-  delete measurement.coords;
 }
-function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifier) {
-  const [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
+function _getRenderableData(GraphicType, GraphicData, imageId) {
   let renderableData;
   switch (GraphicType) {
     case scoordTypes.POINT:
@@ -407,7 +402,7 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
         // here we reshape the data for that purpose.
         const center = pointsWorld[0];
         const onPerimeter = pointsWorld[1];
-        const radius = esm/* vec3.distance */.R3.distance(center, onPerimeter);
+        const radius = esm/* vec3.distance */.eR.distance(center, onPerimeter);
         const imagePlaneModule = core_dist_esm.metaData.get('imagePlaneModule', imageId);
         if (!imagePlaneModule) {
           throw new Error('No imagePlaneModule found');
@@ -420,16 +415,16 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
         // we need to get major/minor axis (which are both the same size major = minor)
 
         // first axisStart
-        const firstAxisStart = esm/* vec3.create */.R3.create();
-        esm/* vec3.scaleAndAdd */.R3.scaleAndAdd(firstAxisStart, center, columnCosines, radius);
-        const firstAxisEnd = esm/* vec3.create */.R3.create();
-        esm/* vec3.scaleAndAdd */.R3.scaleAndAdd(firstAxisEnd, center, columnCosines, -radius);
+        const firstAxisStart = esm/* vec3.create */.eR.create();
+        esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(firstAxisStart, center, columnCosines, radius);
+        const firstAxisEnd = esm/* vec3.create */.eR.create();
+        esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(firstAxisEnd, center, columnCosines, -radius);
 
         // second axisStart
-        const secondAxisStart = esm/* vec3.create */.R3.create();
-        esm/* vec3.scaleAndAdd */.R3.scaleAndAdd(secondAxisStart, center, rowCosines, radius);
-        const secondAxisEnd = esm/* vec3.create */.R3.create();
-        esm/* vec3.scaleAndAdd */.R3.scaleAndAdd(secondAxisEnd, center, rowCosines, -radius);
+        const secondAxisStart = esm/* vec3.create */.eR.create();
+        esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(secondAxisStart, center, rowCosines, radius);
+        const secondAxisEnd = esm/* vec3.create */.eR.create();
+        esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(secondAxisEnd, center, rowCosines, -radius);
         renderableData = [firstAxisStart, firstAxisEnd, secondAxisStart, secondAxisEnd];
         break;
       }
@@ -445,18 +440,18 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
           const worldPos = core_dist_esm.utilities.imageToWorldCoords(imageId, [GraphicData[i], GraphicData[i + 1]]);
           pointsWorld.push(worldPos);
         }
-        const majorAxisStart = esm/* vec3.fromValues */.R3.fromValues(...pointsWorld[0]);
-        const majorAxisEnd = esm/* vec3.fromValues */.R3.fromValues(...pointsWorld[1]);
-        const minorAxisStart = esm/* vec3.fromValues */.R3.fromValues(...pointsWorld[2]);
-        const minorAxisEnd = esm/* vec3.fromValues */.R3.fromValues(...pointsWorld[3]);
-        const majorAxisVec = esm/* vec3.create */.R3.create();
-        esm/* vec3.sub */.R3.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
+        const majorAxisStart = esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[0]);
+        const majorAxisEnd = esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[1]);
+        const minorAxisStart = esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[2]);
+        const minorAxisEnd = esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[3]);
+        const majorAxisVec = esm/* vec3.create */.eR.create();
+        esm/* vec3.sub */.eR.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
 
         // normalize majorAxisVec to avoid scaling issues
-        esm/* vec3.normalize */.R3.normalize(majorAxisVec, majorAxisVec);
-        const minorAxisVec = esm/* vec3.create */.R3.create();
-        esm/* vec3.sub */.R3.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
-        esm/* vec3.normalize */.R3.normalize(minorAxisVec, minorAxisVec);
+        esm/* vec3.normalize */.eR.normalize(majorAxisVec, majorAxisVec);
+        const minorAxisVec = esm/* vec3.create */.eR.create();
+        esm/* vec3.sub */.eR.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
+        esm/* vec3.normalize */.eR.normalize(minorAxisVec, minorAxisVec);
         const imagePlaneModule = core_dist_esm.metaData.get('imagePlaneModule', imageId);
         if (!imagePlaneModule) {
           throw new Error('imageId does not have imagePlaneModule metadata');
@@ -466,9 +461,9 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
         } = imagePlaneModule;
 
         // find which axis is parallel to the columnCosines
-        const columnCosinesVec = esm/* vec3.fromValues */.R3.fromValues(...columnCosines);
-        const projectedMajorAxisOnColVec = Math.abs(esm/* vec3.dot */.R3.dot(columnCosinesVec, majorAxisVec));
-        const projectedMinorAxisOnColVec = Math.abs(esm/* vec3.dot */.R3.dot(columnCosinesVec, minorAxisVec));
+        const columnCosinesVec = esm/* vec3.fromValues */.eR.fromValues(...columnCosines);
+        const projectedMajorAxisOnColVec = Math.abs(esm/* vec3.dot */.eR.dot(columnCosinesVec, majorAxisVec));
+        const projectedMinorAxisOnColVec = Math.abs(esm/* vec3.dot */.eR.dot(columnCosinesVec, minorAxisVec));
         const absoluteOfMajorDotProduct = Math.abs(projectedMajorAxisOnColVec);
         const absoluteOfMinorDotProduct = Math.abs(projectedMinorAxisOnColVec);
         renderableData = [];
@@ -487,11 +482,11 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
   return renderableData;
 }
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
-var adapters_es = __webpack_require__(91202);
+var adapters_es = __webpack_require__(83342);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
 
-const cornerstoneAdapters = adapters_es.adaptersSR.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
-const isRehydratable_supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
+const cornerstoneAdapters = adapters_es/* adaptersSR */.QX.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
+const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
 const CORNERSTONE_3D_TAG = cornerstoneAdapters.CORNERSTONE_3D_TAG;
 
 /**
@@ -524,7 +519,7 @@ function isRehydratable(displaySet, mappings) {
     } = measurements[i] || {};
     const hydratable = adapters.some(adapter => {
       let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
-      if (isRehydratable_supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
+      if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
         cornerstoneTag = CORNERSTONE_3D_TAG;
       }
       const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
@@ -546,7 +541,7 @@ function isRehydratable(displaySet, mappings) {
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
-} = adapters_es.adaptersSR.Cornerstone3D;
+} = adapters_es/* adaptersSR */.QX.Cornerstone3D;
 const {
   ImageSet,
   MetadataProvider: metadataProvider
@@ -565,7 +560,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 +583,6 @@ const CodeNameCodeSequenceValues = {
   // SRT
   CornerstoneFreeText: Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT //
 };
-
 const CodingSchemeDesignators = {
   SRT: 'SRT',
   CornerstoneCodeSchemes: [Cornerstone3DCodeScheme.CodingSchemeDesignator, 'CST4']
@@ -680,7 +673,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
   displaySet.load = () => _load(displaySet, servicesManager, extensionManager);
   return [displaySet];
 }
-function _load(displaySet, servicesManager, extensionManager) {
+async function _load(displaySet, servicesManager, extensionManager) {
   const {
     displaySetService,
     measurementService
@@ -690,6 +683,28 @@ function _load(displaySet, servicesManager, extensionManager) {
   const {
     ContentSequence
   } = displaySet.instance;
+  async function retrieveBulkData(obj, parentObj = null, key = null) {
+    for (const prop in obj) {
+      if (typeof obj[prop] === 'object' && obj[prop] !== null) {
+        await retrieveBulkData(obj[prop], obj, prop);
+      } else if (Array.isArray(obj[prop])) {
+        await Promise.all(obj[prop].map(item => retrieveBulkData(item, obj, prop)));
+      } else if (prop === 'BulkDataURI') {
+        const value = await dataSource.retrieve.bulkDataURI({
+          BulkDataURI: obj[prop],
+          StudyInstanceUID: displaySet.instance.StudyInstanceUID,
+          SeriesInstanceUID: displaySet.instance.SeriesInstanceUID,
+          SOPInstanceUID: displaySet.instance.SOPInstanceUID
+        });
+        if (parentObj && key) {
+          parentObj[key] = new Float32Array(value);
+        }
+      }
+    }
+  }
+  if (displaySet.isLoaded !== true) {
+    await retrieveBulkData(ContentSequence);
+  }
   displaySet.referencedImages = _getReferencedImagesList(ContentSequence);
   displaySet.measurements = _getMeasurements(ContentSequence);
   const mappings = measurementService.getSourceMappings(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
@@ -699,7 +714,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 +725,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 +742,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,9 +779,28 @@ 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);
+          const frame = measurement.coords[0].ReferencedSOPSequence && measurement.coords[0].ReferencedSOPSequence?.ReferencedFrameNumber || 1;
+
+          /** Add DICOMSRDisplay annotation for the SR viewport (only) */
+          addDICOMSRDisplayAnnotation(measurement, imageId, frame);
+
+          /** Update measurement properties */
+          measurement.loaded = true;
+          measurement.imageId = imageId;
+          measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
+          measurement.ReferencedSOPInstanceUID = measurement.coords[0].ReferencedSOPSequence.ReferencedSOPInstanceUID;
+          measurement.frameNumber = frame;
+          delete measurement.coords;
           unloadedMeasurements.splice(j, 1);
         }
       }
@@ -775,7 +814,7 @@ function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frame
 
   // NOTE: The ReferencedFrameNumber can be multiple values according to the DICOM
   //  Standard. But for now, we will support only one ReferenceFrameNumber.
-  const ReferencedFrameNumber = measurement.coords[0].ReferencedSOPSequence && measurement.coords[0].ReferencedSOPSequence[0]?.ReferencedFrameNumber || 1;
+  const ReferencedFrameNumber = measurement.coords[0].ReferencedSOPSequence && measurement.coords[0].ReferencedSOPSequence?.ReferencedFrameNumber || 1;
   if (frameNumber && Number(frameNumber) !== Number(ReferencedFrameNumber)) {
     return false;
   }
@@ -789,11 +828,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 +1016,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 +1115,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;
@@ -1093,13 +1129,13 @@ function onModeEnter(_ref) {
   });
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(67540);
+var dcmjs_es = __webpack_require__(31426);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts
 
 
 const {
   log
-} = src["default"];
+} = src/* default */.Ay;
 function getFilteredCornerstoneToolState(measurementData, additionalFindingTypes) {
   const filteredToolState = {};
   function addToFilteredToolState(annotation, toolType) {
@@ -1187,10 +1223,10 @@ function getFilteredCornerstoneToolState(measurementData, additionalFindingTypes
 
 const {
   MeasurementReport
-} = adapters_es.adaptersSR.Cornerstone3D;
+} = adapters_es/* adaptersSR */.QX.Cornerstone3D;
 const {
   log: commandsModule_log
-} = src["default"];
+} = src/* default */.Ay;
 
 /**
  *
@@ -1200,8 +1236,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 +1250,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,14 +1266,13 @@ 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);
+      const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(srDataset);
 
       //Create a URL for the binary.
       var objectUrl = URL.createObjectURL(reportBlob);
@@ -1248,13 +1287,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 +1313,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);
         }
@@ -1294,14 +1340,10 @@ const commandsModule = _ref => {
   };
   const definitions = {
     downloadReport: {
-      commandFn: actions.downloadReport,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.downloadReport
     },
     storeMeasurements: {
-      commandFn: actions.storeMeasurements,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.storeMeasurements
     }
   };
   return {
@@ -1327,28 +1369,28 @@ function addToolInstance(name, toolClass, configuration) {
 /**
  * @param {object} configuration
  */
-function init(_ref) {
-  let {
-    configuration = {}
-  } = _ref;
-  (0,dist_esm.addTool)(DICOMSRDisplayTool);
-  addToolInstance(tools_toolNames.SRLength, dist_esm.LengthTool, {});
+function init({
+  configuration = {}
+}) {
+  addToolInstance(tools_toolNames.DICOMSRDisplay, DICOMSRDisplayTool);
+  addToolInstance(tools_toolNames.SRLength, dist_esm.LengthTool);
   addToolInstance(tools_toolNames.SRBidirectional, dist_esm.BidirectionalTool);
   addToolInstance(tools_toolNames.SREllipticalROI, dist_esm.EllipticalROITool);
   addToolInstance(tools_toolNames.SRCircleROI, dist_esm.CircleROITool);
   addToolInstance(tools_toolNames.SRArrowAnnotate, dist_esm.ArrowAnnotateTool);
   addToolInstance(tools_toolNames.SRAngle, dist_esm.AngleTool);
+  addToolInstance(tools_toolNames.SRPlanarFreehandROI, dist_esm.PlanarFreehandROITool);
+  addToolInstance(tools_toolNames.SRRectangleROI, dist_esm.RectangleROITool);
+
   // TODO - fix the SR display of Cobb Angle, as it joins the two lines
   addToolInstance(tools_toolNames.SRCobbAngle, dist_esm.CobbAngleTool);
-  // TODO - fix the rehydration of Freehand, as it throws an exception
-  // on a missing polyline. The fix is probably in CS3D
-  addToolInstance(tools_toolNames.SRPlanarFreehandROI, dist_esm.PlanarFreehandROITool);
 
   // Modify annotation tools to use dashed lines on SR
   const dashedLine = {
     lineDash: '4,4'
   };
   dist_esm.annotation.config.style.setToolGroupToolStyles('SRToolGroup', {
+    [tools_toolNames.DICOMSRDisplay]: dashedLine,
     SRLength: dashedLine,
     SRBidirectional: dashedLine,
     SREllipticalROI: dashedLine,
@@ -1357,11 +1399,12 @@ function init(_ref) {
     SRCobbAngle: dashedLine,
     SRAngle: dashedLine,
     SRPlanarFreehandROI: dashedLine,
+    SRRectangleROI: dashedLine,
     global: {}
   });
 }
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js + 1 modules
-var hydrateStructuredReport = __webpack_require__(38965);
+var hydrateStructuredReport = __webpack_require__(77089);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/createReferencedImageDisplaySet.ts
 
 const createReferencedImageDisplaySet_ImageSet = src.classes.ImageSet;
@@ -1460,7 +1503,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 886).then(__webpack_require__.bind(__webpack_require__, 48886));
+  return __webpack_require__.e(/* import() */ 530).then(__webpack_require__.bind(__webpack_require__, 58530));
 });
 const OHIFCornerstoneSRViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -1484,11 +1527,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 +1545,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: {
@@ -1522,16 +1563,15 @@ const dicomSRExtension = {
 
 /***/ }),
 
-/***/ 64035:
+/***/ 74334:
 /***/ ((__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 */   eF: () => (/* binding */ getTrackingUniqueIdentifiersForElement),
+/* harmony export */   m1: () => (/* binding */ setTrackingUniqueIdentifiersForElement)
 /* 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__(44656);
 
 const state = {
   TrackingUniqueIdentifier: null,
@@ -1546,8 +1586,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
@@ -1584,20 +1623,19 @@ function getTrackingUniqueIdentifiersForElement(element) {
 
 /***/ }),
 
-/***/ 38965:
+/***/ 77089:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  Z: () => (/* binding */ hydrateStructuredReport)
+  A: () => (/* binding */ hydrateStructuredReport)
 });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var esm = __webpack_require__(3743);
-// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
-var src = __webpack_require__(71771);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
+var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
+var src = __webpack_require__(55411);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
 /**
  * Extracts the label from the toolData imported from dcmjs. We need to do this
@@ -1621,9 +1659,9 @@ 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);
+var adapters_es = __webpack_require__(83342);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 18 modules
+var dist_esm = __webpack_require__(24542);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 
@@ -1635,11 +1673,11 @@ const {
 } = dist_esm.annotation;
 const {
   guid
-} = src["default"].utils;
+} = src/* default.utils */.Ay.utils;
 const {
   MeasurementReport,
   CORNERSTONE_3D_TAG
-} = adapters_es.adaptersSR.Cornerstone3D;
+} = adapters_es/* adaptersSR */.QX.Cornerstone3D;
 const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
 const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
 const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
@@ -1676,12 +1714,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 +1755,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 +1904,6 @@ const codeMeaningEquals = codeMeaningName => {
   };
 };
 
-/***/ }),
-
-/***/ 78753:
-/***/ (() => {
-
-/* (ignored) */
-
 /***/ })
 
 }]);