@ohif/app 3.7.0-beta.5 → 3.7.0-beta.50

package/dist/{151.bundle.31ea35044218837bf73f.js → 417.bundle.720dc8f3a6e99f378aa9.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[151],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[417],{
 
-/***/ 71251:
+/***/ 15747:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -603,24 +603,23 @@ function calculateSUVScalingFactors(instances) {
 }
 
 
-//# sourceMappingURL=calculate-suv.esm.js.map
 
 
 /***/ }),
 
-/***/ 21767:
+/***/ 94614:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   S_: () => (/* binding */ VariableSizeList)
 /* harmony export */ });
 /* unused harmony exports FixedSizeGrid, FixedSizeList, VariableSizeGrid, areEqual, shouldComponentUpdate */
-/* harmony import */ var _babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(20011);
-/* harmony import */ var _babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(93173);
-/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23788);
-/* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(89454);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32735);
-/* harmony import */ var _babel_runtime_helpers_esm_objectWithoutPropertiesLoose__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66017);
+/* harmony import */ var _babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76805);
+/* harmony import */ var _babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80107);
+/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84067);
+/* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25539);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(43001);
+/* harmony import */ var _babel_runtime_helpers_esm_objectWithoutPropertiesLoose__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8339);
 
 
 
@@ -2571,7 +2570,6 @@ function shouldComponentUpdate(nextProps, nextState) {
 }
 
 
-//# sourceMappingURL=index.esm.js.map
 
 
 /***/ })

