@ohif/app 3.13.0-beta.87 → 3.13.0-beta.89

package/dist/{4579.bundle.1c315389368cc476aed3.js → 451.bundle.6634a9dae2b4f0e9ebc9.js}

@@ -1,6 +1,6 @@
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[4579],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[451],{
 
-/***/ 64579
+/***/ 451
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4620,9 +4620,29 @@ _CobbAngle = CobbAngle_CobbAngle;
 
 
 
+;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone3D/unitMapper.js
+const UCUM_HOUNSFIELD_UNIT = "[hnsf'U]";
+const DISPLAY_HOUNSFIELD_UNIT = 'HU';
+const UCUM_SQUARE_MILLIMETER = 'mm2';
+const DISPLAY_SQUARE_MILLIMETER = 'mm²';
+const UNIT_MAP_FROM_UCUM = {
+  [UCUM_HOUNSFIELD_UNIT]: DISPLAY_HOUNSFIELD_UNIT,
+  [UCUM_SQUARE_MILLIMETER]: DISPLAY_SQUARE_MILLIMETER
+};
+function mapUnitFromUCUM(unit) {
+  if (!unit) {
+    return unit;
+  }
+  return UNIT_MAP_FROM_UCUM[unit] || unit;
+}
+
+
+
 ;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone3D/metricHandler.js
 
 
+
+const INTENSITY_METRICS = new Set(['Mean', 'Standard Deviation', 'Maximum', 'Minimum']);
 function extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID) {
   const numGroupsBySOPInstanceUID = {};
   if (MeasurementGroup.ContentSequence) {
@@ -4636,9 +4656,13 @@ function extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID) {
           if (!numGroupsBySOPInstanceUID[referencedSOPInstanceUID]) {
             numGroupsBySOPInstanceUID[referencedSOPInstanceUID] = {};
           }
+          let unit = '';
+          if (unitCode) {
+            unit = resolveUnit(codeMeaning, unitCode);
+          }
           numGroupsBySOPInstanceUID[referencedSOPInstanceUID][codeMeaning] = {
             value: numericValue,
-            unit: unitCode || ''
+            unit
           };
         }
       }
