@ohif/app 3.7.0-beta.1 → 3.7.0-beta.100

package/dist/{581.bundle.360d26f97b37da8faec3.js → 471.bundle.b3d77b83b1593c09a504.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,14 @@ __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 + 449 modules
-var ui_src = __webpack_require__(43803);
-;// 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 + 65 modules
+var src = __webpack_require__(71771);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
 const RESPONSE = {
@@ -86,18 +32,23 @@ function promptHydrateRT(_ref) {
   let {
     servicesManager,
     rtDisplaySet,
-    viewportIndex,
-    toolGroupId = 'default'
+    viewportId,
+    toolGroupId = 'default',
+    preHydrateCallbacks,
+    hydrateRTDisplaySet
   } = _ref;
   const {
     uiViewportDialogService
   } = servicesManager.services;
   return new Promise(async function (resolve, reject) {
-    const promptResult = await _askHydrate(uiViewportDialogService, viewportIndex);
+    const promptResult = await _askHydrate(uiViewportDialogService, viewportId);
     if (promptResult === RESPONSE.HYDRATE_SEG) {
-      const isHydrated = await _hydrateRT({
+      preHydrateCallbacks?.forEach(callback => {
+        callback();
+      });
+      const isHydrated = await hydrateRTDisplaySet({
         rtDisplaySet,
-        viewportIndex,
+        viewportId,
         toolGroupId,
         servicesManager
       });
@@ -105,15 +56,15 @@ function promptHydrateRT(_ref) {
     }
   });
 }
-function _askHydrate(uiViewportDialogService, viewportIndex) {
+function _askHydrate(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: 'secondary',
+      type: ui_src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: ui_src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];
@@ -122,7 +73,7 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
       resolve(result);
     };
     uiViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'info',
       message,
       actions,
@@ -136,7 +87,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
 
 
@@ -161,18 +112,19 @@ function _getStatusComponent(_ref) {
       break;
     case false:
       StatusIcon = () => /*#__PURE__*/react.createElement(ui_src/* Icon */.JO, {
+        className: "text-aqua-pale",
         name: "status-untracked"
       });
       ToolTipMessage = () => /*#__PURE__*/react.createElement("div", null, "Click LOAD to load RTSTRUCT.");
   }
   const StatusArea = () => /*#__PURE__*/react.createElement("div", {
-    className: "flex h-6 leading-6 cursor-default text-sm text-white"
+    className: "flex h-6 cursor-default text-sm leading-6 text-white"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "min-w-[45px] flex items-center p-1 rounded-l-xl rounded-r bg-customgray-100"
+    className: "bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
   }, /*#__PURE__*/react.createElement(StatusIcon, null), /*#__PURE__*/react.createElement("span", {
     className: "ml-1"
   }, "RTSTRUCT")), !isHydrated && /*#__PURE__*/react.createElement("div", {
-    className: "ml-1 px-1.5 rounded cursor-pointer hover:text-black bg-primary-main hover:bg-primary-light"
+    className: "bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
     // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
     ,
     onMouseUp: onStatusClick
@@ -187,7 +139,7 @@ function createRTToolGroupAndAddTools(ToolGroupService, customizationService, to
   const {
     tools
   } = customizationService.get('cornerstone.overlayViewportTools') ?? {};
-  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools, {});
+  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 /* harmony default export */ const initRTToolGroup = (createRTToolGroupAndAddTools);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/viewports/OHIFCornerstoneRTViewport.tsx
@@ -199,7 +151,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-
 const {
   formatDate
 } = src.utils;
@@ -209,10 +160,10 @@ function OHIFCornerstoneRTViewport(props) {
     children,
     displaySets,
     viewportOptions,
-    viewportIndex,
     viewportLabel,
     servicesManager,
-    extensionManager
+    extensionManager,
+    commandsManager
   } = props;
   const {
     displaySetService,
@@ -221,7 +172,8 @@ function OHIFCornerstoneRTViewport(props) {
     uiNotificationService,
     customizationService
   } = servicesManager.services;
-  const toolGroupId = `${RT_TOOLGROUP_BASE_NAME}-${viewportIndex}`;
+  const viewportId = viewportOptions.viewportId;
+  const toolGroupId = `${RT_TOOLGROUP_BASE_NAME}-${viewportId}`;
 
   // RT viewport will always have a single display set
   if (displaySets.length > 1) {
@@ -251,7 +203,7 @@ function OHIFCornerstoneRTViewport(props) {
   const referencedDisplaySetRef = (0,react.useRef)(null);
   const {
     viewports,
-    activeViewportIndex
+    activeViewportId
   } = viewportGrid;
   const referencedDisplaySet = rtDisplaySet.getReferenceDisplaySet();
   const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet);
@@ -271,6 +223,26 @@ function OHIFCornerstoneRTViewport(props) {
   const onElementDisabled = () => {
     setElement(null);
   };
+  const storePresentationState = (0,react.useCallback)(() => {
+    viewportGrid?.viewports.forEach(_ref => {
+      let {
+        viewportId
+      } = _ref;
+      commandsManager.runCommand('storePresentation', {
+        viewportId
+      });
+    });
+  }, [viewportGrid]);
+  const hydrateRTDisplaySet = _ref2 => {
+    let {
+      rtDisplaySet,
+      viewportId
+    } = _ref2;
+    commandsManager.runCommand('loadSegmentationDisplaySetsForViewport', {
+      displaySets: [rtDisplaySet],
+      viewportId
+    });
+  };
   const getCornerstoneViewport = (0,react.useCallback)(() => {
     const {
       component: Component
@@ -291,7 +263,7 @@ function OHIFCornerstoneRTViewport(props) {
       onElementEnabled: onElementEnabled,
       onElementDisabled: onElementDisabled
     }));
-  }, [viewportIndex, rtDisplaySet, toolGroupId]);
+  }, [viewportId, rtDisplaySet, toolGroupId]);
   const onSegmentChange = (0,react.useCallback)(direction => {
     direction = direction === 'left' ? -1 : 1;
     const segmentationId = rtDisplaySet.displaySetInstanceUID;
@@ -317,14 +289,16 @@ function OHIFCornerstoneRTViewport(props) {
     }
     utils_promptHydrateRT({
       servicesManager,
-      viewportIndex,
-      rtDisplaySet
+      viewportId,
+      rtDisplaySet,
+      preHydrateCallbacks: [storePresentationState],
+      hydrateRTDisplaySet
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
       }
     });
-  }, [servicesManager, viewportIndex, rtDisplaySet, rtIsLoading]);
+  }, [servicesManager, viewportId, rtDisplaySet, rtIsLoading]);
   (0,react.useEffect)(() => {
     const {
       unsubscribe
@@ -347,11 +321,11 @@ function OHIFCornerstoneRTViewport(props) {
   (0,react.useEffect)(() => {
     const {
       unsubscribe
-    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref => {
+    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref3 => {
       let {
         percentComplete,
         numSegments
-      } = _ref;
+      } = _ref3;
       setProcessingProgress({
         percentComplete,
         totalSegments: numSegments
@@ -366,14 +340,14 @@ 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, _ref4 => {
       let {
         displaySetInstanceUIDs
-      } = _ref2;
-      const activeViewport = viewports[activeViewportIndex];
+      } = _ref4;
+      const activeViewport = viewports.get(activeViewportId);
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
-          viewportIndex: activeViewportIndex,
+          viewportId: activeViewportId,
           displaySetInstanceUIDs: []
         });
       }
@@ -412,7 +386,7 @@ function OHIFCornerstoneRTViewport(props) {
   if (children && children.length) {
     childrenWithProps = children.map((child, index) => {
       return child && /*#__PURE__*/react.cloneElement(child, {
-        viewportIndex,
+        viewportId,
         key: index
       });
     });
@@ -430,10 +404,16 @@ 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 hydrateRTDisplaySet({
       rtDisplaySet,
-      viewportIndex,
-      servicesManager
+      viewportId
     });
     setIsHydrated(isHydrated);
   };
@@ -466,9 +446,9 @@ function OHIFCornerstoneRTViewport(props) {
       }
     }
   }), /*#__PURE__*/react.createElement("div", {
-    className: "relative flex flex-row w-full h-full overflow-hidden"
+    className: "relative flex h-full w-full flex-row overflow-hidden"
   }, rtIsLoading && /*#__PURE__*/react.createElement(ui_src/* LoadingIndicatorTotalPercent */.bk, {
-    className: "w-full h-full",
+    className: "h-full w-full",
     totalNumbers: processingProgress.totalSegments,
     percentComplete: processingProgress.percentComplete,
     loadingText: "Loading RTSTRUCT..."
@@ -476,7 +456,7 @@ function OHIFCornerstoneRTViewport(props) {
 }
 OHIFCornerstoneRTViewport.propTypes = {
   displaySets: prop_types_default().arrayOf((prop_types_default()).object),
-  viewportIndex: (prop_types_default()).number.isRequired,
+  viewportId: (prop_types_default()).string.isRequired,
   dataSource: (prop_types_default()).object,
   children: (prop_types_default()).node,
   customProps: (prop_types_default()).object

package/dist/{199.bundle.290ef76d4ab8358e29bb.js → 506.bundle.ac385e382f79bbf4f306.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
@@ -21,11 +21,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 + 65 modules
+var src = __webpack_require__(71771);
 // 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 +159,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) {
@@ -426,7 +421,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 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 +447,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 [{