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

package/dist/{151.bundle.31ea35044218837bf73f.js → 417.bundle.af0a207c29b109f84159.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__, {
@@ -355,13 +355,40 @@ function calculateSUVlbmScalingFactor(inputs) {
     PatientSize
   } = inputs;
   let LBM;
-  const bodyMassIndex = PatientWeight * PatientWeight / (PatientSize * PatientSize * 10000); // convert size in cm
-  // reference: https://www.medicalconnections.co.uk/kb/calculating-suv-from-pet-images/
+  const weightSizeFactor = Math.pow(PatientWeight / (PatientSize * 100), 2); // reference: https://www.medicalconnections.co.uk/kb/calculating-suv-from-pet-images/
 
   if (PatientSex === 'F') {
-    LBM = 1.07 * PatientWeight - 148 * bodyMassIndex;
+    LBM = 1.07 * PatientWeight - 148 * weightSizeFactor;
   } else if (PatientSex === 'M') {
-    LBM = 1.1 * PatientWeight - 120 * bodyMassIndex;
+    LBM = 1.1 * PatientWeight - 120 * weightSizeFactor;
+  } else {
+    throw new Error(`PatientSex is an invalid value: ${PatientSex}`);
+  }
+
+  return LBM * 1000; // convert in gr
+}
+/**
+ * From https://link.springer.com/article/10.1007/s00259-014-2961-x
+ * and https://link.springer.com/article/10.2165/00003088-200544100-00004
+ * and
+ * @param inputs
+ * @returns
+ */
+
+
+function calculateSUVlbmJanmahasatianScalingFactor(inputs) {
+  const {
+    PatientSex,
+    PatientWeight,
+    PatientSize
+  } = inputs;
+  let LBM;
+  const bodyMassIndex = PatientWeight / Math.pow(PatientSize, 2);
+
+  if (PatientSex === 'F') {
+    LBM = 9270 * PatientWeight / (8780 + 244 * bodyMassIndex);
+  } else if (PatientSex === 'M') {
+    LBM = 9270 * PatientWeight / (6680 + 216 * bodyMassIndex);
   } else {
     throw new Error(`PatientSex is an invalid value: ${PatientSex}`);
   }
@@ -502,9 +529,10 @@ function calculateSUVScalingFactors(instances) {
 
   if (!isSingleSeries) {
     throw new Error('The set of instances does not appear to come from one Series. Every instance must have identical values for series-level metadata properties');
-  }
+  } // Treat null, undefined and zero as a missing PatientWeight.
+
 
-  if (PatientWeight === null || PatientWeight === undefined) {
+  if (!PatientWeight) {
     throw new Error('PatientWeight value is missing. It is not possible to calculate the SUV factors');
   }
 
@@ -567,6 +595,7 @@ function calculateSUVScalingFactors(instances) {
 
 
   let suvlbmFactor;
+  let suvlbmJenmaFactor;
 
   if (PatientSize === null || PatientSize === undefined) {
     console.warn('PatientSize value is missing. It is not possible to calculate the SUV lbm factors');
@@ -579,6 +608,7 @@ function calculateSUVScalingFactors(instances) {
       PatientSize
     };
     suvlbmFactor = calculateSUVlbmScalingFactor(suvlbmInputs);
+    suvlbmJenmaFactor = calculateSUVlbmJanmahasatianScalingFactor(suvlbmInputs);
   }
 
   return results.map(function (result, index) {
@@ -594,6 +624,10 @@ function calculateSUVScalingFactors(instances) {
     if (suvlbmFactor) {
       // multiply for LBM
       factors.suvlbm = decayCorrectionArray[index] * suvlbmFactor;
+    }
+
+    if (suvlbmJenmaFactor) {
+      factors.suvlbmJanma = decayCorrectionArray[index] * suvlbmJenmaFactor;
     } // factor formulaes taken from:
     // https://www.medicalconnections.co.uk/kb/calculating-suv-from-pet-images/
 
@@ -603,24 +637,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 +2604,6 @@ function shouldComponentUpdate(nextProps, nextState) {
 }
 
 
-//# sourceMappingURL=index.esm.js.map
 
 
 /***/ })

package/dist/{569.bundle.0ed8d8178ffd43fe1c34.js → 451.bundle.9fd36f52ff69594f0669.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,77 +13,24 @@ __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 + 449 modules
-var ui_src = __webpack_require__(43803);
+var es = __webpack_require__(69190);
+// 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-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);
-;// 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);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
 
 const RESPONSE = {
@@ -95,32 +42,36 @@ function promptHydrateSEG(_ref) {
   let {
     servicesManager,
     segDisplaySet,
-    viewportIndex
+    viewportId,
+    preHydrateCallbacks,
+    hydrateSEGDisplaySet
   } = _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 _hydrateSEG({
+      preHydrateCallbacks?.forEach(callback => {
+        callback();
+      });
+      const isHydrated = await hydrateSEGDisplaySet({
         segDisplaySet,
-        viewportIndex,
-        servicesManager
+        viewportId
       });
       resolve(isHydrated);
     }
   });
 }
-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
     }];
@@ -129,7 +80,7 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
       resolve(result);
     };
     uiViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'info',
       message,
       actions,
@@ -155,8 +106,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, {
@@ -166,18 +117,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 segmentation.");
   }
   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"
   }, "SEG")), !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
@@ -197,7 +149,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-
 const {
   formatDate
 } = src.utils;
