@ohif/app 3.7.0-beta.79 → 3.7.0-beta.80

package/dist/{348.bundle.343c39a8c96a044b0fe2.js → 348.bundle.8c5b950d30e5aa992290.js}

@@ -16,8 +16,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l
@@ -463,7 +463,18 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -498,23 +509,13 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.ReferenceLines
     }]
   };
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const SRUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone-dicom-sr.utilityModule.tools');
+  if (!SRUtilityModule) {
+    return;
+  }
   const CS3DUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
   const {
     toolNames: SRToolNames
@@ -561,21 +562,8 @@ function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
   const toolGroupId = 'SRToolGroup';
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -606,7 +594,18 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -629,7 +628,14 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
+      }
     }, {
       toolName: toolNames.ReferenceLines
     }]
@@ -638,27 +644,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
 function initVolume3DToolGroup(extensionManager, toolGroupService) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -769,7 +755,7 @@ function modeFactory(_ref) {
         toolbarService,
         toolGroupService,
         panelService,
-        segmentationService
+        customizationService
       } = servicesManager.services;
       measurementService.clearMeasurements();
 
@@ -779,7 +765,6 @@ function modeFactory(_ref) {
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',
@@ -803,6 +788,10 @@ function modeFactory(_ref) {
       toolbarService.init(extensionManager);
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools']);
+      customizationService.addModeCustomizations([{
+        id: 'segmentation.disableEditing',
+        value: true
+      }]);
 
       // // ActivatePanel event trigger for when a segmentation or measurement is added.
       // // Do not force activation so as to respect the state the user may have left the UI in.

package/dist/{359.bundle.2618db789083f7d3007d.js → 359.bundle.d2a3abe1a5cd3ca3cd8e.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
 const toolGroupIds = {
   CT: 'ctToolGroup',
@@ -50,7 +50,20 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => {
+          commandsManager.runCommand('arrowTextCallback', {
+            callback,
+            eventDetails
+          });
+        },
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -74,32 +87,17 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
-    }]
-  };
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
       }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => {
-        commandsManager.runCommand('arrowTextCallback', {
-          callback,
-          eventDetails
-        });
-      },
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
+    }]
   };
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.CT, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.CT, tools);
   toolGroupService.createToolGroupAndAddTools(toolGroupIds.PT, {
     active: tools.active,
     passive: [...tools.passive, {
@@ -107,14 +105,20 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
     }],
     enabled: tools.enabled,
     disabled: tools.disabled
-  }, toolsConfig);
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.Fusion, tools, toolsConfig);
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.default, tools, toolsConfig);
+  });
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.Fusion, tools);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.default, tools);
   const mipTools = {
     active: [{
-      toolName: toolNames.VolumeRotateMouseWheel
+      toolName: toolNames.VolumeRotateMouseWheel,
+      configuration: {
+        rotateIncrementDegrees: 0.1
+      }
     }, {
       toolName: toolNames.MipJumpToClick,
+      configuration: {
+        toolGroupId: toolGroupIds.PT
+      },
       bindings: [{
         mouseButton: Enums.MouseBindings.Primary
       }]
@@ -123,93 +127,11 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }]
   };
