@cornerstonejs/adapters 4.22.10 → 4.22.11

package/dist/esm/adapters/Cornerstone3D/PlanarFreehandROI.js

@@ -58,9 +58,9 @@ class PlanarFreehandROI extends BaseAdapter3D {
     });
     if (referencedImageId) {
       state.annotation.data.cachedStats = {
-        ["imageId:".concat(referencedImageId)]: _objectSpread({
-          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
-        }, restoreAdditionalMetrics(measurementNUMGroups))
+        ["imageId:".concat(referencedImageId)]: _objectSpread(_objectSpread({}, !isOpenContour && NUMGroup ? {
+          area: NUMGroup.MeasuredValueSequence.NumericValue
+        } : {}), restoreAdditionalMetrics(measurementNUMGroups))
       };
     }
     return state;

package/dist/esm/adapters/Cornerstone3D/RectangleROI.js

@@ -6,6 +6,7 @@ import '../helpers/scoordToWorld.js';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
+import { mapUnitFromUCUM } from './unitMapper.js';
 
 var _RectangleROI;
 function 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; }
@@ -29,11 +30,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)]: _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 = _objectSpread(_objectSpread({}, state.annotation.data), {}, {

package/dist/esm/adapters/Cornerstone3D/metricHandler.js

@@ -1,5 +1,7 @@
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import { mapUnitFromUCUM } from './unitMapper.js';
 
+const INTENSITY_METRICS = new Set(['Mean', 'Standard Deviation', 'Maximum', 'Minimum']);
 function extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID) {
   const numGroupsBySOPInstanceUID = {};
   if (MeasurementGroup.ContentSequence) {
@@ -13,9 +15,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
           };
         }
       }
@@ -38,8 +44,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)) {
@@ -59,20 +71,38 @@ 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;
+}
 
 export { extractAllNUMGroups, restoreAdditionalMetrics };

package/dist/esm/adapters/Cornerstone3D/unitMapper.d.ts

@@ -0,0 +1,5 @@
+export declare const UCUM_HOUNSFIELD_UNIT = "[hnsf'U]";
+export declare const DISPLAY_HOUNSFIELD_UNIT = "HU";
+export declare const UCUM_SQUARE_MILLIMETER = "mm2";
+export declare const DISPLAY_SQUARE_MILLIMETER = "mm\u00B2";
+export declare function mapUnitFromUCUM(unit: string | undefined): string | undefined;

package/dist/esm/adapters/Cornerstone3D/unitMapper.js

@@ -0,0 +1,16 @@
+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;
+}
+
+export { DISPLAY_HOUNSFIELD_UNIT, DISPLAY_SQUARE_MILLIMETER, UCUM_HOUNSFIELD_UNIT, UCUM_SQUARE_MILLIMETER, mapUnitFromUCUM };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.22.10";
+export declare const version = "4.22.11";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/adapters",
-  "version": "4.22.10",
+  "version": "4.22.11",
   "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -89,12 +89,12 @@
     "ndarray": "1.0.19"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "4.22.10",
-    "@cornerstonejs/tools": "4.22.10"
+    "@cornerstonejs/core": "4.22.11",
+    "@cornerstonejs/tools": "4.22.11"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.22.10",
-    "@cornerstonejs/tools": "4.22.10"
+    "@cornerstonejs/core": "4.22.11",
+    "@cornerstonejs/tools": "4.22.11"
   },
-  "gitHead": "c6b2f1a3649b96a44a71e64c389f82079d74ba53"
+  "gitHead": "9cc703acb396d12b37fdc8af4727218574494caa"
 }