@cornerstonejs/adapters 5.0.0-beta.1 → 5.0.0

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

@@ -1,7 +1,8 @@
-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 { 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,26 +10,21 @@ 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 LONG_AXIS = "Long Axis";
-const SHORT_AXIS = "Short Axis";
+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");
-    const shortAxisScoordGroup = toArray(shortAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD3D" || group.ValueType === "SCOORD");
+    const longAxisScoordGroup = toArray(longAxisNUMGroup.ContentSequence).find(group => group.ValueType === 'SCOORD3D' || group.ValueType === 'SCOORD');
+    const shortAxisScoordGroup = toArray(shortAxisNUMGroup.ContentSequence).find(group => group.ValueType === 'SCOORD3D' || group.ValueType === 'SCOORD');
     const worldCoords = [];
     worldCoords.push(...scoordToWorld(scoordArgs, longAxisScoordGroup));
     worldCoords.push(...scoordToWorld(scoordArgs, shortAxisScoordGroup));
@@ -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,
@@ -116,7 +104,7 @@ class Bidirectional extends BaseAdapter3D {
 }
 _Bidirectional = Bidirectional;
 (() => {
-  _Bidirectional.init("Bidirectional", TID300Bidirectional);
+  _Bidirectional.init('Bidirectional', TID300Bidirectional);
   _Bidirectional.registerLegacy();
 })();
 

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

@@ -1,4 +1,4 @@
-import BaseAdapter3D from "./BaseAdapter3D";
+import BaseAdapter3D from './BaseAdapter3D';
 declare class CircleROI extends BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any): {
         description?: string;

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

@@ -1,26 +1,24 @@
-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 { 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,
@@ -96,7 +88,7 @@ class CircleROI extends BaseAdapter3D {
 }
 _CircleROI = CircleROI;
 (() => {
-  _CircleROI.init("CircleROI", TID300Circle);
+  _CircleROI.init('CircleROI', TID300Circle);
   _CircleROI.registerLegacy();
 })();
 

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

@@ -1,4 +1,4 @@
-import BaseAdapter3D from "./BaseAdapter3D";
+import BaseAdapter3D from './BaseAdapter3D';
 declare class CobbAngle extends BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any): {
         description?: string;

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

@@ -1,25 +1,24 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
+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,
@@ -75,7 +72,7 @@ class CobbAngle extends BaseAdapter3D {
 }
 _CobbAngle = CobbAngle;
 (() => {
-  _CobbAngle.init("CobbAngle", TID300CobbAngle);
+  _CobbAngle.init('CobbAngle', TID300CobbAngle);
   _CobbAngle.registerLegacy();
 })();
 

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

@@ -0,0 +1,5 @@
+declare const TID300Polyline: any;
+export default class ControlPointPolyline extends TID300Polyline {
+    contentItem(): any;
+}
+export {};

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

@@ -0,0 +1,85 @@
+import { sr, utilities } from 'dcmjs';
+import { CONTROL_POINTS_CODE, SPLINE_TYPE_CODE } from './constants/index.js';
+
+const valueTypes = sr.valueTypes;
+const TID300Polyline = utilities.TID300.Polyline;
+class ControlPointPolyline extends TID300Polyline {
+  contentItem() {
+    const contentEntries = super.contentItem();
+    const self = this;
+    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;
+    }
+    const GraphicData = self.flattenPoints({
+      points: controlPoints,
+      use3DSpatialCoordinates
+    });
+    const GraphicType = valueTypes.GraphicTypes.MULTIPOINT;
+    const scoordPlain = is3DMeasurement ? {
+      RelationshipType: valueTypes.RelationshipTypes.CONTAINS,
+      ValueType: 'SCOORD3D',
+      ConceptNameCodeSequence: [{
+        CodeValue: CONTROL_POINTS_CODE.value,
+        CodingSchemeDesignator: CONTROL_POINTS_CODE.schemeDesignator,
+        CodeMeaning: CONTROL_POINTS_CODE.meaning
+      }],
+      GraphicType,
+      GraphicData,
+      ReferencedFrameOfReferenceUID,
+      ContentSequence: [{
+        RelationshipType: valueTypes.RelationshipTypes.SELECTED_FROM,
+        ValueType: valueTypes.ValueTypes.IMAGE,
+        ReferencedSOPSequence
+      }]
+    } : {
+      RelationshipType: valueTypes.RelationshipTypes.CONTAINS,
+      ValueType: 'SCOORD',
+      ConceptNameCodeSequence: [{
+        CodeValue: CONTROL_POINTS_CODE.value,
+        CodingSchemeDesignator: CONTROL_POINTS_CODE.schemeDesignator,
+        CodeMeaning: CONTROL_POINTS_CODE.meaning
+      }],
+      GraphicType,
+      GraphicData,
+      ContentSequence: [{
+        RelationshipType: valueTypes.RelationshipTypes.SELECTED_FROM,
+        ValueType: valueTypes.ValueTypes.IMAGE,
+        ReferencedSOPSequence
+      }]
+    };
+    const splineType = self.props.splineType;
+    const entries = contentEntries;
+    const numEntry = entries.find(e => e.ValueType === 'NUM');
+    if (numEntry) {
+      const inner = numEntry.ContentSequence;
+      const innerArray = Array.isArray(inner) ? inner : inner ? [inner] : [];
+      numEntry.ContentSequence = [...innerArray, scoordPlain];
+    } else {
+      entries.push(scoordPlain);
+    }
+    if (splineType) {
+      const splineTypeObsContext = {
+        RelationshipType: valueTypes.RelationshipTypes.HAS_OBS_CONTEXT,
+        ValueType: 'TEXT',
+        ConceptNameCodeSequence: {
+          CodeValue: SPLINE_TYPE_CODE.value,
+          CodingSchemeDesignator: SPLINE_TYPE_CODE.schemeDesignator,
+          CodeMeaning: SPLINE_TYPE_CODE.meaning
+        },
+        TextValue: splineType
+      };
+      const hasObsContextIndex = entries.findIndex(e => e.RelationshipType === valueTypes.RelationshipTypes.HAS_OBS_CONTEXT);
+      const insertIndex = hasObsContextIndex >= 0 ? hasObsContextIndex + 2 : 2;
+      entries.splice(insertIndex, 0, splineTypeObsContext);
+    }
+    return entries;
+  }
+}
+
+export { ControlPointPolyline as default };

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

@@ -1,4 +1,4 @@
-import BaseAdapter3D from "./BaseAdapter3D";
+import BaseAdapter3D from './BaseAdapter3D';
 declare class EllipticalROI extends BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any): {
         description?: string;

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

@@ -1,26 +1,24 @@
-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 { 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,
@@ -105,6 +97,6 @@ class EllipticalROI extends BaseAdapter3D {
   }
 }
 _EllipticalROI = EllipticalROI;
-_EllipticalROI.init("EllipticalROI", TID300Ellipse);
+_EllipticalROI.init('EllipticalROI', TID300Ellipse);
 
 export { EllipticalROI as default };

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

@@ -1,4 +1,4 @@
-import Probe from "./Probe";
+import Probe from './Probe';
 export default class KeyImage extends Probe {
     static trackingSeriesIdentifier: string;
     static trackingPointIdentifier: string;

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;
-    data.isPoint = trackingIdentifier.indexOf("Point") !== -1;
+    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;
@@ -39,7 +33,7 @@ class KeyImage extends Probe {
   }
 }
 _KeyImage = KeyImage;
-_KeyImage.init("KeyImage", TID300Point, {
+_KeyImage.init('KeyImage', TID300Point, {
   parentType: Probe.toolType
 });
 _KeyImage.trackingSeriesIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":Series");

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

@@ -1,10 +1,12 @@
-import type { Types } from "@cornerstonejs/tools";
+import type { Types } from '@cornerstonejs/tools';
 export default class LabelData {
     protected tid300Item: any;
     protected annotation: Types.Annotation;
     ReferencedSOPSequence: any;
     constructor(tid300Item: any, annotation: Types.Annotation);
     contentItem(): any;
+    protected fixScoordRelationships(contentEntries: unknown[]): void;
+    protected normalizeContentSequence(contentSeq: unknown): Array<Record<string, unknown>>;
     filterCornerstoneFreeText(contentEntries: any): void;
     createQualitativeLabel(label: string): any;
     createQualitativeLabelPosition(annotation: Types.Annotation): any;