@ohif/app 3.9.0-beta.3 → 3.9.0-beta.30

package/dist/{550.bundle.a2267752bc8874fedfd5.js → 363.bundle.954d90c5692cbb941b4a.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[550],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[363],{
 
-/***/ 76255:
+/***/ 40684:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -12,8 +12,8 @@
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(41766);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11374);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5085);
-/* harmony import */ var _services_ViewportActionCornersService_ViewportActionCornersService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(77954);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(79047);
+/* harmony import */ var _services_ViewportActionCornersService_ViewportActionCornersService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(2447);
 
 
 
@@ -141,7 +141,7 @@ const useViewportActionCornersContext = () => (0,react__WEBPACK_IMPORTED_MODULE_
 
 /***/ }),
 
-/***/ 550:
+/***/ 11363:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -182,7 +182,7 @@ var dist_esm = __webpack_require__(39371);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
 var streaming_image_volume_loader_dist_esm = __webpack_require__(23722);
 // EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
-var src = __webpack_require__(8633);
+var src = __webpack_require__(75186);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
 var cornerstoneDICOMImageLoader_min = __webpack_require__(54578);
 var cornerstoneDICOMImageLoader_min_default = /*#__PURE__*/__webpack_require__.n(cornerstoneDICOMImageLoader_min);
@@ -260,8 +260,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 785 modules
-var ui_src = __webpack_require__(5085);
+// EXTERNAL MODULE: ../../ui/src/index.js + 782 modules
+var ui_src = __webpack_require__(79047);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -437,7 +437,7 @@ function showLabelAnnotationPopup(measurement, uiDialogService, labelConfig) {
 }
 /* harmony default export */ const utils_callInputDialog = (callInputDialog);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
-var state = __webpack_require__(71353);
+var state = __webpack_require__(83910);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts
 
 
@@ -558,7 +558,7 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
   });
 }
 // EXTERNAL MODULE: ../../core/src/utils/index.js + 26 modules
-var utils = __webpack_require__(17541);
+var utils = __webpack_require__(86890);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/tools/OverlayPlaneModuleProvider.ts
 
 const _cachedOverlayMetadata = new Map();
@@ -861,6 +861,7 @@ function initCornerstoneTools(configuration = {}) {
   (0,dist_esm.addTool)(dist_esm.SplineROITool);
   (0,dist_esm.addTool)(dist_esm.LivewireContourTool);
   (0,dist_esm.addTool)(dist_esm.OrientationMarkerTool);
+  (0,dist_esm.addTool)(dist_esm.PlanarFreehandContourSegmentationTool);
 
   // Modify annotation tools to use dashed lines on SR
   const annotationStyle = {
@@ -911,13 +912,14 @@ const toolNames = {
   SplineROI: dist_esm.SplineROITool.toolName,
   LivewireContour: dist_esm.LivewireContourTool.toolName,
   PlanarFreehandROI: dist_esm.PlanarFreehandROITool.toolName,
-  OrientationMarker: dist_esm.OrientationMarkerTool.toolName
+  OrientationMarker: dist_esm.OrientationMarkerTool.toolName,
+  PlanarFreehandContourSegmentation: dist_esm.PlanarFreehandContourSegmentationTool.toolName
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/constants/supportedTools.js
 /* harmony default export */ const supportedTools = (['Length', 'EllipticalROI', 'CircleROI', 'Bidirectional', 'ArrowAnnotate', 'Angle', 'CobbAngle', 'Probe', 'RectangleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour', 'Probe', 'UltrasoundDirectionalTool']);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
-var getSOPInstanceAttributes = __webpack_require__(1663);
+var getSOPInstanceAttributes = __webpack_require__(20928);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts
 
 
@@ -957,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,
@@ -980,6 +982,7 @@ const Length = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1009,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;
@@ -1196,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,
@@ -1219,6 +1219,7 @@ const Bidirectional = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1249,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;
@@ -1391,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,
@@ -1414,6 +1412,7 @@ const EllipticalROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1443,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;
@@ -1572,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
@@ -1599,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 {
@@ -1622,6 +1617,7 @@ const CircleROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1633,7 +1629,7 @@ const CircleROI = {
     };
   }
 };
-function CircleROI_getMappedAnnotations(annotation, DisplaySetService) {
+function CircleROI_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -1651,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;
@@ -1812,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,
@@ -1834,6 +1826,7 @@ const ArrowAnnotate_Length = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1863,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;
@@ -1940,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,
@@ -1963,6 +1956,7 @@ const CobbAngle = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -1974,7 +1968,7 @@ const CobbAngle = {
     };
   }
 };
-function CobbAngle_getMappedAnnotations(annotation, DisplaySetService) {
+function CobbAngle_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -1992,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;
@@ -2125,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,
@@ -2155,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
@@ -2177,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;
@@ -2289,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;
@@ -2316,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,
@@ -2333,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)
@@ -2404,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');
@@ -2415,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;
@@ -2436,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,
@@ -2475,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
@@ -2502,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 {
@@ -2525,6 +2515,7 @@ const RectangleROI = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -2536,7 +2527,7 @@ const RectangleROI = {
     };
   }
 };