@@ -207,14 +158,15 @@ function OHIFCornerstoneSEGViewport(props) {
     children,
     displaySets,
     viewportOptions,
-    viewportIndex,
     viewportLabel,
     servicesManager,
-    extensionManager
+    extensionManager,
+    commandsManager
   } = props;
   const {
     t
   } = (0,es/* useTranslation */.$G)('SEGViewport');
+  const viewportId = viewportOptions.viewportId;
   const {
     displaySetService,
     toolGroupService,
@@ -222,7 +174,7 @@ function OHIFCornerstoneSEGViewport(props) {
     uiNotificationService,
     customizationService
   } = servicesManager.services;
-  const toolGroupId = `${SEG_TOOLGROUP_BASE_NAME}-${viewportIndex}`;
+  const toolGroupId = `${SEG_TOOLGROUP_BASE_NAME}-${viewportId}`;
 
   // SEG viewport will always have a single display set
   if (displaySets.length > 1) {
@@ -232,7 +184,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
@@ -252,10 +203,10 @@ function OHIFCornerstoneSEGViewport(props) {
   const referencedDisplaySetRef = (0,react.useRef)(null);
   const {
     viewports,
-    activeViewportIndex
+    activeViewportId
   } = viewportGrid;
   const referencedDisplaySet = segDisplaySet.getReferenceDisplaySet();
-  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet);
+  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet);
   referencedDisplaySetRef.current = {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata
@@ -272,6 +223,16 @@ function OHIFCornerstoneSEGViewport(props) {
   const onElementDisabled = () => {
     setElement(null);
   };
+  const storePresentationState = (0,react.useCallback)(() => {
+    viewportGrid?.viewports.forEach(_ref => {
+      let {
+        viewportId
+      } = _ref;
+      commandsManager.runCommand('storePresentation', {
+        viewportId
+      });
+    });
+  }, [viewportGrid]);
   const getCornerstoneViewport = (0,react.useCallback)(() => {
     const {
       component: Component
@@ -293,7 +254,7 @@ function OHIFCornerstoneSEGViewport(props) {
       onElementDisabled: onElementDisabled
       // initialImageIndex={initialImageIndex}
     }));
-  }, [viewportIndex, segDisplaySet, toolGroupId]);
+  }, [viewportId, segDisplaySet, toolGroupId]);
   const onSegmentChange = (0,react.useCallback)(direction => {
     direction = direction === 'left' ? -1 : 1;
     const segmentationId = segDisplaySet.displaySetInstanceUID;
@@ -320,14 +281,16 @@ function OHIFCornerstoneSEGViewport(props) {
     }
     utils_promptHydrateSEG({
       servicesManager,
-      viewportIndex,
-      segDisplaySet
+      viewportId,
+      segDisplaySet,
+      preHydrateCallbacks: [storePresentationState],
+      hydrateSEGDisplaySet
     }).then(isHydrated => {
       if (isHydrated) {
         setIsHydrated(true);
       }
     });
-  }, [servicesManager, viewportIndex, segDisplaySet, segIsLoading]);
+  }, [servicesManager, viewportId, segDisplaySet, segIsLoading]);
   (0,react.useEffect)(() => {
     const {
       unsubscribe
@@ -350,11 +313,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
@@ -369,14 +332,14 @@ 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;
-      const activeViewport = viewports[activeViewportIndex];
+      } = _ref3;
+      const activeViewport = viewports.get(activeViewportId);
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
-          viewportIndex: activeViewportIndex,
+          viewportId: activeViewportId,
           displaySetInstanceUIDs: []
         });
       }
@@ -394,7 +357,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);
@@ -420,7 +382,7 @@ function OHIFCornerstoneSEGViewport(props) {
   if (children && children.length) {
     childrenWithProps = children.map((child, index) => {
       return child && /*#__PURE__*/react.cloneElement(child, {
-        viewportIndex,
+        viewportId,
         key: index
       });
     });
@@ -436,11 +398,27 @@ function OHIFCornerstoneSEGViewport(props) {
     SeriesDescription,
     SpacingBetweenSlices
   } = referencedDisplaySetRef.current.metadata;
+  const hydrateSEGDisplaySet = _ref4 => {
+    let {
+      segDisplaySet,
+      viewportId
+    } = _ref4;
+    commandsManager.runCommand('loadSegmentationDisplaySetsForViewport', {
+      displaySets: [segDisplaySet],
+      viewportId
+    });
+  };
   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 hydrateSEGDisplaySet({
       segDisplaySet,
-      viewportIndex,
-      servicesManager
+      viewportId
     });
     setIsHydrated(isHydrated);
   };
@@ -466,15 +444,16 @@ 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 || ''
       }
     }
   }), /*#__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"
   }, segIsLoading && /*#__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 SEG..."
@@ -482,7 +461,7 @@ function OHIFCornerstoneSEGViewport(props) {
 }
 OHIFCornerstoneSEGViewport.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
@@ -490,20 +469,32 @@ OHIFCornerstoneSEGViewport.propTypes = {
 OHIFCornerstoneSEGViewport.defaultProps = {
   customProps: {}
 };
-function _getReferencedDisplaySetMetadata(referencedDisplaySet) {
+function _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet) {
+  const {
+    SharedFunctionalGroupsSequence
+  } = segDisplaySet.instance;
+  const SharedFunctionalGroup = Array.isArray(SharedFunctionalGroupsSequence) ? SharedFunctionalGroupsSequence[0] : SharedFunctionalGroupsSequence;
+  const {
+    PixelMeasuresSequence
+  } = SharedFunctionalGroup;
+  const PixelMeasures = Array.isArray(PixelMeasuresSequence) ? PixelMeasuresSequence[0] : PixelMeasuresSequence;
+  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;
 }