@ohif/app 3.11.0-beta.99 → 3.11.0

package/dist/{4113.bundle.46086f61126bf7100c6b.js → 4113.bundle.3b3fed48ad784ccda1a1.js}

@@ -23,10 +23,10 @@ var react = __webpack_require__(86326);
 var src = __webpack_require__(15871);
 // EXTERNAL MODULE: ../../i18n/src/index.js + 197 modules
 var i18n_src = __webpack_require__(89806);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 177 modules
-var cornerstone_src = __webpack_require__(56972);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 66 modules
-var esm = __webpack_require__(34279);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 184 modules
+var cornerstone_src = __webpack_require__(20557);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 70 modules
+var esm = __webpack_require__(92740);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
 var dist_esm = __webpack_require__(4667);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
@@ -84,6 +84,13 @@ function getRenderableData({
           ValueType,
           imageId
         });
+        if (!imageId) {
+          // without the image id it's not possible to perform the calculations below
+          // these calculations also do not seem to be needed, since everything works
+          // just fine when we skip them. At least for SCOORD3D annotations.
+          return pointsWorld;
+        }
+
         // We do not have an explicit draw circle svg helper in Cornerstone3D at
         // this time, but we can use the ellipse svg helper to draw a circle, so
         // here we reshape the data for that purpose.
@@ -123,6 +130,12 @@ function getRenderableData({
           ValueType,
           imageId
         });
+        if (!imageId) {
+          // without the image id it's not possible to perform the calculations below
+          // these calculations also do not seem to be needed, since everything works
+          // just fine when we skip them. At least for SCOORD3D annotations.
+          return pointsWorld;
+        }
         const majorAxisStart = gl_matrix_esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[0]);
         const majorAxisEnd = gl_matrix_esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[1]);
         const minorAxisStart = gl_matrix_esm/* vec3.fromValues */.eR.fromValues(...pointsWorld[2]);