-function RectangleROI_getMappedAnnotations(annotation, DisplaySetService) {
+function RectangleROI_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -2554,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;
@@ -3087,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
@@ -3108,6 +3095,7 @@ const Probe = {
       metadata,
       referenceSeriesUID: SeriesInstanceUID,
       referenceStudyUID: StudyInstanceUID,
+      referencedImageId,
       frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
@@ -3119,7 +3107,7 @@ const Probe = {
     };
   }
 };
-function Probe_getMappedAnnotations(annotation, DisplaySetService) {
+function Probe_getMappedAnnotations(annotation, displaySetService) {
   const {
     metadata,
     data
@@ -3137,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;
@@ -3925,7 +3910,7 @@ function _getVolumesFromViewport(viewport) {
   return viewport ? viewport.getActors().map(actor => esm.cache.getVolume(actor.uid)) : [];
 }
 function _getVolumeFromViewport(viewport) {
-  const volumes = _getVolumesFromViewport(viewport);
+  const volumes = _getVolumesFromViewport(viewport).filter(volume => volume);
   const dynamicVolume = volumes.find(volume => volume.isDynamicVolume());
   return dynamicVolume ?? volumes[0];
 }
@@ -4944,12 +4929,16 @@ async function init({
     clearOnModeExit: true
   });
   const labelmapRepresentation = dist_esm.Enums.SegmentationRepresentations.Labelmap;
+  const contourRepresentation = dist_esm.Enums.SegmentationRepresentations.Contour;
   dist_esm.segmentation.config.setGlobalRepresentationConfig(labelmapRepresentation, {
     fillAlpha: 0.5,
     fillAlphaInactive: 0.2,
     outlineOpacity: 1,
     outlineOpacityInactive: 0.65
   });
+  dist_esm.segmentation.config.setGlobalRepresentationConfig(contourRepresentation, {
+    renderFill: false
+  });
   const metadataProvider = src/* default.classes */.Ay.classes.MetadataProvider;
   esm.volumeLoader.registerVolumeLoader('cornerstoneStreamingImageVolume', streaming_image_volume_loader_dist_esm/* cornerstoneStreamingImageVolumeLoader */.FC);
   esm.volumeLoader.registerVolumeLoader('cornerstoneStreamingDynamicImageVolume', streaming_image_volume_loader_dist_esm/* cornerstoneStreamingDynamicImageVolumeLoader */.Mr);
@@ -5037,9 +5026,13 @@ async function init({
       const {
         element
       } = evt.detail;
+      const enabledElement = (0,esm.getEnabledElement)(element);
+      if (!enabledElement) {
+        return;
+      }
       const {
         viewportId
-      } = (0,esm.getEnabledElement)(element);
+      } = enabledElement;
       commandsManager.runCommand('resetCrosshairs', {
         viewportId
       });
@@ -5101,8 +5094,8 @@ function _showCPURenderingModal(uiModalService, hangingProtocolService) {
     }
   });
 }
-// EXTERNAL MODULE: ../../../node_modules/react-dropzone/dist/es/index.js + 5 modules
-var es = __webpack_require__(5013);
+// EXTERNAL MODULE: ../../../node_modules/react-dropzone/dist/es/index.js + 4 modules
+var es = __webpack_require__(92854);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
@@ -5791,6 +5784,11 @@ const tools = {
   }],
   enabled: [{
     toolName: toolNames.SegmentationDisplay
+  }, {
+    toolName: toolNames.PlanarFreehandContourSegmentation,
+    configuration: {
+      displayOnePointAsCrosshairs: true
+    }
   }]
 };
 function getCustomizationModule() {
@@ -6068,7 +6066,9 @@ const CornerstoneViewportDownloadForm = ({
       // for some reason we need a reset camera here, and I don't know why
       downloadViewport.resetCamera();
       const presentation = activeViewport.getViewPresentation();
-      downloadViewport.setView(activeViewport.getViewReference(), presentation);
+      if (downloadViewport.setView) {
+        downloadViewport.setView(activeViewport.getViewReference(), presentation);
+      }
       downloadViewport.render();
     });
   });
