@ohif/app 3.9.0-beta.23 → 3.9.0-beta.25

package/dist/{363.bundle.7dd957eeb0177cdb808c.js → 363.bundle.5cb502c3332360678f5c.js}

@@ -959,12 +959,12 @@ const Length = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, cornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -982,6 +982,7 @@ const Length = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1011,15 +1012,12 @@ function getMappedAnnotations(annotation, displaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -1198,12 +1196,12 @@ const Bidirectional = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, cornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -1221,6 +1219,7 @@ const Bidirectional = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1251,15 +1250,12 @@ function Bidirectional_getMappedAnnotations(annotation, displaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -1393,12 +1389,12 @@ const EllipticalROI = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, cornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -1416,6 +1412,7 @@ const EllipticalROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1445,16 +1442,12 @@ function EllipticalROI_getMappedAnnotations(annotation, displaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      // Todo: Non-acquisition plane measurement mapping not supported yet
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -1574,7 +1567,7 @@ function EllipticalROI_getDisplayText(mappedAnnotations, displaySet, customizati
 
 const CircleROI = {
   toAnnotation: measurement => {},
-  toMeasurement: (csToolsEventDetail, DisplaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
     const {
       annotation,
       viewportId
@@ -1601,18 +1594,18 @@ const CircleROI = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, CornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
-      displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = DisplaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
       textBox
     } = data.handles;
-    const mappedAnnotations = CircleROI_getMappedAnnotations(annotation, DisplaySetService);
+    const mappedAnnotations = CircleROI_getMappedAnnotations(annotation, displaySetService);
     const displayText = CircleROI_getDisplayText(mappedAnnotations, displaySet, customizationService);
     const getReport = () => CircleROI_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService);
     return {
@@ -1624,6 +1617,7 @@ const CircleROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1635,7 +1629,7 @@ const CircleROI = {
     };
   }
 };
-function CircleROI_getMappedAnnotations(annotation, DisplaySetService) {
+function CircleROI_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -1653,16 +1647,12 @@ function CircleROI_getMappedAnnotations(annotation, DisplaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      // Todo: Non-acquisition plane measurement mapping not supported yet
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -1814,12 +1804,12 @@ const ArrowAnnotate_Length = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, cornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -1836,6 +1826,7 @@ const ArrowAnnotate_Length = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1865,8 +1856,8 @@ function ArrowAnnotate_getMappedAnnotations(annotation, displaySetService) {
     SOPInstanceUID,
     SeriesInstanceUID,
     frameNumber
-  } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-  const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+  } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+  const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
   const {
     SeriesNumber
   } = displaySet;
@@ -1942,12 +1933,12 @@ const CobbAngle = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, CornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -1965,6 +1956,7 @@ const CobbAngle = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1976,7 +1968,7 @@ const CobbAngle = {
     };
   }
 };
-function CobbAngle_getMappedAnnotations(annotation, DisplaySetService) {
+function CobbAngle_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -1994,15 +1986,12 @@ function CobbAngle_getMappedAnnotations(annotation, DisplaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -2127,12 +2116,12 @@ const Angle = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, CornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
@@ -2157,11 +2146,12 @@ const Angle = {
       displayText: displayText,
       data: data.cachedStats,
       type: getValueTypeFromToolType(toolName),
-      getReport
+      getReport,
+      referencedImageId
     };
   }
 };
-function Angle_getMappedAnnotations(annotation, DisplaySetService) {
+function Angle_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -2179,15 +2169,12 @@ function Angle_getMappedAnnotations(annotation, DisplaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -2291,7 +2278,7 @@ const PlanarFreehandROI = {
    * @param {Function} getValueTypeFromToolType Function to get value type from tool type
    * @returns {Measurement} Measurement instance
    */
-  toMeasurement: (csToolsEventDetail, DisplaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
     const {
       annotation
     } = csToolsEventDetail;
@@ -2318,12 +2305,12 @@ const PlanarFreehandROI = {
       SeriesInstanceUID,
       frameNumber,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
-      displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = DisplaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     return {
       uid: annotationUID,
@@ -2335,10 +2322,11 @@ const PlanarFreehandROI = {
       frameNumber,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
       label: data.label,
-      displayText: PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationService),
+      displayText: PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationService, displaySetService),
       data: data.cachedStats,
       type: getValueTypeFromToolType(toolName),
       getReport: () => getColumnValueReport(annotation, customizationService)
@@ -2406,7 +2394,7 @@ function getColumnValueReport(annotation, customizationService) {
  * @param {Object} displaySet - The display set object.
  * @returns {string[]} - An array of display text.
  */
-function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationService) {
+function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationService, displaySetService) {
   const {
     PlanarFreehandROI
   } = customizationService.get('cornerstone.measurements');
@@ -2417,13 +2405,10 @@ function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationS
     metadata,
     data
   } = annotation;
-  if (!data.cachedStats || !data.cachedStats[`imageId:${metadata.referencedImageId}`]) {
-    return [];
-  }
   const {
     SOPInstanceUID,
     frameNumber
-  } = (0,getSOPInstanceAttributes/* default */.A)(metadata.referencedImageId);
+  } = (0,getSOPInstanceAttributes/* default */.A)(metadata.referencedImageId, displaySetService, annotation);
   const displayTextArray = [];
   const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
   let InstanceNumber;
@@ -2438,17 +2423,20 @@ function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationS
   if (SeriesNumber) {
     displayTextArray.push(`S: ${SeriesNumber}${instanceText}${frameText}`);
   }
-  const stats = data.cachedStats[`imageId:${metadata.referencedImageId}`];
+  const stats = data.cachedStats[`imageId:${metadata.referencedImageId}`] || Array.from(Object.values(data.cachedStats))[0];
+  if (!stats) {
+    return displayTextArray;
+  }
   const roundValues = values => {
     if (Array.isArray(values)) {
       return values.map(value => {
         if (isNaN(value)) {
           return value;
         }
-        return src.utils.roundNumber(value);
+        return src.utils.roundNumber(value, 2);
       });
     }
-    return isNaN(values) ? values : src.utils.roundNumber(values);
+    return isNaN(values) ? values : src.utils.roundNumber(values, 2);
   };
   const findUnitForValue = (displayTextItems, value) => displayTextItems.find(({
     type,
@@ -2477,7 +2465,7 @@ function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationS
 
 const RectangleROI = {
   toAnnotation: measurement => {},
-  toMeasurement: (csToolsEventDetail, DisplaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
     const {
       annotation,
       viewportId
@@ -2504,18 +2492,18 @@ const RectangleROI = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, CornerstoneViewportService, viewportId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
-      displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = DisplaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points,
       textBox
     } = data.handles;
-    const mappedAnnotations = RectangleROI_getMappedAnnotations(annotation, DisplaySetService);
+    const mappedAnnotations = RectangleROI_getMappedAnnotations(annotation, displaySetService);
     const displayText = RectangleROI_getDisplayText(mappedAnnotations, displaySet, customizationService);
     const getReport = () => RectangleROI_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService);
     return {
@@ -2527,6 +2515,7 @@ const RectangleROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -2538,7 +2527,7 @@ const RectangleROI = {
     };
   }
 };
-function RectangleROI_getMappedAnnotations(annotation, DisplaySetService) {
+function RectangleROI_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -2556,16 +2545,12 @@ function RectangleROI_getMappedAnnotations(annotation, DisplaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      // Todo: Non-acquisition plane measurement mapping not supported yet
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -3089,12 +3074,12 @@ const Probe = {
       SOPInstanceUID,
       SeriesInstanceUID,
       StudyInstanceUID
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
     let displaySet;
     if (SOPInstanceUID) {
       displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
     } else {
-      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     }
     const {
       points
@@ -3110,6 +3095,7 @@ const Probe = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -3121,7 +3107,7 @@ const Probe = {
     };
   }
 };
-function Probe_getMappedAnnotations(annotation, DisplaySetService) {
+function Probe_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -3139,15 +3125,12 @@ function Probe_getMappedAnnotations(annotation, DisplaySetService) {
   const annotations = [];
   Object.keys(cachedStats).forEach(targetId => {
     const targetStats = cachedStats[targetId];
-    if (!referencedImageId) {
-      throw new Error('Non-acquisition plane measurement mapping not supported');
-    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID,
       frameNumber
-    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
-    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId, displaySetService, annotation);
+    const displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID)[0];
     const {
       SeriesNumber
     } = displaySet;
@@ -13391,12 +13374,26 @@ const reset = () => {
  * @param {string} imageId The image id of the referenced image
  * @returns
  */
-function getSOPInstanceAttributes(imageId) {
+function getSOPInstanceAttributes(imageId, displaySetService, annotation) {
   if (imageId) {
     return _getUIDFromImageID(imageId);
   }
-
-  // Todo: implement for volume viewports and use the referencedSeriesInstanceUID
+  const {
+    metadata
+  } = annotation;
+  const {
+    volumeId
+  } = metadata;
+  const displaySet = displaySetService.getDisplaySetsBy(displaySet => volumeId.includes(displaySet.uid))[0];
+  const {
+    StudyInstanceUID,
+    SeriesInstanceUID
+  } = displaySet;
+  return {
+    SOPInstanceUID: undefined,
+    SeriesInstanceUID,
+    StudyInstanceUID
+  };
 }
 function _getUIDFromImageID(imageId) {
   const instance = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.metaData.get('instance', imageId);

package/dist/{370.bundle.baa389d217c390b0e92b.js → 370.bundle.02108fbb881fbe75b59c.js}

@@ -5502,7 +5502,7 @@ async function addLabelmapToElement(element, labelMapData, segmentationRepresent
                 actorUID: segmentationRepresentationUID,
             },
         ];
-        await (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.addImageSlicesToViewports)(renderingEngine, stackInputs, [viewportId], immediateRender, suppressEvents);
+        await (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.addImageSlicesToViewports)(renderingEngine, stackInputs, [viewportId]);
     }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (addLabelmapToElement);

package/dist/{461.bundle.b44727b0b162f4b10b5e.js → 461.bundle.f8616212d433f5a2dc2e.js}

@@ -2757,8 +2757,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.23";
-  const commitHash = "7745c092bb3edf0090f32fbbbae2f0776128d5a2";
+  const versionNumber = "3.9.0-beta.25";
+  const commitHash = "75a71db7f89840250ad1c2b35df5a35aceb8be7d";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',