@@ -4661,8 +4685,14 @@ function restoreAdditionalMetrics(numGroups) {
     Width: 'width'
   };
   const unitCategory = {
+    mean: 'modalityUnit',
+    stdDev: 'modalityUnit',
+    max: 'modalityUnit',
+    min: 'modalityUnit',
     area: 'areaUnit',
     radius: 'radiusUnit',
+    perimeter: 'unit',
+    length: 'unit',
     width: 'widthUnit'
   };
   for (const _ref of Object.entries(metricMapping)) {
@@ -4682,21 +4712,39 @@ function restoreAdditionalMetrics(numGroups) {
     if (!unit) {
       continue;
     }
-    if (!modalityUnit) {
-      modalityUnit = unit;
+    const mappedUnit = mapUnitFromUCUM(unit);
+    if (!mappedUnit) {
+      continue;
+    }
+    if (INTENSITY_METRICS.has(codeMeaning) && !modalityUnit) {
+      modalityUnit = mappedUnit;
     }
     const category = unitCategory[metricKey];
     if (category) {
       if (!additionalMetrics[category]) {
-        additionalMetrics[category] = unit;
+        additionalMetrics[category] = mappedUnit;
       }
     } else {
-      additionalMetrics["".concat(metricKey, "Unit")] = unit;
+      additionalMetrics["".concat(metricKey, "Unit")] = mappedUnit;
     }
   }
   additionalMetrics.modalityUnit = modalityUnit;
   return additionalMetrics;
 }
+function resolveUnit(codeMeaning, unitCode) {
+  if (!unitCode) {
+    return '';
+  }
+  const CodeValue = unitCode.CodeValue,
+    CodeMeaning = unitCode.CodeMeaning;
+  if (CodeValue === '1') {
+    if (!INTENSITY_METRICS.has(codeMeaning) && codeMeaning === 'Area') {
+      return "".concat(CodeMeaning, "\xB2");
+    }
+    return INTENSITY_METRICS.has(codeMeaning) ? '' : CodeMeaning;
+  }
+  return CodeValue;
+}
 
 
 
@@ -4911,6 +4959,7 @@ _EllipticalROI.init('EllipticalROI', EllipticalROI_TID300Ellipse);
 
 
 
+
 var _RectangleROI;
 function RectangleROI_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function RectangleROI_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? RectangleROI_ownKeys(Object(t), !0).forEach(function (r) { (0,defineProperty/* default */.A)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : RectangleROI_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -4933,11 +4982,15 @@ class RectangleROI extends BaseAdapter3D {
     const referencedSOPInstanceUID = state.sopInstanceUid;
     const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
     const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
+    const restoredMetrics = restoreAdditionalMetrics(measurementNUMGroups);
+    const rawAreaUnit = areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa === void 0 || (_areaGroup$MeasuredVa = _areaGroup$MeasuredVa[0]) === null || _areaGroup$MeasuredVa === void 0 ? void 0 : _areaGroup$MeasuredVa.MeasurementUnitsCodeSequence;
+    const areaUnitFromSR = rawAreaUnit === null || rawAreaUnit === void 0 ? void 0 : rawAreaUnit.CodeValue;
+    const mappedAreaUnit = areaUnitFromSR ? mapUnitFromUCUM(areaUnitFromSR) : restoredMetrics.areaUnit;
     const cachedStats = referencedImageId ? {
       ["imageId:".concat(referencedImageId)]: RectangleROI_objectSpread({
-        area: (areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa === void 0 || (_areaGroup$MeasuredVa = _areaGroup$MeasuredVa[0]) === null || _areaGroup$MeasuredVa === void 0 ? void 0 : _areaGroup$MeasuredVa.NumericValue) || 0,
-        areaUnit: areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa2 = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa2 === void 0 || (_areaGroup$MeasuredVa2 = _areaGroup$MeasuredVa2[0]) === null || _areaGroup$MeasuredVa2 === void 0 || (_areaGroup$MeasuredVa2 = _areaGroup$MeasuredVa2.MeasurementUnitsCodeSequence) === null || _areaGroup$MeasuredVa2 === void 0 ? void 0 : _areaGroup$MeasuredVa2.CodeValue
-      }, restoreAdditionalMetrics(measurementNUMGroups))
+        area: (areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa2 = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa2 === void 0 || (_areaGroup$MeasuredVa2 = _areaGroup$MeasuredVa2[0]) === null || _areaGroup$MeasuredVa2 === void 0 ? void 0 : _areaGroup$MeasuredVa2.NumericValue) || 0,
+        areaUnit: mappedAreaUnit
+      }, restoredMetrics)
     } : {};
     const handlesPoints = [points[0], points[1], points[3], points[2]];
     state.annotation.data = RectangleROI_objectSpread(RectangleROI_objectSpread({}, state.annotation.data), {}, {
@@ -5220,9 +5273,9 @@ class PlanarFreehandROI extends BaseAdapter3D {
     });
     if (referencedImageId) {
       state.annotation.data.cachedStats = {
-        ["imageId:".concat(referencedImageId)]: PlanarFreehandROI_objectSpread({
-          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
-        }, restoreAdditionalMetrics(measurementNUMGroups))
+        ["imageId:".concat(referencedImageId)]: PlanarFreehandROI_objectSpread(PlanarFreehandROI_objectSpread({}, !isOpenContour && NUMGroup ? {
+          area: NUMGroup.MeasuredValueSequence.NumericValue
+        } : {}), restoreAdditionalMetrics(measurementNUMGroups))
       };
     }
     return state;
@@ -6056,23 +6109,23 @@ const getArrayOfSegmentData = _ref9 => {
   }
   return arrayOfSegmentData;
 };
-const getSegmentData = _ref10 => {
-  let PerFrameFunctionalGroupsSequence = _ref10.PerFrameFunctionalGroupsSequence,
-    labelMapImages = _ref10.labelMapImages,
-    sopUIDImageIdIndexMap = _ref10.sopUIDImageIdIndexMap,
-    multiframe = _ref10.multiframe,
-    segmentIndex = _ref10.segmentIndex,
-    sliceLength = _ref10.sliceLength,
-    Rows = _ref10.Rows,
-    Columns = _ref10.Columns,
-    validOrientations = _ref10.validOrientations,
-    tolerance = _ref10.tolerance,
-    pixelDataChunks = _ref10.pixelDataChunks,
-    sharedImageOrientationPatient = _ref10.sharedImageOrientationPatient,
-    metadataProvider = _ref10.metadataProvider,
-    imageIdMaps = _ref10.imageIdMaps,
-    segmentsOnFrame = _ref10.segmentsOnFrame,
-    segmentsPixelIndices = _ref10.segmentsPixelIndices;
+const getSegmentData = _ref0 => {
+  let PerFrameFunctionalGroupsSequence = _ref0.PerFrameFunctionalGroupsSequence,
+    labelMapImages = _ref0.labelMapImages,
+    sopUIDImageIdIndexMap = _ref0.sopUIDImageIdIndexMap,
+    multiframe = _ref0.multiframe,
+    segmentIndex = _ref0.segmentIndex,
+    sliceLength = _ref0.sliceLength,
+    Rows = _ref0.Rows,
+    Columns = _ref0.Columns,
+    validOrientations = _ref0.validOrientations,
+    tolerance = _ref0.tolerance,
+    pixelDataChunks = _ref0.pixelDataChunks,
+    sharedImageOrientationPatient = _ref0.sharedImageOrientationPatient,
+    metadataProvider = _ref0.metadataProvider,
+    imageIdMaps = _ref0.imageIdMaps,
+    segmentsOnFrame = _ref0.segmentsOnFrame,
+    segmentsPixelIndices = _ref0.segmentsPixelIndices;
   const segmentData = [];
   for (let currentLabelMapImageIndex = 0; currentLabelMapImageIndex < labelMapImages.length; currentLabelMapImageIndex++) {
     const currentLabelMapImage = labelMapImages[currentLabelMapImageIndex];

package/dist/{5028.bundle.7ad439186bb8b60b0536.js → 5028.bundle.f483671d94ded4c8f6f3.js}

@@ -26,8 +26,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(81499);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
 var esm = __webpack_require__(15327);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 72 modules
-var dist_esm = __webpack_require__(64579);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 73 modules
+var dist_esm = __webpack_require__(451);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 197 modules
 var cornerstone_src = __webpack_require__(87166);
 ;// ../../../extensions/cornerstone-dicom-pmap/src/getSopClassHandlerModule.ts

package/dist/{5830.bundle.791019deddd536980a11.js → 5830.bundle.8327ccd3c8a6334ac315.js}

@@ -720,8 +720,8 @@ var interface_types = __webpack_require__(16881);
 //# sourceMappingURL=index-common.js.map
 // EXTERNAL MODULE: ../../../node_modules/comlink/dist/esm/comlink.mjs
 var comlink = __webpack_require__(99178);
-// EXTERNAL MODULE: ../../../node_modules/axios/index.js + 49 modules
-var axios = __webpack_require__(17739);
+// EXTERNAL MODULE: ../../../node_modules/axios/index.js + 51 modules
+var axios = __webpack_require__(5626);
 ;// ../../../node_modules/itk-wasm/dist/pipeline/create-web-worker.js
 
 async function createWebWorker(pipelineWorkerUrl) {

package/dist/{5858.bundle.466e58128de344ab53f3.js → 5858.bundle.c25c73ecbc47b1a69cea.js}

@@ -3884,10 +3884,6 @@ function postProcessDecodedPixels(imageFrame, options, start, decodeConfig) {
         }
     }
     else if (disableScale) {
-        imageFrame.preScale = {
-            enabled: true,
-            scaled: false,
-        };
         minAfterScale = minBeforeScale;
         maxAfterScale = maxBeforeScale;
     }