@@ -185,6 +198,10 @@ const toolNames = {
 
 
 
+
+const {
+  MeasurementReport
+} = esm/* adaptersSR */.QX.Cornerstone3D;
 function addSRAnnotation(measurement, imageId, frameNumber) {
   let toolName = tools_toolNames.DICOMSRDisplay;
   const renderableData = measurement.coords.reduce((acc, coordProps) => {
@@ -211,7 +228,10 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
     frameOfReferenceUID = imagePlaneModule?.frameOfReferenceUID;
   }
   if (valueType === 'SCOORD3D') {
-    toolName = tools_toolNames.SRSCOORD3DPoint;
+    const adapter = MeasurementReport.getAdapterForTrackingIdentifier(measurement.TrackingIdentifier);
+    if (!adapter) {
+      toolName = tools_toolNames.SRSCOORD3DPoint;
+    }
 
     // get the ReferencedFrameOfReferenceUID from the measurement
     frameOfReferenceUID = measurement.coords[0].ReferencedFrameOfReferenceSequence;
@@ -252,7 +272,7 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
 ;// ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts
 
 const {
-  MeasurementReport
+  MeasurementReport: isRehydratable_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
 
 /**
@@ -274,15 +294,23 @@ function isRehydratable(displaySet, mappings) {
     measurements
   } = displaySet;
   for (let i = 0; i < measurements.length; i++) {
+    const measurement = measurements[i];
+    if (!measurement) {
+      continue;
+    }
     const {
-      TrackingIdentifier
-    } = measurements[i] || {};
-    if (!TrackingIdentifier) {
-      console.warn('No tracking identifier for measurement ', measurements[i]);
+      TrackingIdentifier = '',
+      graphicType,
+      graphicCode,
+      pointsLength
+    } = measurement;
+    if (!TrackingIdentifier && !graphicType) {
+      console.warn('No tracking identifier  or graphicType for measurement ', measurement);
       continue;
     }
-    const adapter = MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
-    const hydratable = adapter && mappingDefinitions.has(adapter.toolType);
+    const adapter = isRehydratable_MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
+    const adapters = isRehydratable_MeasurementReport.getAdaptersForTypes(graphicCode, graphicType, pointsLength);
+    const hydratable = adapter && mappingDefinitions.has(adapter.toolType) || adapters && adapters.some(adapter => mappingDefinitions.has(adapter.toolType));
     if (hydratable) {
       return true;
     }
@@ -318,10 +346,11 @@ const {
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION
 } = cornerstone_src.Enums;
 const {
-  ImageSet,
   MetadataProvider: metadataProvider
 } = src/* classes */.Ly;
 const {
+  TEXT_ANNOTATION_POSITION,
+  COMMENT_CODE,
   CodeScheme: Cornerstone3DCodeScheme
 } = esm/* adaptersSR */.QX.Cornerstone3D;
 /**
@@ -487,6 +516,12 @@ async function _load(srDisplaySet, servicesManager, extensionManager) {
     });
   });
 }
+function _measurementBelongsToDisplaySet({
+  measurement,
+  displaySet
+}) {
+  return measurement.coords[0].ReferencedFrameOfReferenceSequence === displaySet.FrameOfReferenceUID;
+}
 
 /**
  * Checks if measurements can be added to a display set.
@@ -501,14 +536,10 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     customizationService
   } = servicesManager.services;
   const unloadedMeasurements = srDisplaySet.measurements.filter(measurement => measurement.loaded === false);
-  if (unloadedMeasurements.length === 0 || !(newDisplaySet instanceof ImageSet) || newDisplaySet.unsupported) {
+  if (!unloadedMeasurements.length || newDisplaySet.unsupported) {
     return;
   }
 
-  // const { sopClassUids } = newDisplaySet;
-  // Create a Set for faster lookups
-  // const sopClassUidSet = new Set(sopClassUids);
-
   // Create a Map to efficiently look up ImageIds by SOPInstanceUID and frame number
   const imageIdMap = new Map();
   const imageIds = dataSource.getImageIdsForDisplaySet(newDisplaySet);
@@ -526,6 +557,7 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
   const is3DSR = srDisplaySet.SOPClassUID === sopClassDictionary.Comprehensive3DSR;
   for (let j = unloadedMeasurements.length - 1; j >= 0; j--) {
     let measurement = unloadedMeasurements[j];
+    const is3DMeasurement = measurement.coords?.[0]?.ValueType === 'SCOORD3D';
     const onBeforeSRAddMeasurement = customizationService.getCustomization('onBeforeSRAddMeasurement');
     if (typeof onBeforeSRAddMeasurement === 'function') {
       measurement = onBeforeSRAddMeasurement({
@@ -536,9 +568,14 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     }
 
     // if it is 3d SR we can just add the SR annotation
-    if (is3DSR) {
+    if (is3DSR && is3DMeasurement && _measurementBelongsToDisplaySet({
+      measurement,
+      displaySet: newDisplaySet
+    })) {
       addSRAnnotation(measurement, null, null);
       measurement.loaded = true;
+      measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
+      unloadedMeasurements.splice(j, 1);
       continue;
     }
     const referencedSOPSequence = measurement.coords[0].ReferencedSOPSequence;
@@ -689,7 +726,7 @@ function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups
  * @returns {any} - The processed measurement result.
  */
 function _processMeasurement(mergedContentSequence) {
-  if (mergedContentSequence.some(group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D')) {
+  if (mergedContentSequence.some(group => isScoordOr3d(group) && !isTextPosition(group))) {
     return _processTID1410Measurement(mergedContentSequence);
   }
   return _processNonGeometricallyDefinedMeasurement(mergedContentSequence);
@@ -715,12 +752,28 @@ function _processTID1410Measurement(mergedContentSequence) {
     return;
   }
   const NUMContentItems = mergedContentSequence.filter(group => group.ValueType === 'NUM');
+  const {
+    ConceptNameCodeSequence: conceptNameItem
+  } = graphicItem;
+  const {
+    CodeValue: graphicValue,
+    CodingSchemeDesignator: graphicDesignator
+  } = conceptNameItem;
+  const graphicCode = `${graphicDesignator}:${graphicValue}`;
+  const pointDataItem = _getCoordsFromSCOORDOrSCOORD3D(graphicItem);
+  const is3DMeasurement = pointDataItem.ValueType === 'SCOORD3D';
+  const pointLength = is3DMeasurement ? 3 : 2;
+  const pointsLength = pointDataItem.GraphicData.length / pointLength;
   const measurement = {
     loaded: false,
     labels: [],
-    coords: [_getCoordsFromSCOORDOrSCOORD3D(graphicItem)],
+    coords: [pointDataItem],
     TrackingUniqueIdentifier: UIDREFContentItem.UID,
-    TrackingIdentifier: TrackingIdentifierContentItem.TextValue
+    TrackingIdentifier: TrackingIdentifierContentItem.TextValue,
+    graphicCode,
+    is3DMeasurement,
+    pointsLength,
+    graphicType: pointDataItem.GraphicType
   };
   NUMContentItems.forEach(item => {
     const {
@@ -753,6 +806,7 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
   const TrackingIdentifierContentItem = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === enums/* CodeNameCodeSequenceValues */.n7.TrackingIdentifier);
   const finding = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === enums/* CodeNameCodeSequenceValues */.n7.Finding);
   const findingSites = mergedContentSequence.filter(item => item.ConceptNameCodeSequence.CodingSchemeDesignator === enums/* CodingSchemeDesignators */.bY.SRT && item.ConceptNameCodeSequence.CodeValue === enums/* CodeNameCodeSequenceValues */.n7.FindingSite);
+  const commentSites = mergedContentSequence.filter(item => item.ConceptNameCodeSequence.CodingSchemeDesignator === COMMENT_CODE.schemeDesignator && item.ConceptNameCodeSequence.CodeValue === COMMENT_CODE.value);
   const measurement = {
     loaded: false,
     labels: [],
@@ -760,6 +814,16 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
     TrackingUniqueIdentifier: UIDREFContentItem.UID,
     TrackingIdentifier: TrackingIdentifierContentItem.TextValue
   };
+  if (commentSites) {
+    for (const group of commentSites) {
+      if (group.TextValue) {
+        measurement.labels.push({
+          label: group.TextValue,
+          value: ''
+        });
+      }
+    }
+  }
   if (finding && enums/* CodingSchemeDesignators */.bY.CornerstoneCodeSchemes.includes(finding.ConceptCodeSequence.CodingSchemeDesignator) && finding.ConceptCodeSequence.CodeValue === Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT) {
     measurement.labels.push({
       label: Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT,
@@ -903,6 +967,13 @@ function _getSequenceAsArray(sequence) {
   }
   return Array.isArray(sequence) ? sequence : [sequence];
 }
+function isScoordOr3d(group) {
+  return group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D';
+}
+function isTextPosition(group) {
+  const concept = group.ConceptNameCodeSequence[0];
+  return concept && concept.CodeValue === TEXT_ANNOTATION_POSITION.value && concept.CodingSchemeDesignator === TEXT_ANNOTATION_POSITION.schemeDesignator;
+}
 /* harmony default export */ const src_getSopClassHandlerModule = (getSopClassHandlerModule);
 ;// ../../../extensions/cornerstone-dicom-sr/src/getHangingProtocolModule.ts
 const srProtocol = {
@@ -988,17 +1059,10 @@ var dcmjs_es = __webpack_require__(5842);
 ;// ../../../extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts
 
 
-const {
-  log
-} = src/* default */.Ay;
 function getFilteredCornerstoneToolState(measurementData, additionalFindingTypes) {
   const filteredToolState = {};
   function addToFilteredToolState(annotation, toolType) {
-    if (!annotation.metadata?.referencedImageId) {
-      log.warn(`[DICOMSR] No referencedImageId found for ${toolType} ${annotation.id}`);
-      return;
-    }
-    const imageId = annotation.metadata.referencedImageId;
+    const imageId = annotation.metadata?.referencedImageId ?? esm/* NO_IMAGE_ID */.W6;
     if (!filteredToolState[imageId]) {
       filteredToolState[imageId] = {};
     }
@@ -1087,8 +1151,12 @@ const {
 function getLabelFromDCMJSImportedToolData(toolData) {
   const {
     findingSites = [],
-    finding
+    finding,
+    annotation
   } = toolData;
+  if (annotation.data.label) {
+    return annotation.data.label;
+  }
   let freeTextLabel = findingSites.find(fs => fs.CodeValue === getLabelFromDCMJSImportedToolData_Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT);
   if (freeTextLabel) {
     return freeTextLabel.CodeMeaning;
@@ -1104,6 +1172,7 @@ function getLabelFromDCMJSImportedToolData(toolData) {
 
 
 
+
 const {
   locking
 } = dist_esm.annotation;
@@ -1111,14 +1180,12 @@ const {
   guid
 } = src/* default.utils */.Ay.utils;
 const {
-  MeasurementReport: hydrateStructuredReport_MeasurementReport,
-  CORNERSTONE_3D_TAG
+  MeasurementReport: hydrateStructuredReport_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
 const {
   CORNERSTONE_3D_TOOLS_SOURCE_NAME: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_NAME,
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_VERSION
 } = cornerstone_src.Enums;
-const supportedLegacyCornerstoneTags = (/* unused pure expression or super */ null && (['cornerstoneTools@^4.0.0']));
 const convertCode = (codingValues, code) => {
   if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') {
     return;
@@ -1149,8 +1216,10 @@ const convertSites = (codingValues, sites) => {
 };
 
 /**
- * Hydrates a structured report, for default viewports.
- *
+ * Hydrates a structured report
+ * Handles 2d and 3d hydration from SCOORD and SCOORD3D points
+ * For 3D hydration, chooses a volume display set to display with
+ * FOr 2D hydration, chooses the (first) display set containing the referenced image.
  */
 function hydrateStructuredReport({
   servicesManager,
@@ -1193,13 +1262,13 @@ function hydrateStructuredReport({
   // Mapping of legacy datasets is now directly handled by adapters module
   const datasetToUse = instance;
 
-  // Use dcmjs to generate toolState.
+  // Use CS3D adapters to generate toolState.
   let storedMeasurementByAnnotationType = hydrateStructuredReport_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, core_dist_esm.utilities.imageToWorldCoords, core_dist_esm.metaData);
+  sopInstanceUIDToImageId, core_dist_esm.metaData);
   const onBeforeSRHydration = customizationService.getCustomization('onBeforeSRHydration')?.value;
   if (typeof onBeforeSRHydration === 'function') {
     storedMeasurementByAnnotationType = onBeforeSRHydration({
@@ -1239,6 +1308,9 @@ function hydrateStructuredReport({
   const SeriesInstanceUIDs = [];
   for (let i = 0; i < imageIds.length; i++) {
     const imageId = imageIds[i];
+    if (!imageId) {
+      continue;
+    }
     const {
       SeriesInstanceUID,
       StudyInstanceUID
@@ -1252,32 +1324,50 @@ function hydrateStructuredReport({
       console.warn('NO SUPPORT FOR SRs THAT HAVE MEASUREMENTS FROM MULTIPLE STUDIES.');
     }
   }
+
+  /**
+   * Gets reference data for what frame of reference and the referenced
+   * image id, or for 3d measurements, the volumeId to apply this annotation to.
+   */
+  function getReferenceData(toolData) {
+    // Add the measurement to toolState
+    // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
+    // files, and looking up the imageId from sopInstanceUIDToImageId results
+    // in the wrong value.
+    const frameNumber = toolData.annotation.data && toolData.annotation.data.frameNumber || 1;
+    const imageId = imageIdsForToolState[toolData.sopInstanceUid][frameNumber] || sopInstanceUIDToImageId[toolData.sopInstanceUid];
+    if (!imageId) {
+      return getReferenceData3D(toolData, servicesManager);
+    }
+    const instance = core_dist_esm.metaData.get('instance', imageId);
+    const {
+      FrameOfReferenceUID
+      // SOPInstanceUID,
+      // SeriesInstanceUID,
+      // StudyInstanceUID,
+    } = instance;
+    return {
+      referencedImageId: imageId,
+      FrameOfReferenceUID
+    };
+  }
   Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
     const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
     toolDataForAnnotationType.forEach(toolData => {
-      // Add the measurement to toolState
-      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
-      // files, and looking up the imageId from sopInstanceUIDToImageId results
-      // in the wrong value.
-      const frameNumber = toolData.annotation.data && toolData.annotation.data.frameNumber || 1;
-      const imageId = imageIdsForToolState[toolData.sopInstanceUid][frameNumber] || sopInstanceUIDToImageId[toolData.sopInstanceUid];
       toolData.uid = guid();
-      const instance = core_dist_esm.metaData.get('instance', imageId);
+      const referenceData = getReferenceData(toolData);
       const {
-        FrameOfReferenceUID
-        // SOPInstanceUID,
-        // SeriesInstanceUID,
-        // StudyInstanceUID,
-      } = instance;
+        imageId
+      } = referenceData;
       const annotation = {
         annotationUID: toolData.annotation.annotationUID,
         data: toolData.annotation.data,
         metadata: {
-          toolName: annotationType,
-          referencedImageId: imageId,
-          FrameOfReferenceUID
+          ...referenceData,
+          toolName: annotationType
         }
       };
+      core_dist_esm.utilities.updatePlaneRestriction(annotation.data.handles.points, annotation.metadata);
       const source = measurementService.getSource(hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_NAME, hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
       annotation.data.label = getLabelFromDCMJSImportedToolData(toolData);
       annotation.data.finding = convertCode(codingValues, toolData.finding?.[0]);
@@ -1298,7 +1388,7 @@ function hydrateStructuredReport({
       if (disableEditing) {
         locking.setAnnotationLocked(newAnnotationUID, true);
       }
-      if (!imageIds.includes(imageId)) {
+      if (imageId && !imageIds.includes(imageId)) {
         imageIds.push(imageId);
       }
     });
@@ -1309,6 +1399,95 @@ function hydrateStructuredReport({
     SeriesInstanceUIDs
   };
 }
+
+/**
+ * For 3d annotations, there are often several display sets which could
+ * be used to display the annotation.  Choose the first annotation with the
+ * same frame of reference that is reconstructable, or the first display set
+ * otherwise.
+ */
+function chooseDisplaySet(displaySets, annotation) {
+  if (!displaySets?.length) {
+    console.warn('No display set found for', annotation);
+    return;
+  }
+  if (displaySets.length === 1) {
+    return displaySets[0];
+  }
+  const volumeDs = displaySets.find(ds => ds.isReconstructable);
+  if (volumeDs) {
+    return volumeDs;
+  }
+  return displaySets[0];
+}
+
+/**
+ * Gets the additional reference data appropriate for a 3d reference.
+ * This will choose a volume id, frame of reference and a plane restriction.
+ */
+function getReferenceData3D(toolData, servicesManager) {
+  const {
+    FrameOfReferenceUID
+  } = toolData.annotation.metadata;
+  const {
+    points
+  } = toolData.annotation.data.handles;
+  const {
+    displaySetService
+  } = servicesManager.services;
+  const displaySetsFOR = displaySetService.getDisplaySetsBy(ds => ds.FrameOfReferenceUID === FrameOfReferenceUID);
+  if (!displaySetsFOR.length || !points?.length) {
+    return {
+      FrameOfReferenceUID
+    };
+  }
+  const ds = chooseDisplaySet(displaySetsFOR, toolData.annotation);
+  const cameraView = chooseCameraView(ds, points);
+  const viewReference = {
+    ...cameraView,
+    volumeId: ds.displaySetInstanceUID,
+    FrameOfReferenceUID
+  };
+  core_dist_esm.utilities.updatePlaneRestriction(points, viewReference);
+  return viewReference;
+}
+
+/**
+ * Chooses a possible camera view - right now this is fairly basic,
+ * just setting the unknowns to null.
+ */
+function chooseCameraView(_ds, points) {
+  const selectedPoints = choosePoints(points);
+  const cameraFocalPoint = centerOf(selectedPoints);
+  // These are sufficient to be null for now and can be set on first view
+  let viewPlaneNormal = null;
+  let viewUp = null;
+  return {
+    cameraFocalPoint,
+    viewPlaneNormal,
+    viewUp
+  };
+}
+function centerOf(points) {
+  const scale = 1 / points.length;
+  const center = gl_matrix_esm/* vec3.create */.eR.create();
+  for (const point of points) {
+    gl_matrix_esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(center, center, point, scale);
+  }
+  return center;
+}
+function choosePoints(points) {
+  if (points.length === 1 || points.length === 2) {
+    return points;
+  }
+  const firstIndex = 0;
+  const secondIndex = Math.ceil(points.length / 4);
+  const thirdIndex = Math.ceil(points.length / 2);
+  // TODO - check if colinear, if so try to find another 3 points.
+
+  const newPoints = [points[firstIndex], points[secondIndex], points[thirdIndex]];
+  return newPoints;
+}
 ;// ../../../extensions/cornerstone-dicom-sr/src/commandsModule.ts
 
 
@@ -1320,7 +1499,7 @@ const {
   MeasurementReport: commandsModule_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
 const {
-  log: commandsModule_log
+  log
 } = src/* default */.Ay;
 /**
  * @param measurementData An array of measurements from the measurements service
@@ -1331,7 +1510,7 @@ const {
  */
 const _generateReport = (measurementData, additionalFindingTypes, options = {}) => {
   const filteredToolState = utils_getFilteredCornerstoneToolState(measurementData, additionalFindingTypes);
-  const report = commandsModule_MeasurementReport.generateReport(filteredToolState, core_dist_esm.metaData, core_dist_esm.utilities.worldToImageCoords, options);
+  const report = commandsModule_MeasurementReport.generateReport(filteredToolState, core_dist_esm.metaData, options);
   const {
     dataset
   } = report;
@@ -1351,9 +1530,7 @@ const commandsModule = props => {
     commandsManager
   } = props;
   const {
-    customizationService,
-    viewportGridService,
-    displaySetService
+    customizationService
   } = servicesManager.services;
   const actions = {
     changeColorMeasurement: ({
@@ -1414,9 +1591,9 @@ const commandsModule = props => {
     }) => {
       // 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');
+      log.info('[DICOMSR] storeMeasurements');
       if (!dataSource || !dataSource.store || !dataSource.store.dicom) {
-        commandsModule_log.error('[DICOMSR] datasource has no dataSource.store.dicom endpoint!');
+        log.error('[DICOMSR] datasource has no dataSource.store.dicom endpoint!');
         return Promise.reject({});
       }
       try {
@@ -1432,6 +1609,9 @@ const commandsModule = props => {
           console.log('naturalizedReport missing imaging content', naturalizedReport);
           throw new Error('Invalid report, no content');
         }
+        if (!naturalizedReport.SOPClassUID) {
+          throw new Error('No sop class uid');
+        }
         const onBeforeDicomStore = customizationService.getCustomization('onBeforeDicomStore');
         let dicomDict;
         if (typeof onBeforeDicomStore === 'function') {
@@ -1453,7 +1633,7 @@ const commandsModule = props => {
         return naturalizedReport;
       } catch (error) {
         console.warn(error);
-        commandsModule_log.error(`[DICOMSR] Error while saving the measurements: ${error.message}`);
+        log.error(`[DICOMSR] Error while saving the measurements: ${error.message}`);
         throw new Error(error.message || 'Error while saving the measurements.');
       }
     },
@@ -1910,7 +2090,13 @@ const SRSCOOR3DProbe = {
    * @param {Object} cornerstone Cornerstone event data
    * @return {Measurement} Measurement instance
    */
-  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+  toMeasurement: ({
+    servicesManager,
+    getValueTypeFromToolType
+  }, csToolsEventDetail) => {
+    const {
+      displaySetService
+    } = servicesManager.services;
     const {
       annotation
     } = csToolsEventDetail;
@@ -1924,16 +2110,26 @@ const SRSCOOR3DProbe = {
       return null;
     }
     const {
-      toolName
+      toolName,
+      FrameOfReferenceUID
     } = metadata;
     const {
       points
     } = data.handles;
+    const displaySets = displaySetService.getActiveDisplaySets().filter(ds => ds.FrameOfReferenceUID === FrameOfReferenceUID);
+    const displaySet = displaySets.filter(ds => ds.isReconstructable)[0] || displaySets[0];
+    const {
+      StudyInstanceUID: referenceStudyUID,
+      SeriesInstanceUID: referenceSeriesUID
+    } = displaySets[0] || {};
     const displayText = getDisplayText(annotation);
     return {
       uid: annotationUID,
       points,
       metadata,
+      referenceStudyUID,
+      referenceSeriesUID,
+      displaySetInstanceUID: displaySet?.displaySetInstanceUID,
       toolName: metadata.toolName,
       label: data.label,
       displayText: displayText,
@@ -1959,7 +2155,10 @@ function getDisplayText(annotation) {
       displayText.push(`Finding Site: ${label.value}`);
     }
   }
-  return displayText;
+  return {
+    primary: displayText,
+    secondary: []
+  };
 }
 /* harmony default export */ const SRSCOOR3DProbeMapper = (SRSCOOR3DProbe);
 ;// ../../../extensions/cornerstone-dicom-sr/src/utils/addToolInstance.ts
@@ -2018,7 +2217,9 @@ function init({
   const {
     POINT
   } = measurementService.VALUE_TYPES;
-  measurementService.addMapping(csTools3DVer1MeasurementSource, 'SRSCOORD3DPoint', POINT, SRSCOOR3DProbeMapper.toAnnotation, SRSCOOR3DProbeMapper.toMeasurement);
+  measurementService.addMapping(csTools3DVer1MeasurementSource, 'SRSCOORD3DPoint', POINT, SRSCOOR3DProbeMapper.toAnnotation, SRSCOOR3DProbeMapper.toMeasurement.bind(null, {
+    servicesManager
+  }));
 
   // Modify annotation tools to use dashed lines on SR
   const dashedLine = {
@@ -2124,7 +2325,7 @@ const dicomSRExtension = {
 /* harmony export */   sh: () => (/* binding */ SCOORDTypes)
 /* harmony export */ });
 /* unused harmony export RelationshipType */
-/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34279);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92740);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme