@cornerstonejs/adapters 5.0.0-beta.1 → 5.0.1

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

@@ -1,40 +1,47 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import MeasurementReport from './MeasurementReport.js';
-import { utilities } from 'dcmjs';
 import { vec3 } from 'gl-matrix';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import { toScoords } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
 import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
+import { toArray } from '../helpers/toArray.js';
+import '../helpers/downloadDICOMData.js';
+import { toScoords } from '../helpers/toScoordType.js';
+import '../helpers/scoordToWorld.js';
+import ControlPointPolyline from './ControlPointPolyline.js';
+import { SPLINE_TYPE_CODE } from './constants/index.js';
 
 var _PlanarFreehandROI;
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-const {
-  Polyline: TID300Polyline
-} = utilities.TID300;
 class PlanarFreehandROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    const {
-      state,
-      NUMGroup,
-      worldCoords,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    var _state$annotation$dat, _state$annotation$dat2, _numSeq$find;
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.state,
+      NUMGroup = _MeasurementReport$ge.NUMGroup,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     const distanceBetweenFirstAndLastPoint = vec3.distance(worldCoords[worldCoords.length - 1], worldCoords[0]);
     let isOpenContour = true;
     if (distanceBetweenFirstAndLastPoint < this.closedContourThreshold) {
       worldCoords.pop();
       isOpenContour = false;
     }
-    const points = [];
-    if (isOpenContour) {
-      points.push(worldCoords[0], worldCoords[worldCoords.length - 1]);
+    let points = (_state$annotation$dat = (_state$annotation$dat2 = state.annotation.data.handles) === null || _state$annotation$dat2 === void 0 ? void 0 : _state$annotation$dat2.points) !== null && _state$annotation$dat !== void 0 ? _state$annotation$dat : [];
+    if (isOpenContour && points.length === 0) {
+      points = [worldCoords[0], worldCoords[worldCoords.length - 1]];
     }
     const referencedSOPInstanceUID = state.sopInstanceUid;
     const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
     const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
+    const SPLINE_TYPE = {
+      CodingSchemeDesignator: SPLINE_TYPE_CODE.schemeDesignator,
+      CodeValue: SPLINE_TYPE_CODE.value
+    };
+    const numSeq = NUMGroup ? toArray(NUMGroup.ContentSequence) : [];
+    const mgContentSeq = toArray(MeasurementGroup.ContentSequence);
+    const splineTypeItem = (_numSeq$find = numSeq.find(item => MeasurementReport.codeValueMatch(item, SPLINE_TYPE))) !== null && _numSeq$find !== void 0 ? _numSeq$find : mgContentSeq.find(item => MeasurementReport.codeValueMatch(item, SPLINE_TYPE));
     state.annotation.data = _objectSpread(_objectSpread({}, state.annotation.data), {}, {
       contour: {
         polyline: worldCoords,
@@ -44,32 +51,33 @@ class PlanarFreehandROI extends BaseAdapter3D {
         points
       }),
       frameNumber: ReferencedFrameNumber
+    }, splineTypeItem && {
+      spline: {
+        type: splineTypeItem.TextValue
+      }
     });
     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;
   }
   static getTID300RepresentationArguments(tool) {
+    var _handles$points, _data$spline;
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      polyline,
-      closed
-    } = data.contour;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const handles = data.handles;
+    const _data$contour = data.contour,
+      polyline = _data$contour.polyline,
+      closed = _data$contour.closed;
     const isOpenContour = closed !== true;
-    const {
-      referencedImageId
-    } = metadata;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
@@ -79,18 +87,19 @@ class PlanarFreehandROI extends BaseAdapter3D {
       const firstPoint = points[0];
       points.push(firstPoint);
     }
-    const {
-      area,
-      areaUnit,
-      modalityUnit,
-      perimeter,
-      mean,
-      max,
-      stdDev,
-      length
-    } = data.cachedStats["imageId:".concat(referencedImageId)] || {};
+    const controlPoints = (handles === null || handles === void 0 || (_handles$points = handles.points) === null || _handles$points === void 0 ? void 0 : _handles$points.length) && toScoords(scoordProps, handles.points);
+    const _ref = data.cachedStats["imageId:".concat(referencedImageId)] || {},
+      area = _ref.area,
+      areaUnit = _ref.areaUnit,
+      modalityUnit = _ref.modalityUnit,
+      perimeter = _ref.perimeter,
+      mean = _ref.mean,
+      max = _ref.max,
+      stdDev = _ref.stdDev,
+      length = _ref.length;
     return {
       points,
+      controlPoints,
       area,
       areaUnit,
       perimeter: perimeter !== null && perimeter !== void 0 ? perimeter : length,
@@ -98,6 +107,7 @@ class PlanarFreehandROI extends BaseAdapter3D {
       mean,
       max,
       stdDev,
+      splineType: (_data$spline = data.spline) === null || _data$spline === void 0 ? void 0 : _data$spline.type,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
@@ -108,6 +118,10 @@ class PlanarFreehandROI extends BaseAdapter3D {
 }
 _PlanarFreehandROI = PlanarFreehandROI;
 _PlanarFreehandROI.closedContourThreshold = 1e-5;
-_PlanarFreehandROI.init("PlanarFreehandROI", TID300Polyline);
+(() => {
+  _PlanarFreehandROI.init('PlanarFreehandROI', ControlPointPolyline);
+  _PlanarFreehandROI.registerSubType(_PlanarFreehandROI, 'LivewireContour');
+  _PlanarFreehandROI.registerSubType(_PlanarFreehandROI, 'SplineROI');
+})();
 
 export { PlanarFreehandROI as default };

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

@@ -1,4 +1,4 @@
-import BaseAdapter3D from "./BaseAdapter3D";
+import BaseAdapter3D from './BaseAdapter3D';
 declare class Probe extends BaseAdapter3D {
     static isValidMeasurement(measurement: any): boolean;
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any, _trackingIdentifier: any): {

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

@@ -1,30 +1,28 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
+import '../helpers/downloadDICOMData.js';
 import { toScoords } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 
 var _Probe;
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-const {
-  Point: TID300Point
-} = utilities.TID300;
+const TID300Point = utilities.TID300.Point;
 class Probe extends BaseAdapter3D {
   static isValidMeasurement(measurement) {
     const graphicItem = this.getGraphicItem(measurement);
-    return this.getGraphicType(graphicItem) === "POINT" && this.getPointsCount(graphicItem) <= 2;
+    return this.getGraphicType(graphicItem) === 'POINT' && this.getPointsCount(graphicItem) <= 2;
   }
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, _trackingIdentifier) {
     var _NUMGroup$MeasuredVal, _NUMGroup$MeasuredVal2;
-    const {
-      state,
-      NUMGroup,
-      worldCoords,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.state,
+      NUMGroup = _MeasurementReport$ge.NUMGroup,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     const cachedStats = referencedImageId ? {
       ["imageId:".concat(referencedImageId)]: {
         value: (_NUMGroup$MeasuredVal = NUMGroup === null || NUMGroup === void 0 || (_NUMGroup$MeasuredVal2 = NUMGroup.MeasuredValueSequence) === null || _NUMGroup$MeasuredVal2 === void 0 ? void 0 : _NUMGroup$MeasuredVal2.NumericValue) !== null && _NUMGroup$MeasuredVal !== void 0 ? _NUMGroup$MeasuredVal : null
@@ -42,26 +40,17 @@ class Probe extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      metadata
-    } = tool;
-    const {
-      finding,
-      findingSites
-    } = tool;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      metadata = tool.metadata;
+    const finding = tool.finding,
+      findingSites = tool.findingSites;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
-    const {
-      handles: {
-        points = []
-      }
-    } = data;
+    const _data$handles$points = data.handles.points,
+      points = _data$handles$points === void 0 ? [] : _data$handles$points;
     const pointsImage = toScoords(scoordProps, points);
     return {
       points: pointsImage,
@@ -75,10 +64,10 @@ class Probe extends BaseAdapter3D {
 }
 _Probe = Probe;
 (() => {
-  _Probe.init("Probe", TID300Point);
+  _Probe.init('Probe', TID300Point);
   _Probe.registerLegacy();
-  _Probe.registerType("DCM:111030", "POINT", 1);
-  _Probe.registerType("DCM:111030", "POINT", 2);
+  _Probe.registerType('DCM:111030', 'POINT', 1);
+  _Probe.registerType('DCM:111030', 'POINT', 2);
 })();
 
 export { Probe as default };

package/dist/esm/adapters/Cornerstone3D/RTStruct/RTSS.js

@@ -1,5 +1,5 @@
-import _defineProperty from '../../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
-import { metaData, Enums } from '@cornerstonejs/core';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { Enums, metaData } from '@cornerstonejs/core';
 import { utilities, annotation } from '@cornerstonejs/tools';
 import getReferencedFrameOfReferenceSequence from './utilities/getReferencedFrameOfReferenceSequence.js';
 import getReferencedSeriesSequence from './utilities/getReferencedSeriesSequence.js';
@@ -10,13 +10,10 @@ import { createInstance } from '../../../utilities/createInstance.js';
 
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-const {
-  generateContourSetsFromLabelmap,
-  AnnotationToPointData
-} = utilities.contours;
-const {
-  MetadataModules
-} = Enums;
+const _utilities$contours = utilities.contours,
+  generateContourSetsFromLabelmap = _utilities$contours.generateContourSetsFromLabelmap,
+  AnnotationToPointData = _utilities$contours.AnnotationToPointData;
+const MetadataModules = Enums.MetadataModules;
 function generateRTSSFromSegmentations(segmentation, metadataProvider, _DicomMetadataStore) {
   return generateRTSSFromLabelmap(segmentation, {
     metadataProvider,
@@ -25,9 +22,8 @@ function generateRTSSFromSegmentations(segmentation, metadataProvider, _DicomMet
 }
 async function generateRTSSFromLabelmap(segmentations, options) {
   var _dataset$ReferencedFr;
-  const {
-    metadataProvider = metaData
-  } = options;
+  const _options$metadataProv = options.metadataProvider,
+    metadataProvider = _options$metadataProv === void 0 ? metaData : _options$metadataProv;
   const roiContours = [];
   const contourSets = await generateContourSetsFromLabelmap({
     segmentations
@@ -37,9 +33,7 @@ async function generateRTSSFromLabelmap(segmentations, options) {
       const contourSequence = [];
       contourSet.sliceContours.forEach(sliceContour => {
         const ContourImageSequence = metadataProvider.get('ImageSopInstanceReference', sliceContour.referencedImageId);
-        const {
-          points: polyDataPoints
-        } = sliceContour.polyData;
+        const polyDataPoints = sliceContour.polyData.points;
         sliceContour.contours.forEach((contour, index) => {
           const ContourGeometricType = contour.type;
           const NumberOfContourPoints = contour.contourPoints.length;
@@ -92,19 +86,13 @@ function generateRTSSFromAnnotations(segmentations, annotations, options) {
   const dataset = _initializeDataset(segmentations, annotations[0].metadata, options);
   const segmentsContour = new Map();
   annotations.forEach((annotation, index) => {
-    const {
-      data: {
-        segmentation
-      }
-    } = annotation;
+    const segmentation = annotation.data.segmentation;
     if (!segmentation) {
       console.warn('Annotation is not a segmentation:', annotation);
       return;
     }
-    const {
-      segmentationId,
-      segmentIndex
-    } = segmentation;
+    const segmentationId = segmentation.segmentationId,
+      segmentIndex = segmentation.segmentIndex;
     const key = "".concat(segmentationId, ":").concat(segmentIndex);
     let segmentAnnotation = segmentsContour.get(key);
     if (!segmentAnnotation) {
@@ -136,9 +124,7 @@ function generateRTSSFromAnnotations(segmentations, annotations, options) {
   return dataset;
 }
 function _initializeDataset(segmentation, imgMetadata, options) {
-  const {
-    referencedImageId: studyExemplarImageId
-  } = imgMetadata;
+  const studyExemplarImageId = imgMetadata.referencedImageId;
   return createInstance(MetadataModules.RTSS_INSTANCE_DATA, studyExemplarImageId, {
     StructureSetLabel: segmentation.label,
     StructureSetName: segmentation.label,
@@ -147,9 +133,7 @@ function _initializeDataset(segmentation, imgMetadata, options) {
   }, options);
 }
 function generateRTSSFromContour(segmentations, options) {
-  const {
-    annotationUIDsMap
-  } = segmentations.representationData.Contour;
+  const annotationUIDsMap = segmentations.representationData.Contour.annotationUIDsMap;
   const annotations = [];
   for (const annotationSet of annotationUIDsMap.values()) {
     for (const annotationUID of annotationSet.values()) {

package/dist/esm/adapters/Cornerstone3D/RTStruct/index.d.ts

@@ -1,4 +1,4 @@
-import { utilities } from "@cornerstonejs/tools";
-export * from "./RTSS";
+import { utilities } from '@cornerstonejs/tools';
+export * from './RTSS';
 declare const generateContourSetsFromLabelmap: typeof utilities.contours.generateContourSetsFromLabelmap;
 export { generateContourSetsFromLabelmap };

package/dist/esm/adapters/Cornerstone3D/RTStruct/index.js

@@ -1,8 +1,6 @@
 import { utilities } from '@cornerstonejs/tools';
 export { generateRTSSFromAnnotations, generateRTSSFromContour, generateRTSSFromLabelmap, generateRTSSFromRepresentation, generateRTSSFromSegmentations } from './RTSS.js';
 
-const {
-  generateContourSetsFromLabelmap
-} = utilities.contours;
+const generateContourSetsFromLabelmap = utilities.contours.generateContourSetsFromLabelmap;
 
 export { generateContourSetsFromLabelmap };

package/dist/esm/adapters/Cornerstone3D/RTStruct/utilities/getReferencedFrameOfReferenceSequence.js

@@ -1,7 +1,5 @@
 function getReferencedFrameOfReferenceSequence(referencedFrameOfReferenceSequence, metadata, _options) {
-  const {
-    FrameOfReferenceUID
-  } = metadata;
+  const FrameOfReferenceUID = metadata.FrameOfReferenceUID;
   referencedFrameOfReferenceSequence || (referencedFrameOfReferenceSequence = []);
   let referencedItem = referencedFrameOfReferenceSequence.find(it => it.FrameOfReferenceUID === FrameOfReferenceUID);
   if (!referencedItem) {

package/dist/esm/adapters/Cornerstone3D/RTStruct/utilities/getReferencedSeriesSequence.js

@@ -1,22 +1,16 @@
-import { metaData, Enums } from '@cornerstonejs/core';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import { Enums, metaData } from '@cornerstonejs/core';
 
-const {
-  MetadataModules
-} = Enums;
+const MetadataModules = Enums.MetadataModules;
 function getReferencedSeriesSequence(referencedSeriesSequence, metadata, options) {
   const metadataProvider = (options === null || options === void 0 ? void 0 : options.metadataProvider) || metaData;
-  const {
-    referencedImageId: imageId
-  } = metadata;
+  const imageId = metadata.referencedImageId;
   const newReferenceSeq = metadataProvider.get(MetadataModules.REFERENCED_SERIES_REFERENCE, imageId);
   referencedSeriesSequence || (referencedSeriesSequence = []);
   if (newReferenceSeq) {
-    const {
-      ReferencedSeriesInstanceUID: newSeriesUid,
-      ReferencedInstanceSequence: [{
-        ReferencedSOPInstanceUID: newSopUID
-      }]
-    } = newReferenceSeq;
+    const newSeriesUid = newReferenceSeq.ReferencedSeriesInstanceUID,
+      _newReferenceSeq$Refe = _slicedToArray(newReferenceSeq.ReferencedInstanceSequence, 1),
+      newSopUID = _newReferenceSeq$Refe[0].ReferencedSOPInstanceUID;
     const existingSeries = referencedSeriesSequence.find(it => it.ReferencedSeriesInstanceUID === newSeriesUid);
     if (!existingSeries) {
       referencedSeriesSequence.push(newReferenceSeq);

package/dist/esm/adapters/Cornerstone3D/RTStruct/utilities/getStructureSetModule.js

@@ -1,7 +1,5 @@
 function getStructureSetModule(contour, segment) {
-  const {
-    FrameOfReferenceUID
-  } = contour.metadata;
+  const FrameOfReferenceUID = contour.metadata.FrameOfReferenceUID;
   return {
     ROINumber: segment.segmentIndex,
     ROIName: segment.label,

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

@@ -1,17 +1,17 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { utilities } from 'dcmjs';
+import '../helpers/downloadDICOMData.js';
 import { toScoords } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-const {
-  Polyline: TID300Polyline
-} = utilities.TID300;
+const TID300Polyline = utilities.TID300.Polyline;
 class RectangleROI extends BaseAdapter3D {
   static isValidMeasurement(measurement) {
     const graphicItem = this.getGraphicItem(measurement);
@@ -20,22 +20,25 @@ class RectangleROI extends BaseAdapter3D {
   }
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     var _areaGroup$MeasuredVa, _areaGroup$MeasuredVa2;
-    const {
-      state,
-      worldCoords,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.state,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     const points = worldCoords.length === 5 ? worldCoords.slice(0, 4) : worldCoords;
     const areaGroup = MeasurementGroup.ContentSequence.find(g => g.ValueType === 'NUM' && g.ConceptNameCodeSequence.CodeMeaning === 'Area');
     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), {}, {
@@ -49,29 +52,24 @@ class RectangleROI extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
     const corners = toScoords(scoordProps, data.handles.points);
-    const {
-      area,
-      perimeter,
-      max,
-      mean,
-      stdDev,
-      areaUnit,
-      modalityUnit
-    } = data.cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _ref = data.cachedStats["imageId:".concat(referencedImageId)] || {},
+      area = _ref.area,
+      perimeter = _ref.perimeter,
+      max = _ref.max,
+      mean = _ref.mean,
+      stdDev = _ref.stdDev,
+      areaUnit = _ref.areaUnit,
+      modalityUnit = _ref.modalityUnit;
     return {
       points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
       area,

package/dist/esm/adapters/Cornerstone3D/Segmentation/compactMergeSegData.d.ts

@@ -1,4 +1,4 @@
-export declare const compactMergeSegmentDataWithoutInformationLoss: ({ arrayOfSegmentData, newSegmentData }: {
+export declare const compactMergeSegmentDataWithoutInformationLoss: ({ arrayOfSegmentData, newSegmentData, }: {
     arrayOfSegmentData: any;
     newSegmentData: any;
 }) => void;

package/dist/esm/adapters/Cornerstone3D/Segmentation/compactMergeSegData.js

@@ -1,9 +1,7 @@
 const checkHasOverlapping = _ref => {
-  let {
-    largerArray,
-    currentTestedArray,
-    newArray
-  } = _ref;
+  let largerArray = _ref.largerArray,
+    currentTestedArray = _ref.currentTestedArray,
+    newArray = _ref.newArray;
   return largerArray.some((_, currentImageIndex) => {
     const originalImagePixelData = currentTestedArray[currentImageIndex];
     const newImagePixelData = newArray[currentImageIndex];
@@ -17,10 +15,8 @@ const checkHasOverlapping = _ref => {
   });
 };
 const compactMergeSegmentDataWithoutInformationLoss = _ref2 => {
-  let {
-    arrayOfSegmentData,
-    newSegmentData
-  } = _ref2;
+  let arrayOfSegmentData = _ref2.arrayOfSegmentData,
+    newSegmentData = _ref2.newSegmentData;
   if (arrayOfSegmentData.length === 0) {
     arrayOfSegmentData.push(newSegmentData);
     return;

package/dist/esm/adapters/Cornerstone3D/Segmentation/generateLabelMaps2DFrom3D.js

@@ -1,8 +1,6 @@
 function generateLabelMaps2DFrom3D(labelmap3D) {
-  const {
-    scalarData,
-    dimensions
-  } = labelmap3D;
+  const scalarData = labelmap3D.scalarData,
+    dimensions = labelmap3D.dimensions;
   const labelmaps2D = [];
   const segmentsOnLabelmap3D = new Set();
   for (let z = 0; z < dimensions[2]; z++) {

package/dist/esm/adapters/Cornerstone3D/Segmentation/generateSegmentation.js

@@ -1,19 +1,13 @@
-import _defineProperty from '../../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { normalizers, derivations } from 'dcmjs';
 import { Enums } from '@cornerstonejs/core';
 import { fillSegmentation } from '../../Cornerstone/Segmentation_4X.js';
 
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-const {
-  MetadataModules
-} = Enums;
-const {
-  SEGImageNormalizer
-} = normalizers;
-const {
-  Segmentation: SegmentationDerivation
-} = derivations;
+const MetadataModules = Enums.MetadataModules;
+const SEGImageNormalizer = normalizers.SEGImageNormalizer;
+const SegmentationDerivation = derivations.Segmentation;
 function generateSegmentation(images, labelmaps, metadata) {
   let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   const segmentation = _createMultiframeSegmentationFromReferencedImages(images, metadata, options);
@@ -29,9 +23,7 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
   const studyImageId = (options === null || options === void 0 ? void 0 : options.predecessorImageId) || images[0].imageId;
   const studyData = metadata.get(MetadataModules.STUDY_DATA, studyImageId);
   const datasets = images.map(image => {
-    const {
-      imageId
-    } = image;
+    const imageId = image.imageId;
     const seriesData = metadata.get(MetadataModules.SERIES_DATA, imageId);
     const imageData = metadata.get(MetadataModules.IMAGE_DATA, imageId);
     return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, studyData), seriesData), imageData), {}, {
@@ -49,9 +41,7 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
   }
   const normalizer = new SEGImageNormalizer(datasets);
   normalizer.normalize();
-  const {
-    dataset: multiframe
-  } = normalizer;
+  const multiframe = normalizer.dataset;
   if (!multiframe) {
     throw new Error('Failed to normalize the multiframe dataset, the data is not multi-frame.');
   }

package/dist/esm/adapters/Cornerstone3D/Segmentation/generateToolState.js

@@ -8,10 +8,9 @@ function generateToolState(imageIds, arrayBuffer, metadataProvider) {
   return generateToolState$1(imageIds, arrayBuffer, metadataProvider, skipOverlapping, tolerance, cs3dVersion);
 }
 function createFromDICOMSegBuffer(referencedImageIds, arrayBuffer, _ref) {
-  let {
-    metadataProvider,
-    tolerance = 1e-3
-  } = _ref;
+  let metadataProvider = _ref.metadataProvider,
+    _ref$tolerance = _ref.tolerance,
+    tolerance = _ref$tolerance === void 0 ? 1e-3 : _ref$tolerance;
   return createLabelmapsFromBufferInternal(referencedImageIds, arrayBuffer, metadataProvider, {
     tolerance
   });

package/dist/esm/adapters/Cornerstone3D/Segmentation/index.d.ts

@@ -1,4 +1,4 @@
-import { generateSegmentation } from "./generateSegmentation";
-import { generateLabelMaps2DFrom3D } from "./generateLabelMaps2DFrom3D";
-import { generateToolState, createFromDICOMSegBuffer } from "./generateToolState";
-export { generateLabelMaps2DFrom3D, generateSegmentation, generateToolState, createFromDICOMSegBuffer };
+import { generateSegmentation } from './generateSegmentation';
+import { generateLabelMaps2DFrom3D } from './generateLabelMaps2DFrom3D';
+import { generateToolState, createFromDICOMSegBuffer } from './generateToolState';
+export { generateLabelMaps2DFrom3D, generateSegmentation, generateToolState, createFromDICOMSegBuffer, };