-  const mipToolsConfig = {
-    [toolNames.VolumeRotateMouseWheel]: {
-      rotateIncrementDegrees: 0.1
-    },
-    [toolNames.MipJumpToClick]: {
-      toolGroupId: toolGroupIds.PT
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools, mipToolsConfig);
-}
-function initMPRToolGroup(toolNames, Enums, toolGroupService, commandsManager) {
-  const tools = {
-    active: [{
-      toolName: toolNames.WindowLevel,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Primary
-      }]
-    }, {
-      toolName: toolNames.Pan,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Auxiliary
-      }]
-    }, {
-      toolName: toolNames.Zoom,
-      bindings: [{
-        mouseButton: Enums.MouseBindings.Secondary
-      }]
-    }, {
-      toolName: toolNames.StackScrollMouseWheel,
-      bindings: []
-    }],
-    passive: [{
-      toolName: toolNames.Length
-    }, {
-      toolName: toolNames.ArrowAnnotate
-    }, {
-      toolName: toolNames.Bidirectional
-    }, {
-      toolName: toolNames.DragProbe
-    }, {
-      toolName: toolNames.EllipticalROI
-    }, {
-      toolName: toolNames.RectangleROI
-    }, {
-      toolName: toolNames.StackScroll
-    }, {
-      toolName: toolNames.Angle
-    }, {
-      toolName: toolNames.CobbAngle
-    }, {
-      toolName: toolNames.SegmentationDisplay
-    }],
-    disabled: [{
-      toolName: toolNames.Crosshairs
-    }]
-
-    // enabled
-    // disabled
-  };
-
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools);
 }
 function initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
   _initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
-  // initMPRToolGroup(toolNames, Enums, toolGroupService, commandsManager);
 }
-
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
@@ -551,7 +473,6 @@ function modeFactory(_ref) {
       const setWindowLevelActive = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',

package/dist/{410.bundle.5cc4909f3c608350a71e.js → 410.bundle.be538faa9c7fad92189b.js}

@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_dev_mode_src)
 });
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var src = __webpack_require__(71783);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var core_src = __webpack_require__(34491);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
@@ -355,12 +355,11 @@ function modeFactory(_ref) {
       };
 
       const toolGroupId = 'default';
-      toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, configs);
+      toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
       let unsubscribe;
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',

package/dist/{451.bundle.aaabf094eb8fa67da819.js → 451.bundle.dc0d14c3724464cca2bf.js}

@@ -21,21 +21,18 @@ var react = __webpack_require__(43001);
 var es = __webpack_require__(69190);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {
     tools
   } = customizationService.get('cornerstone.overlayViewportTools') ?? {};
-  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools, {});
+  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 /* harmony default export */ const initSEGToolGroup = (createSEGToolGroupAndAddTools);
-// 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
 