package/dist/{569.bundle.21f8ad57c06a210448b5.js → 451.bundle.9941d9134fcf747d452a.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[569],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[451],{
 
-/***/ 33569:
+/***/ 4451:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -13,16 +13,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
-var es = __webpack_require__(21572);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
+var es = __webpack_require__(69190);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
+// EXTERNAL MODULE: ../../ui/src/index.js + 456 modules
+var ui_src = __webpack_require__(60082);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {
@@ -31,59 +31,8 @@ function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, t
   return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools, {});
 }
 /* harmony default export */ const initSEGToolGroup = (createSEGToolGroupAndAddTools);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
-async function _hydrateSEGDisplaySet(_ref) {
-  let {
-    segDisplaySet,
-    viewportIndex,
-    servicesManager
-  } = _ref;
-  const {
-    segmentationService,
-    hangingProtocolService,
-    viewportGridService
-  } = servicesManager.services;
-  const displaySetInstanceUID = segDisplaySet.referencedDisplaySetInstanceUID;
-  let segmentationId = null;
-
-  // We need the hydration to notify panels about the new segmentation added
-  const suppressEvents = false;
-  segmentationId = await segmentationService.createSegmentationForSEGDisplaySet(segDisplaySet, segmentationId, suppressEvents);
-  segmentationService.hydrateSegmentation(segDisplaySet.displaySetInstanceUID);
-  const {
-    viewports
-  } = viewportGridService.getState();
-  const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
-
-  // Todo: fix this after we have a better way for stack viewport segmentations
-
-  // check every viewport in the viewports to see if the displaySetInstanceUID
-  // is being displayed, if so we need to update the viewport to use volume viewport
-  // (if already is not using it) since Cornerstone3D currently only supports
-  // volume viewport for segmentation
-  viewports.forEach((viewport, index) => {
-    if (index === viewportIndex) {
-      return;
-    }
-    const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewport.displaySetInstanceUIDs, segDisplaySet.displaySetInstanceUID);
-    if (shouldDisplaySeg) {
-      updatedViewports.push({
-        viewportIndex: index,
-        displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
-        viewportOptions: {
-          initialImageOptions: {
-            preset: 'middle'
-          }
-        }
-      });
-    }
-  });
-
-  // Do the entire update at once
-  viewportGridService.setDisplaySetsForViewports(updatedViewports);
-  return true;
-}
-/* harmony default export */ const _hydrateSEG = (_hydrateSEGDisplaySet);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
+var _hydrateSEG = __webpack_require__(28417);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
 
 
@@ -96,7 +45,8 @@ function promptHydrateSEG(_ref) {
   let {
     servicesManager,
     segDisplaySet,
-    viewportIndex
+    viewportIndex,
+    preHydrateCallbacks
   } = _ref;
   const {
     uiViewportDialogService
@@ -104,7 +54,10 @@ function promptHydrateSEG(_ref) {
   return new Promise(async function (resolve, reject) {
     const promptResult = await _askHydrate(uiViewportDialogService, viewportIndex);
     if (promptResult === RESPONSE.HYDRATE_SEG) {
-      const isHydrated = await _hydrateSEG({
+      preHydrateCallbacks?.forEach(callback => {
+        callback();
+      });
+      const isHydrated = await (0,_hydrateSEG/* default */.Z)({
         segDisplaySet,
         viewportIndex,
         servicesManager
@@ -156,8 +109,8 @@ function _getStatusComponent(_ref) {
   let StatusIcon = null;
   const {
     t
-  } = (0,es/* useTranslation */.$G)("Common");
-  const loadStr = t("LOAD");
+  } = (0,es/* useTranslation */.$G)('Common');
+  const loadStr = t('LOAD');
   switch (isHydrated) {
     case true:
       StatusIcon = () => /*#__PURE__*/react.createElement(ui_src/* Icon */.JO, {
@@ -211,7 +164,8 @@ function OHIFCornerstoneSEGViewport(props) {
     viewportIndex,
     viewportLabel,
     servicesManager,
-    extensionManager
+    extensionManager,
+    commandsManager
   } = props;
   const {
     t
@@ -233,7 +187,6 @@ function OHIFCornerstoneSEGViewport(props) {
   const [viewportGrid, viewportGridService] = (0,ui_src/* useViewportGrid */.O_)();
 
   // States
-  const [isToolGroupCreated, setToolGroupCreated] = (0,react.useState)(false);
   const [selectedSegment, setSelectedSegment] = (0,react.useState)(1);
 
   // Hydration means that the SEG is opened and segments are loaded into the
@@ -256,7 +209,7 @@ function OHIFCornerstoneSEGViewport(props) {
     activeViewportIndex
   } = viewportGrid;
   const referencedDisplaySet = segDisplaySet.getReferenceDisplaySet();
-  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet);
+  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet);
   referencedDisplaySetRef.current = {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata
@@ -273,6 +226,16 @@ function OHIFCornerstoneSEGViewport(props) {
   const onElementDisabled = () => {
     setElement(null);
   };
+  const storePresentationState = (0,react.useCallback)(() => {
+    viewportGrid?.viewports.forEach(_ref => {
+      let {
+        viewportIndex
+      } = _ref;
+      commandsManager.runCommand('storePresentation', {
+        viewportIndex
+      });
+    });
+  }, [viewportGrid]);
   const getCornerstoneViewport = (0,react.useCallback)(() => {
     const {
       component: Component
@@ -322,7 +285,8 @@ function OHIFCornerstoneSEGViewport(props) {
     utils_promptHydrateSEG({
       servicesManager,
       viewportIndex,
-      segDisplaySet
+      segDisplaySet,
+      preHydrateCallbacks: [storePresentationState]
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
@@ -351,11 +315,11 @@ function OHIFCornerstoneSEGViewport(props) {
   (0,react.useEffect)(() => {
     const {
       unsubscribe
-    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref => {
+    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref2 => {
       let {
         percentComplete,
         numSegments
-      } = _ref;
+      } = _ref2;
       setProcessingProgress({
         percentComplete,
         totalSegments: numSegments
@@ -370,10 +334,10 @@ function OHIFCornerstoneSEGViewport(props) {
    Cleanup the SEG viewport when the viewport is destroyed
    */
   (0,react.useEffect)(() => {
-    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref2 => {
+    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref3 => {
       let {
         displaySetInstanceUIDs
-      } = _ref2;
+      } = _ref3;
       const activeViewport = viewports[activeViewportIndex];
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
@@ -395,7 +359,6 @@ function OHIFCornerstoneSEGViewport(props) {
     // This creates a custom tool group which has the lifetime of this view
     // only, and does NOT interfere with currently displayed segmentations.
     toolGroup = initSEGToolGroup(toolGroupService, customizationService, toolGroupId);
-    setToolGroupCreated(true);
     return () => {
       // remove the segmentation representations if seg displayset changed
       segmentationService.removeSegmentationRepresentationFromToolGroup(toolGroupId);
@@ -438,7 +401,14 @@ function OHIFCornerstoneSEGViewport(props) {
     SpacingBetweenSlices
   } = referencedDisplaySetRef.current.metadata;
   const onStatusClick = async () => {
-    const isHydrated = await _hydrateSEG({
+    // Before hydrating a SEG and make it added to all viewports in the grid
+    // that share the same frameOfReferenceUID, we need to store the viewport grid
+    // presentation state, so that we can restore it after hydrating the SEG. This is
+    // required if the user has changed the viewport (other viewport than SEG viewport)
+    // presentation state (w/l and invert) and then opens the SEG. If we don't store
+    // the presentation state, the viewport will be reset to the default presentation
+    storePresentationState();
+    const isHydrated = await (0,_hydrateSEG/* default */.Z)({
       segDisplaySet,
       viewportIndex,
       servicesManager
@@ -467,8 +437,9 @@ function OHIFCornerstoneSEGViewport(props) {
         patientSex: PatientSex || '',
         patientAge: PatientAge || '',
         MRN: PatientID || '',
-        thickness: SliceThickness ? `${SliceThickness.toFixed(2)}mm` : '',
-        spacing: SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
+        thickness: SliceThickness ? src.utils.roundNumber(SliceThickness, 2) : '',
+        thicknessUnits: SliceThickness !== undefined ? 'mm' : '',
+        spacing: SpacingBetweenSlices !== undefined ? src.utils.roundNumber(SpacingBetweenSlices, 2) : '',
         scanner: ManufacturerModelName || ''
       }
     }
@@ -491,20 +462,30 @@ OHIFCornerstoneSEGViewport.propTypes = {
 OHIFCornerstoneSEGViewport.defaultProps = {
   customProps: {}
 };
-function _getReferencedDisplaySetMetadata(referencedDisplaySet) {
+function _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet) {
+  const {
+    SharedFunctionalGroupsSequence: [SharedFunctionalGroup]
+  } = segDisplaySet.instance;
+  const {
+    PixelMeasuresSequence: [PixelMeasures]
+  } = SharedFunctionalGroup;
+  const {
+    SpacingBetweenSlices,
+    SliceThickness
+  } = PixelMeasures;
   const image0 = referencedDisplaySet.images[0];
   const referencedDisplaySetMetadata = {
     PatientID: image0.PatientID,
     PatientName: image0.PatientName,
     PatientSex: image0.PatientSex,
     PatientAge: image0.PatientAge,
-    SliceThickness: image0.SliceThickness,
+    SliceThickness: image0.SliceThickness || SliceThickness,
     StudyDate: image0.StudyDate,
     SeriesDescription: image0.SeriesDescription,
     SeriesInstanceUID: image0.SeriesInstanceUID,
     SeriesNumber: image0.SeriesNumber,
     ManufacturerModelName: image0.ManufacturerModelName,
-    SpacingBetweenSlices: image0.SpacingBetweenSlices
+    SpacingBetweenSlices: image0.SpacingBetweenSlices || SpacingBetweenSlices
   };
   return referencedDisplaySetMetadata;
 }

package/dist/{581.bundle.dc6197189f7c88c27d4c.js → 471.bundle.c9e618aeda78362776aa.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[581],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[471],{
 
-/***/ 72581:
+/***/ 56471:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -13,68 +13,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
-async function _hydrateRTDisplaySet(_ref) {
-  let {
-    rtDisplaySet,
-    viewportIndex,
-    servicesManager
-  } = _ref;
-  const {
-    segmentationService,
-    hangingProtocolService,
-    viewportGridService
-  } = servicesManager.services;
-  const displaySetInstanceUID = rtDisplaySet.referencedDisplaySetInstanceUID;
-  let segmentationId = null;
-
-  // We need the hydration to notify panels about the new segmentation added
-  const suppressEvents = false;
-  segmentationId = await segmentationService.createSegmentationForRTDisplaySet(rtDisplaySet, segmentationId, suppressEvents);
-  segmentationService.hydrateSegmentation(rtDisplaySet.displaySetInstanceUID);
-  const {
-    viewports
-  } = viewportGridService.getState();
-  const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
-  viewportGridService.setDisplaySetsForViewports(updatedViewports);
-
-  // Todo: fix this after we have a better way for stack viewport segmentations
-
-  // check every viewport in the viewports to see if the displaySetInstanceUID
-  // is being displayed, if so we need to update the viewport to use volume viewport
-  // (if already is not using it) since Cornerstone3D currently only supports
-  // volume viewport for segmentation
-  viewports.forEach((viewport, index) => {
-    if (index === viewportIndex) {
-      return;
-    }
-    const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewport.displaySetInstanceUIDs, rtDisplaySet.displaySetInstanceUID);
-    if (shouldDisplaySeg) {
-      updatedViewports.push({
-        viewportIndex: index,
-        displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
-        viewportOptions: {
-          initialImageOptions: {
-            preset: 'middle'
-          }
-        }
-      });
-    }
-  });
-
-  // Do the entire update at once
-  viewportGridService.setDisplaySetsForViewports(updatedViewports);
-  return true;
-}
-/* harmony default export */ const _hydrateRT = (_hydrateRTDisplaySet);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
+// EXTERNAL MODULE: ../../ui/src/index.js + 456 modules
+var ui_src = __webpack_require__(60082);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
+var _hydrateRT = __webpack_require__(50995);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
 
@@ -88,7 +36,8 @@ function promptHydrateRT(_ref) {
     servicesManager,
     rtDisplaySet,
     viewportIndex,
-    toolGroupId = 'default'
+    toolGroupId = 'default',
+    preHydrateCallbacks
   } = _ref;
   const {
     uiViewportDialogService
@@ -96,7 +45,10 @@ function promptHydrateRT(_ref) {
   return new Promise(async function (resolve, reject) {
     const promptResult = await _askHydrate(uiViewportDialogService, viewportIndex);
     if (promptResult === RESPONSE.HYDRATE_SEG) {
-      const isHydrated = await _hydrateRT({
+      preHydrateCallbacks?.forEach(callback => {
+        callback();
+      });
+      const isHydrated = await (0,_hydrateRT/* default */.Z)({
         rtDisplaySet,
         viewportIndex,
         toolGroupId,
@@ -137,7 +89,7 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
 }
 /* harmony default export */ const utils_promptHydrateRT = (promptHydrateRT);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
-var es = __webpack_require__(21572);
+var es = __webpack_require__(69190);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/viewports/_getStatusComponent.tsx
 
 
@@ -213,7 +165,8 @@ function OHIFCornerstoneRTViewport(props) {
     viewportIndex,
     viewportLabel,
     servicesManager,
-    extensionManager
+    extensionManager,
+    commandsManager
   } = props;
   const {
     displaySetService,
@@ -272,6 +225,16 @@ function OHIFCornerstoneRTViewport(props) {
   const onElementDisabled = () => {
     setElement(null);
   };
+  const storePresentationState = (0,react.useCallback)(() => {
+    viewportGrid?.viewports.forEach(_ref => {
+      let {
+        viewportIndex
+      } = _ref;
+      commandsManager.runCommand('storePresentation', {
+        viewportIndex
+      });
+    });
+  }, [viewportGrid]);
   const getCornerstoneViewport = (0,react.useCallback)(() => {
     const {
       component: Component
@@ -319,7 +282,8 @@ function OHIFCornerstoneRTViewport(props) {
     utils_promptHydrateRT({
       servicesManager,
       viewportIndex,
-      rtDisplaySet
+      rtDisplaySet,
+      preHydrateCallbacks: [storePresentationState]
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
@@ -348,11 +312,11 @@ function OHIFCornerstoneRTViewport(props) {
   (0,react.useEffect)(() => {
     const {
       unsubscribe
-    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref => {
+    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref2 => {
       let {
         percentComplete,
         numSegments
-      } = _ref;
+      } = _ref2;
       setProcessingProgress({
         percentComplete,
         totalSegments: numSegments
@@ -367,10 +331,10 @@ function OHIFCornerstoneRTViewport(props) {
    Cleanup the SEG viewport when the viewport is destroyed
    */
   (0,react.useEffect)(() => {
-    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref2 => {
+    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref3 => {
       let {
         displaySetInstanceUIDs
-      } = _ref2;
+      } = _ref3;
       const activeViewport = viewports[activeViewportIndex];
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
@@ -431,7 +395,14 @@ function OHIFCornerstoneRTViewport(props) {
     SeriesNumber
   } = referencedDisplaySetRef.current.metadata;
   const onStatusClick = async () => {
-    const isHydrated = await _hydrateRT({
+    // Before hydrating a RT and make it added to all viewports in the grid
+    // that share the same frameOfReferenceUID, we need to store the viewport grid
+    // presentation state, so that we can restore it after hydrating the RT. This is
+    // required if the user has changed the viewport (other viewport than RT viewport)
+    // presentation state (w/l and invert) and then opens the RT. If we don't store
+    // the presentation state, the viewport will be reset to the default presentation
+    storePresentationState();
+    const isHydrated = await (0,_hydrateRT/* default */.Z)({
       rtDisplaySet,
       viewportIndex,
       servicesManager

package/dist/{199.bundle.dff92336f7bc36f2e484.js → 506.bundle.8a2562b7038f6c983884.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[199],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[506],{
 
-/***/ 31199:
+/***/ 53506:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -9,7 +9,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": () => (/* binding */ cornerstone_dicom_rt_src)
+  "default": () => (/* binding */ cornerstone_dicom_rt_src),
+  hydrateRTDisplaySet: () => (/* reexport */ _hydrateRT/* default */.Z)
 });
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/package.json
@@ -21,11 +22,11 @@ const SOPClassHandlerName = 'dicom-rt';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+var react = __webpack_require__(43001);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(22737);
+var dcmjs_es = __webpack_require__(67540);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/loadRTStruct.js
 
 const {
@@ -159,11 +160,6 @@ async function loadRTStruct(extensionManager, rtStructDisplaySet, referencedDisp
         NumberOfContourPoints,
         ContourGeometricType
       } = ContourSequenceArray[c];
-      const sopInstanceUID = ContourImageSequence.ReferencedSOPInstanceUID;
-      const imageId = _getImageId(imageIdSopInstanceUidPairs, sopInstanceUID);
-      if (!imageId) {
-        continue;
-      }
       let isSupported = false;
       const points = [];
       for (let p = 0; p < NumberOfContourPoints * 3; p += 3) {
@@ -420,13 +416,16 @@ function getSopClassHandlerModule(_ref2) {
   }];
 }
 /* harmony default export */ const src_getSopClassHandlerModule = (getSopClassHandlerModule);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
+var _hydrateRT = __webpack_require__(50995);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/index.tsx
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
 
+
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 581).then(__webpack_require__.bind(__webpack_require__, 72581));
+  return __webpack_require__.e(/* import() */ 471).then(__webpack_require__.bind(__webpack_require__, 56471));
 });
 const OHIFCornerstoneRTViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -452,12 +451,14 @@ const extension = {
   getViewportModule(_ref) {
     let {
       servicesManager,
-      extensionManager
+      extensionManager,
+      commandsManager
     } = _ref;
     const ExtendedOHIFCornerstoneRTViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneRTViewport, _extends({
         servicesManager: servicesManager,
-        extensionManager: extensionManager
+        extensionManager: extensionManager,
+        commandsManager: commandsManager
       }, props));
     };
     return [{
@@ -475,6 +476,69 @@ const extension = {
 };
 /* harmony default export */ const cornerstone_dicom_rt_src = (extension);
 
+
+/***/ }),
+
+/***/ 50995:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Z: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+async function _hydrateRTDisplaySet(_ref) {
+  let {
+    rtDisplaySet,
+    viewportIndex,
+    servicesManager
+  } = _ref;
+  const {
+    segmentationService,
+    hangingProtocolService,
+    viewportGridService
+  } = servicesManager.services;
+  const displaySetInstanceUID = rtDisplaySet.referencedDisplaySetInstanceUID;
+  let segmentationId = null;
+
+  // We need the hydration to notify panels about the new segmentation added
+  const suppressEvents = false;
+  segmentationId = await segmentationService.createSegmentationForRTDisplaySet(rtDisplaySet, segmentationId, suppressEvents);
+  segmentationService.hydrateSegmentation(rtDisplaySet.displaySetInstanceUID);
+  const {
+    viewports
+  } = viewportGridService.getState();
+  const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
+  viewportGridService.setDisplaySetsForViewports(updatedViewports);
+
+  // Todo: fix this after we have a better way for stack viewport segmentations
+
+  // check every viewport in the viewports to see if the displaySetInstanceUID
+  // is being displayed, if so we need to update the viewport to use volume viewport
+  // (if already is not using it) since Cornerstone3D currently only supports
+  // volume viewport for segmentation
+  viewports.forEach((viewport, index) => {
+    if (index === viewportIndex) {
+      return;
+    }
+    const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewport.displaySetInstanceUIDs, rtDisplaySet.displaySetInstanceUID);
+    if (shouldDisplaySeg) {
+      updatedViewports.push({
+        viewportIndex: index,
+        displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
+        viewportOptions: {
+          initialImageOptions: {
+            preset: 'middle'
+          }
+        }
+      });
+    }
+  });
+
+  // Do the entire update at once
+  viewportGridService.setDisplaySetsForViewports(updatedViewports);
+  return true;
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_hydrateRTDisplaySet);
+
 /***/ })
 
 }]);