@@ -9351,6 +9351,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
     };
     this.addSegmentationRepresentationToToolGroup = async (toolGroupId, segmentationId, hydrateSegmentation = false, representationType = dist_esm.Enums.SegmentationRepresentations.Labelmap, suppressEvents = false) => {
       const segmentation = this.getSegmentation(segmentationId);
+      toolGroupId = toolGroupId || this._getApplicableToolGroupId();
       if (!segmentation) {
         throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`);
       }
@@ -10784,7 +10785,23 @@ class CornerstoneCacheService {
   }
   async invalidateViewportData(viewportData, invalidatedDisplaySetInstanceUID, dataSource, displaySetService) {
     if (viewportData.viewportType === esm.Enums.ViewportType.STACK) {
-      return this._getCornerstoneStackImageIds(displaySetService.getDisplaySetByUID(invalidatedDisplaySetInstanceUID), dataSource);
+      const displaySet = displaySetService.getDisplaySetByUID(invalidatedDisplaySetInstanceUID);
+      const imageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
+
+      // remove images from the cache to be able to re-load them
+      imageIds.forEach(imageId => {
+        if (esm.cache.getImageLoadObject(imageId)) {
+          esm.cache.removeImageLoadObject(imageId);
+        }
+      });
+      return {
+        viewportType: esm.Enums.ViewportType.STACK,
+        data: {
+          StudyInstanceUID: displaySet.StudyInstanceUID,
+          displaySetInstanceUID: invalidatedDisplaySetInstanceUID,
+          imageIds
+        }
+      };
     }
 
     // Todo: grab the volume and get the id from the viewport itself
@@ -10814,32 +10831,48 @@ class CornerstoneCacheService {
     const newViewportData = await this._getVolumeViewportData(dataSource, displaySets, viewportData.viewportType);
     return newViewportData;
   }
-  _getStackViewportData(dataSource, displaySets, initialImageIndex, viewportType) {
-    // For Stack Viewport we don't have fusion currently
-    const displaySet = displaySets[0];
+  async _getStackViewportData(dataSource, displaySets, initialImageIndex, viewportType) {
+    const overlayDisplaySets = displaySets.filter(ds => ds.isOverlayDisplaySet);
+    const nonOverlayDisplaySets = displaySets.filter(ds => !ds.isOverlayDisplaySet);
+
+    // load overlays if they are not loaded
+    for (const overlayDisplaySet of overlayDisplaySets) {
+      if (overlayDisplaySet.load && overlayDisplaySet.load instanceof Function) {
+        const {
+          userAuthenticationService
+        } = this.servicesManager.services;
+        const headers = userAuthenticationService.getAuthorizationHeader();
+        await overlayDisplaySet.load({
+          headers
+        });
+      }
+    }
+    const displaySet = nonOverlayDisplaySets[0];
     let stackImageIds = this.stackImageIds.get(displaySet.displaySetInstanceUID);
     if (!stackImageIds) {
       stackImageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
       this.stackImageIds.set(displaySet.displaySetInstanceUID, stackImageIds);
     }
-    const {
-      displaySetInstanceUID,
-      StudyInstanceUID,
-      isCompositeStack
-    } = displaySet;
-    const StackViewportData = {
-      viewportType,
-      data: {
+
+    // Ensuring the first non-overlay `displaySet` is always the primary one
+    const StackViewportData = [displaySet, ...overlayDisplaySets].map(ds => {
+      const {
+        displaySetInstanceUID,
+        StudyInstanceUID,
+        isCompositeStack
+      } = ds;
+      return {
         StudyInstanceUID,
         displaySetInstanceUID,
         isCompositeStack,
-        imageIds: stackImageIds
-      }
+        imageIds: stackImageIds,
+        initialImageIndex
+      };
+    });
+    return {
+      viewportType,
+      data: StackViewportData
     };
-    if (typeof initialImageIndex === 'number') {
-      StackViewportData.data.initialImageIndex = initialImageIndex;
-    }
-    return StackViewportData;
   }
   async _getVolumeViewportData(dataSource, displaySets, viewportType) {
     // Todo: Check the cache for multiple scenarios to see if we need to
@@ -11696,16 +11729,25 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
   }
   async _setStackViewport(viewport, viewportData, viewportInfo, presentations = {}) {
     const displaySetOptions = viewportInfo.getDisplaySetOptions();
+    const displaySetInstanceUIDs = viewportData.data.map(data => data.displaySetInstanceUID);
+
+    // based on the cache service construct always the first one is the non-overlay
+    // and the rest are overlays
+
+    this.viewportsDisplaySets.set(viewport.id, [...displaySetInstanceUIDs]);
     const {
-      imageIds,
       initialImageIndex,
-      displaySetInstanceUID
-    } = viewportData.data;
-    this.viewportsDisplaySets.set(viewport.id, [displaySetInstanceUID]);
+      imageIds
+    } = viewportData.data[0];
     let initialImageIndexToUse = presentations?.positionPresentation?.initialImageIndex ?? initialImageIndex;
     if (initialImageIndexToUse === undefined || initialImageIndexToUse === null) {
       initialImageIndexToUse = this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
     }
+    const {
+      rotation,
+      flipHorizontal,
+      displayArea
+    } = viewportInfo.getViewportOptions();
     const properties = {
       ...presentations.lutPresentation?.properties
     };
@@ -11732,11 +11774,25 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         properties.colormap = colormap;
       }
     }
+    this._handleOverlays(viewport);
     return viewport.setStack(imageIds, initialImageIndexToUse).then(() => {
       viewport.setProperties({
         ...properties
       });
       this.setPresentations(viewport.id, presentations);
+      if (displayArea) {
+        viewport.setDisplayArea(displayArea);
+      }
+      if (rotation) {
+        viewport.setProperties({
+          rotation
+        });
+      }
+      if (flipHorizontal) {
+        viewport.setCamera({
+          flipHorizontal: true
+        });
+      }
     });
   }
   _getInitialImageIndexForViewport(viewportInfo, imageIds) {
@@ -11907,6 +11963,24 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       viewport.setProperties(properties, volumeId);
     });
     this.setPresentations(viewport.id, presentations);
+    this._handleOverlays(viewport);
+    const toolGroup = toolGroupService.getToolGroupForViewport(viewport.id);
+    dist_esm.utilities.segmentation.triggerSegmentationRender(toolGroup.id);
+    const imageIndex = this._getInitialImageIndexForViewport(viewportInfo);
+    if (imageIndex !== undefined) {
+      dist_esm.utilities.jumpToSlice(viewport.element, {
+        imageIndex
+      });
+    }
+    viewport.render();
+    this._broadcastEvent(this.EVENTS.VIEWPORT_VOLUMES_CHANGED, {
+      viewportInfo
+    });
+  }
+  _handleOverlays(viewport) {
+    const {
+      displaySetService
+    } = this.servicesManager.services;
 
     // load any secondary displaySets
     const displaySetInstanceUIDs = this.viewportsDisplaySets.get(viewport.id);
@@ -11923,18 +11997,6 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       // get segmentations only returns the hydrated segmentations
       this._addSegmentationRepresentationToToolGroupIfNecessary(displaySetInstanceUIDs, viewport);
     }
-    const toolGroup = toolGroupService.getToolGroupForViewport(viewport.id);
-    dist_esm.utilities.segmentation.triggerSegmentationRender(toolGroup.id);
-    const imageIndex = this._getInitialImageIndexForViewport(viewportInfo);
-    if (imageIndex !== undefined) {
-      dist_esm.utilities.jumpToSlice(viewport.element, {
-        imageIndex
-      });
-    }
-    viewport.render();
-    this._broadcastEvent(this.EVENTS.VIEWPORT_VOLUMES_CHANGED, {
-      viewportInfo
-    });
   }
   _addSegmentationRepresentationToToolGroupIfNecessary(displaySetInstanceUIDs, viewport) {
     const {
@@ -12631,9 +12693,9 @@ const id = package_namespaceObject.UU;
 
 
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/services/ViewportActionCornersService/ViewportActionCornersService.ts
-var ViewportActionCornersService = __webpack_require__(77954);
+var ViewportActionCornersService = __webpack_require__(2447);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/contextProviders/ViewportActionCornersProvider.tsx
-var ViewportActionCornersProvider = __webpack_require__(76255);
+var ViewportActionCornersProvider = __webpack_require__(40684);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
 var lodash_debounce = __webpack_require__(14771);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
@@ -13069,7 +13131,7 @@ const {
   getDynamicVolumeInfo
 } = volumeLoaderHelpers ?? {};
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 574).then(__webpack_require__.bind(__webpack_require__, 71574));
+  return __webpack_require__.e(/* import() */ 139).then(__webpack_require__.bind(__webpack_require__, 56139));
 });
 const OHIFCornerstoneViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -13210,14 +13272,14 @@ const cornerstoneExtension = {
 
 /***/ }),
 
-/***/ 77954:
+/***/ 2447:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8633);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5085);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(75186);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(79047);
 var _ViewportActionCornersService;
 
 
@@ -13276,7 +13338,7 @@ ViewportActionCornersService.REGISTRATION = {
 
 /***/ }),
 
-/***/ 71353:
+/***/ 83910:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -13318,7 +13380,7 @@ const reset = () => {
 
 /***/ }),
 
-/***/ 1663:
+/***/ 20928:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -13334,12 +13396,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);