-
 const RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -46,7 +43,8 @@ function promptHydrateSEG(_ref) {
     servicesManager,
     segDisplaySet,
     viewportId,
-    preHydrateCallbacks
+    preHydrateCallbacks,
+    hydrateSEGDisplaySet
   } = _ref;
   const {
     uiViewportDialogService
@@ -57,10 +55,9 @@ function promptHydrateSEG(_ref) {
       preHydrateCallbacks?.forEach(callback => {
         callback();
       });
-      const isHydrated = await (0,_hydrateSEG/* default */.Z)({
+      const isHydrated = await hydrateSEGDisplaySet({
         segDisplaySet,
-        viewportId,
-        servicesManager
+        viewportId
       });
       resolve(isHydrated);
     }
@@ -70,11 +67,11 @@ function _askHydrate(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
+      type: ui_src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
+      type: ui_src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];
@@ -152,7 +149,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-
 const {
   formatDate
 } = src.utils;
@@ -287,7 +283,8 @@ function OHIFCornerstoneSEGViewport(props) {
       servicesManager,
       viewportId,
       segDisplaySet,
-      preHydrateCallbacks: [storePresentationState]
+      preHydrateCallbacks: [storePresentationState],
+      hydrateSEGDisplaySet
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
@@ -401,6 +398,16 @@ function OHIFCornerstoneSEGViewport(props) {
     SeriesDescription,
     SpacingBetweenSlices
   } = referencedDisplaySetRef.current.metadata;
+  const hydrateSEGDisplaySet = _ref4 => {
+    let {
+      segDisplaySet,
+      viewportId
+    } = _ref4;
+    commandsManager.runCommand('loadSegmentationDisplaySetsForViewport', {
+      displaySets: [segDisplaySet],
+      viewportId
+    });
+  };
   const onStatusClick = async () => {
     // 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
@@ -409,10 +416,9 @@ function OHIFCornerstoneSEGViewport(props) {
     // 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)({
+    const isHydrated = await hydrateSEGDisplaySet({
       segDisplaySet,
-      viewportId,
-      servicesManager
+      viewportId
     });
     setIsHydrated(isHydrated);
   };
@@ -465,11 +471,13 @@ OHIFCornerstoneSEGViewport.defaultProps = {
 };
 function _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet) {
   const {
-    SharedFunctionalGroupsSequence: [SharedFunctionalGroup]
+    SharedFunctionalGroupsSequence
   } = segDisplaySet.instance;
+  const SharedFunctionalGroup = Array.isArray(SharedFunctionalGroupsSequence) ? SharedFunctionalGroupsSequence[0] : SharedFunctionalGroupsSequence;
   const {
-    PixelMeasuresSequence: [PixelMeasures]
+    PixelMeasuresSequence
   } = SharedFunctionalGroup;
+  const PixelMeasures = Array.isArray(PixelMeasuresSequence) ? PixelMeasuresSequence[0] : PixelMeasuresSequence;
   const {
     SpacingBetweenSlices,
     SliceThickness

package/dist/{471.bundle.953dacdccd46028efba7.js → 471.bundle.2206d4c0ac2ad0df2362.js}

@@ -19,13 +19,10 @@ var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
-// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
-var _hydrateRT = __webpack_require__(50995);
+// 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 = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -37,7 +34,8 @@ function promptHydrateRT(_ref) {
     rtDisplaySet,
     viewportId,
     toolGroupId = 'default',
-    preHydrateCallbacks
+    preHydrateCallbacks,
+    hydrateRTDisplaySet
   } = _ref;
   const {
     uiViewportDialogService
@@ -48,7 +46,7 @@ function promptHydrateRT(_ref) {
       preHydrateCallbacks?.forEach(callback => {
         callback();
       });
-      const isHydrated = await (0,_hydrateRT/* default */.Z)({
+      const isHydrated = await hydrateRTDisplaySet({
         rtDisplaySet,
         viewportId,
         toolGroupId,
@@ -62,11 +60,11 @@ function _askHydrate(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
+      type: ui_src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
+      type: ui_src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];
@@ -141,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
@@ -153,7 +151,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-
 const {
   formatDate
 } = src.utils;
@@ -236,6 +233,16 @@ function OHIFCornerstoneRTViewport(props) {
       });
     });
   }, [viewportGrid]);
+  const hydrateRTDisplaySet = _ref2 => {
+    let {
+      rtDisplaySet,
+      viewportId
+    } = _ref2;
+    commandsManager.runCommand('loadSegmentationDisplaySetsForViewport', {
+      displaySets: [rtDisplaySet],
+      viewportId
+    });
+  };
   const getCornerstoneViewport = (0,react.useCallback)(() => {
     const {
       component: Component
@@ -284,7 +291,8 @@ function OHIFCornerstoneRTViewport(props) {
       servicesManager,
       viewportId,
       rtDisplaySet,
-      preHydrateCallbacks: [storePresentationState]
+      preHydrateCallbacks: [storePresentationState],
+      hydrateRTDisplaySet
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
@@ -313,11 +321,11 @@ function OHIFCornerstoneRTViewport(props) {
   (0,react.useEffect)(() => {
     const {
       unsubscribe
-    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref2 => {
+    } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, _ref3 => {
       let {
         percentComplete,
         numSegments
-      } = _ref2;
+      } = _ref3;
       setProcessingProgress({
         percentComplete,
         totalSegments: numSegments
@@ -332,10 +340,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, _ref3 => {
+    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref4 => {
       let {
         displaySetInstanceUIDs
-      } = _ref3;
+      } = _ref4;
       const activeViewport = viewports.get(activeViewportId);
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
@@ -403,10 +411,9 @@ function OHIFCornerstoneRTViewport(props) {
     // 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)({
+    const isHydrated = await hydrateRTDisplaySet({
       rtDisplaySet,
-      viewportId,
-      servicesManager
+      viewportId
     });
     setIsHydrated(isHydrated);
   };