@cornerstonejs/adapters 4.22.6 → 4.22.8

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

@@ -2,24 +2,22 @@ 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 { toScoord } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 
 var _Angle;
 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 {
-  CobbAngle: TID300CobbAngle
-} = utilities.TID300;
+const TID300CobbAngle = utilities.TID300.CobbAngle;
 class Angle extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    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)]: {
         angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
@@ -37,19 +35,14 @@ class Angle extends BaseAdapter3D {
   static getTID300RepresentationArguments(tool) {
     var _cachedStats;
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const _data$cachedStats = data.cachedStats,
+      cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
+      handles = data.handles;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId

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

@@ -3,42 +3,35 @@ import { utilities } from 'dcmjs';
 import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
+import '../helpers/downloadDICOMData.js';
 import { toScoord } from '../helpers/toScoordType.js';
+import '../helpers/scoordToWorld.js';
 
 var _ArrowAnnotate;
 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 {
-  ArrowAnnotate: TID300ArrowAnnotate
-} = utilities.TID300;
-const {
-  imageToWorldCoords
-} = utilities$1;
+const TID300ArrowAnnotate = utilities.TID300.ArrowAnnotate;
+const imageToWorldCoords = utilities$1.imageToWorldCoords;
 class ArrowAnnotate extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, _trackingIdentifier) {
-    const {
-      state,
-      SCOORDGroup,
-      worldCoords,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.state,
+      SCOORDGroup = _MeasurementReport$ge.SCOORDGroup,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     const text = state.annotation.data.label;
     if (worldCoords.length === 1 && SCOORDGroup) {
       const imagePixelModule = metadata.get('imagePixelModule', referencedImageId);
       let xOffset = 10;
       let yOffset = 10;
       if (imagePixelModule) {
-        const {
-          columns,
-          rows
-        } = imagePixelModule;
+        const columns = imagePixelModule.columns,
+          rows = imagePixelModule.rows;
         xOffset = columns / 10;
         yOffset = rows / 10;
       }
-      const {
-        GraphicData
-      } = SCOORDGroup;
+      const GraphicData = SCOORDGroup.GraphicData;
       const secondPoint = imageToWorldCoords(referencedImageId, [GraphicData[0] + xOffset, GraphicData[1] + yOffset]);
       worldCoords.push(secondPoint);
     }
@@ -54,25 +47,18 @@ class ArrowAnnotate extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      metadata,
-      findingSites
-    } = tool;
-    const {
-      finding
-    } = tool;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      metadata = tool.metadata,
+      findingSites = tool.findingSites;
+    const finding = tool.finding;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
-    const {
-      points,
-      arrowFirst
-    } = data.handles;
+    const _data$handles = data.handles,
+      points = _data$handles.points,
+      arrowFirst = _data$handles.arrowFirst;
     const point = arrowFirst ? points[0] : points[1];
     const point2 = arrowFirst ? points[1] : points[0];
     const pointImage = toScoord(scoordProps, point);

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

@@ -1,8 +1,8 @@
 import CORNERSTONE_3D_TAG from './cornerstone3DTag.js';
 import MeasurementReport from './MeasurementReport.js';
-import 'dcmjs';
+import '../helpers/downloadDICOMData.js';
 import { toScoords } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 
 class BaseAdapter3D {
   static registerType() {
@@ -34,13 +34,9 @@ class BaseAdapter3D {
     return items[offset];
   }
   static getGraphicCode(graphicItem) {
-    const {
-      ConceptNameCodeSequence: conceptNameItem
-    } = graphicItem;
-    const {
-      CodeValue: graphicValue,
-      CodingSchemeDesignator: graphicDesignator
-    } = conceptNameItem;
+    const conceptNameItem = graphicItem.ConceptNameCodeSequence;
+    const graphicValue = conceptNameItem.CodeValue,
+      graphicDesignator = conceptNameItem.CodingSchemeDesignator;
     return "".concat(graphicDesignator, ":").concat(graphicValue);
   }
   static getGraphicType(graphicItem) {
@@ -88,10 +84,9 @@ class BaseAdapter3D {
     return trackingIdentifier.startsWith(this.trackingIdentifierTextValue);
   }
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, trackingIdentifier) {
-    const {
-      defaultState: state,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.defaultState,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     state.annotation.data = {
       cachedStats: {},
       frameNumber: ReferencedFrameNumber,
@@ -101,16 +96,10 @@ class BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      metadata
-    } = tool;
-    const {
-      finding,
-      findingSites
-    } = tool;
-    const {
-      referencedImageId
-    } = metadata;
+    const metadata = tool.metadata;
+    const finding = tool.finding,
+      findingSites = tool.findingSites;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId

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

@@ -2,6 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import { toArray } from '../helpers/toArray.js';
+import '../helpers/downloadDICOMData.js';
 import { toScoord } from '../helpers/toScoordType.js';
 import { scoordToWorld } from '../helpers/scoordToWorld.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
@@ -9,22 +10,17 @@ import BaseAdapter3D from './BaseAdapter3D.js';
 var _Bidirectional;
 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 {
-  Bidirectional: TID300Bidirectional
-} = utilities.TID300;
+const TID300Bidirectional = utilities.TID300.Bidirectional;
 const LONG_AXIS = 'Long Axis';
 const SHORT_AXIS = 'Short Axis';
 class Bidirectional extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    const {
-      state,
-      scoordArgs,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
-    const {
-      ContentSequence
-    } = MeasurementGroup;
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType),
+      state = _MeasurementReport$ge.state,
+      scoordArgs = _MeasurementReport$ge.scoordArgs,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
+    const ContentSequence = MeasurementGroup.ContentSequence;
     const longAxisNUMGroup = toArray(ContentSequence).find(group => group.ConceptNameCodeSequence.CodeMeaning === LONG_AXIS);
     const shortAxisNUMGroup = toArray(ContentSequence).find(group => group.ConceptNameCodeSequence.CodeMeaning === SHORT_AXIS);
     const longAxisScoordGroup = toArray(longAxisNUMGroup.ContentSequence).find(group => group.ValueType === 'SCOORD3D' || group.ValueType === 'SCOORD');
@@ -52,26 +48,19 @@ class Bidirectional extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const _data$cachedStats = data.cachedStats,
+      cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
+      handles = data.handles;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
-    const {
-      points
-    } = handles;
+    const points = handles.points;
     const firstPointPairs = [points[0], points[1]];
     const secondPointPairs = [points[2], points[3]];
     const firstPointPairsDistance = Math.sqrt(Math.pow(firstPointPairs[0][0] - firstPointPairs[1][0], 2) + Math.pow(firstPointPairs[0][1] - firstPointPairs[1][1], 2) + Math.pow(firstPointPairs[0][2] - firstPointPairs[1][2], 2));
@@ -89,11 +78,10 @@ class Bidirectional extends BaseAdapter3D {
     const longAxisEndImage = toScoord(scoordProps, shortAxisPoints[1]);
     const shortAxisStartImage = toScoord(scoordProps, longAxisPoints[0]);
     const shortAxisEndImage = toScoord(scoordProps, longAxisPoints[1]);
-    const {
-      length,
-      width,
-      unit
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+      length = _ref.length,
+      width = _ref.width,
+      unit = _ref.unit;
     return {
       longAxis: {
         point1: longAxisStartImage,

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

@@ -2,25 +2,23 @@ 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 { toScoord } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _CircleROI;
 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 {
-  Circle: TID300Circle
-} = utilities.TID300;
+const TID300Circle = utilities.TID300.Circle;
 class CircleROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    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 referencedSOPInstanceUID = state.sopInstanceUid;
     const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
     const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
@@ -43,36 +41,30 @@ class CircleROI extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const _data$cachedStats = data.cachedStats,
+      cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
+      handles = data.handles;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
     const center = toScoord(scoordProps, handles.points[0]);
     const end = toScoord(scoordProps, handles.points[1]);
-    const {
-      area,
-      radius,
-      max,
-      min,
-      stdDev,
-      mean,
-      modalityUnit,
-      radiusUnit,
-      areaUnit
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+      area = _ref.area,
+      radius = _ref.radius,
+      max = _ref.max,
+      min = _ref.min,
+      stdDev = _ref.stdDev,
+      mean = _ref.mean,
+      modalityUnit = _ref.modalityUnit,
+      radiusUnit = _ref.radiusUnit,
+      areaUnit = _ref.areaUnit;
     const perimeter = 2 * Math.PI * radius;
     return {
       area,

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

@@ -1,25 +1,24 @@
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 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 _CobbAngle;
 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 {
-  CobbAngle: TID300CobbAngle
-} = utilities.TID300;
+const TID300CobbAngle = utilities.TID300.CobbAngle;
 class CobbAngle extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    const {
-      state,
-      NUMGroup,
-      referencedImageId,
-      worldCoords,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CobbAngle.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CobbAngle.toolType),
+      state = _MeasurementReport$ge.state,
+      NUMGroup = _MeasurementReport$ge.NUMGroup,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     state.annotation.data = _objectSpread(_objectSpread({}, state.annotation.data), {}, {
       handles: _objectSpread(_objectSpread({}, state.annotation.data.handles), {}, {
         points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]]
@@ -37,28 +36,26 @@ class CobbAngle extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const {
-      referencedImageId
-    } = metadata;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const _data$cachedStats = data.cachedStats,
+      cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
+      handles = data.handles;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
     };
     const points = toScoords(scoordProps, handles.points);
-    const [point1, point2, point3, point4] = points;
-    const {
-      angle
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _points = _slicedToArray(points, 4),
+      point1 = _points[0],
+      point2 = _points[1],
+      point3 = _points[2],
+      point4 = _points[3];
+    const _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+      angle = _ref.angle;
     return {
       point1,
       point2,

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

@@ -1,23 +1,18 @@
-import { utilities, sr } from 'dcmjs';
+import { sr, utilities } from 'dcmjs';
 import { CONTROL_POINTS_CODE, SPLINE_TYPE_CODE } from './constants/index.js';
 
-const {
-  valueTypes
-} = sr;
-const {
-  Polyline: TID300Polyline
-} = utilities.TID300;
+const valueTypes = sr.valueTypes;
+const TID300Polyline = utilities.TID300.Polyline;
 class ControlPointPolyline extends TID300Polyline {
   contentItem() {
     const contentEntries = super.contentItem();
     const self = this;
-    const {
-      controlPoints,
-      use3DSpatialCoordinates,
-      ReferencedSOPSequence,
-      ReferencedFrameOfReferenceUID,
-      use3DSpatialCoordinates: is3DMeasurement
-    } = self.props;
+    const _self$props = self.props,
+      controlPoints = _self$props.controlPoints,
+      use3DSpatialCoordinates = _self$props.use3DSpatialCoordinates,
+      ReferencedSOPSequence = _self$props.ReferencedSOPSequence,
+      ReferencedFrameOfReferenceUID = _self$props.ReferencedFrameOfReferenceUID,
+      is3DMeasurement = _self$props.use3DSpatialCoordinates;
     if (!(controlPoints !== null && controlPoints !== void 0 && controlPoints.length)) {
       return contentEntries;
     }
@@ -58,9 +53,7 @@ class ControlPointPolyline extends TID300Polyline {
         ReferencedSOPSequence
       }]
     };
-    const {
-      splineType
-    } = self.props;
+    const splineType = self.props.splineType;
     const entries = contentEntries;
     const numEntry = entries.find(e => e.ValueType === 'NUM');
     if (numEntry) {

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

@@ -2,25 +2,23 @@ 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 { toScoord } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _EllipticalROI;
 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 {
-  Ellipse: TID300Ellipse
-} = utilities.TID300;
+const TID300Ellipse = utilities.TID300.Ellipse;
 class EllipticalROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
-    const {
-      state,
-      NUMGroup,
-      worldCoords,
-      referencedImageId,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType);
+    const _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType),
+      state = _MeasurementReport$ge.state,
+      NUMGroup = _MeasurementReport$ge.NUMGroup,
+      worldCoords = _MeasurementReport$ge.worldCoords,
+      referencedImageId = _MeasurementReport$ge.referencedImageId,
+      ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
     const referencedSOPInstanceUID = state.sopInstanceUid;
     const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
     const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
@@ -39,20 +37,15 @@ class EllipticalROI extends BaseAdapter3D {
   }
   static getTID300RepresentationArguments(tool) {
     let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
+    const data = tool.data,
+      finding = tool.finding,
+      findingSites = tool.findingSites,
+      metadata = tool.metadata;
+    const _data$cachedStats = data.cachedStats,
+      cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
+      handles = data.handles;
     const rotation = data.initialRotation || 0;
-    const {
-      referencedImageId
-    } = metadata;
+    const referencedImageId = metadata.referencedImageId;
     const scoordProps = {
       is3DMeasurement,
       referencedImageId
@@ -77,15 +70,14 @@ class EllipticalROI extends BaseAdapter3D {
     } else {
       points.push(left, right, top, bottom);
     }
-    const {
-      area,
-      max,
-      min,
-      mean,
-      stdDev,
-      modalityUnit,
-      areaUnit
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+      area = _ref.area,
+      max = _ref.max,
+      min = _ref.min,
+      mean = _ref.mean,
+      stdDev = _ref.stdDev,
+      modalityUnit = _ref.modalityUnit,
+      areaUnit = _ref.areaUnit;
     const convertedPoints = points.map(point => toScoord(scoordProps, point));
     return {
       area,

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

@@ -2,23 +2,17 @@ import { utilities } from 'dcmjs';
 import Probe from './Probe.js';
 
 var _KeyImage;
-const {
-  Point: TID300Point
-} = utilities.TID300;
+const TID300Point = utilities.TID300.Point;
 class KeyImage extends Probe {
   static getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, trackingIdentifier) {
     const baseData = super.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, trackingIdentifier);
-    const {
-      data
-    } = baseData.annotation;
+    const data = baseData.annotation.data;
     data.isPoint = trackingIdentifier.indexOf('Point') !== -1;
     return baseData;
   }
   static getTID300RepresentationArguments(tool) {
     const tid300Arguments = super.getTID300RepresentationArguments(tool);
-    const {
-      data
-    } = tool;
+    const data = tool.data;
     if (data.isPoint) {
       if (data.seriesLevel) {
         tid300Arguments.trackingIdentifierTextValue = this.trackingSeriesPointIdentifier;