@cornerstonejs/adapters 4.22.7 → 4.22.9

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

@@ -1,17 +1,13 @@
 import { COMMENT_CODE, TEXT_ANNOTATION_POSITION } from './constants/index.js';
-import dcmjs from 'dcmjs';
+import '../helpers/downloadDICOMData.js';
 import { toScoord } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
+import dcmjs from 'dcmjs';
 
-const {
-  sr: {
-    valueTypes,
-    coding
-  },
-  adapters: {
-    Cornerstone3D
-  }
-} = dcmjs;
+const _dcmjs$sr = dcmjs.sr,
+  valueTypes = _dcmjs$sr.valueTypes,
+  coding = _dcmjs$sr.coding,
+  Cornerstone3D = dcmjs.adapters.Cornerstone3D;
 class LabelData {
   constructor(tid300Item, annotation) {
     this.tid300Item = tid300Item;
@@ -22,10 +18,9 @@ class LabelData {
     var _handles$textBox;
     const contentEntries = this.tid300Item.contentItem();
     this.fixScoordRelationships(contentEntries);
-    const {
-      label,
-      handles
-    } = this.annotation.data;
+    const _this$annotation$data = this.annotation.data,
+      label = _this$annotation$data.label,
+      handles = _this$annotation$data.handles;
     if (label) {
       contentEntries.push(this.createQualitativeLabel(label));
       this.filterCornerstoneFreeText(contentEntries);
@@ -54,9 +49,7 @@ class LabelData {
     return [contentSeq];
   }
   filterCornerstoneFreeText(contentEntries) {
-    const {
-      codeValues
-    } = Cornerstone3D.CodeScheme;
+    const codeValues = Cornerstone3D.CodeScheme.codeValues;
     const freeTextCodes = [codeValues.FREE_TEXT_CODE_VALUE, codeValues.CORNERSTONEFREETEXT];
     for (let i = 0; i < contentEntries.length; i++) {
       const group = contentEntries[i];
@@ -82,22 +75,18 @@ class LabelData {
     });
   }
   createQualitativeLabelPosition(annotation) {
-    const {
-      textBox
-    } = annotation.data.handles;
-    const {
-      referencedImageId,
-      FrameOfReferenceUID: frameOfReferenceUID
-    } = annotation.metadata;
+    const textBox = annotation.data.handles.textBox;
+    const _annotation$metadata = annotation.metadata,
+      referencedImageId = _annotation$metadata.referencedImageId,
+      frameOfReferenceUID = _annotation$metadata.FrameOfReferenceUID;
     const is3DMeasurement = !referencedImageId;
-    const {
-      x,
-      y,
-      z
-    } = toScoord({
-      is3DMeasurement,
-      referencedImageId
-    }, textBox.worldPosition);
+    const _toScoord = toScoord({
+        is3DMeasurement,
+        referencedImageId
+      }, textBox.worldPosition),
+      x = _toScoord.x,
+      y = _toScoord.y,
+      z = _toScoord.z;
     const graphicType = valueTypes.GraphicTypes.POINT;
     const relationshipType = valueTypes.RelationshipTypes.CONTAINS;
     const name = new coding.CodedConcept(TEXT_ANNOTATION_POSITION);

package/dist/esm/adapters/Cornerstone3D/Length.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';
 
 var _Length;
 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 {
-  Length: TID300Length
-} = utilities.TID300;
+const TID300Length = utilities.TID300.Length;
 const LENGTH = 'Length';
 class Length 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)]: {
         length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
@@ -39,28 +37,22 @@ class Length 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 point1 = toScoord(scoordProps, handles.points[0]);
     const point2 = toScoord(scoordProps, handles.points[1]);
-    const {
-      length: distance
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    const _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+      distance = _ref.length;
     return {
       point1,
       point2,

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

@@ -1,11 +1,13 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { utilities as utilities$1, derivations, normalizers, data } from 'dcmjs';
-import { utilities, cache, Enums } from '@cornerstonejs/core';
+import { utilities, derivations, normalizers, data } from 'dcmjs';
+import { Enums, utilities as utilities$1, cache } from '@cornerstonejs/core';
 import CORNERSTONE_3D_TAG from './cornerstone3DTag.js';
 import { toArray } from '../helpers/toArray.js';
 import { codeMeaningEquals } from '../helpers/codeMeaningEquals.js';
+import '../helpers/downloadDICOMData.js';
 import { copyStudyTags } from '../helpers/copyStudyTags.js';
 import { copySeriesTags } from '../helpers/copySeriesTags.js';
+import '../helpers/toScoordType.js';
 import { scoordToWorld } from '../helpers/scoordToWorld.js';
 import { toPoint3 } from '../helpers/toPoint3.js';
 import CodingScheme from './CodingScheme.js';
@@ -15,26 +17,14 @@ import LabelData from './LabelData.js';
 var _MeasurementReport;
 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 {
-  TID1500,
-  addAccessors
-} = utilities$1;
-const {
-  StructuredReport
-} = derivations;
-const {
-  Normalizer
-} = normalizers;
-const {
-  TID1500MeasurementReport,
-  TID1501MeasurementGroup
-} = TID1500;
-const {
-  DicomMetaDictionary
-} = data;
+const MetadataModules = Enums.MetadataModules;
+const TID1500 = utilities.TID1500,
+  addAccessors = utilities.addAccessors;
+const StructuredReport = derivations.StructuredReport;
+const Normalizer = normalizers.Normalizer;
+const TID1500MeasurementReport = TID1500.TID1500MeasurementReport,
+  TID1501MeasurementGroup = TID1500.TID1501MeasurementGroup;
+const DicomMetaDictionary = data.DicomMetaDictionary;
 const FINDING = {
   CodingSchemeDesignator: 'DCM',
   CodeValue: '121071'
@@ -90,11 +80,10 @@ class MeasurementReport {
     return new TID1501MeasurementGroup(Measurements);
   }
   static getCornerstoneLabelFromDefaultState(defaultState) {
-    const {
-      findingSites = [],
-      finding,
-      commentGroup
-    } = defaultState;
+    const _defaultState$finding = defaultState.findingSites,
+      findingSites = _defaultState$finding === void 0 ? [] : _defaultState$finding,
+      finding = defaultState.finding,
+      commentGroup = defaultState.commentGroup;
     if (commentGroup !== null && commentGroup !== void 0 && commentGroup.TextValue) {
       return commentGroup.TextValue;
     }
@@ -111,19 +100,14 @@ class MeasurementReport {
     return metaSRAnnotation;
   }
   static processSCOORDGroup(_ref) {
-    let {
-      SCOORDGroup,
-      toolType,
-      sopInstanceUIDToImageIdMap,
-      metadata
-    } = _ref;
-    const {
-      ReferencedSOPSequence
-    } = SCOORDGroup.ContentSequence;
-    const {
-      ReferencedSOPInstanceUID,
-      ReferencedFrameNumber = 1
-    } = ReferencedSOPSequence;
+    let SCOORDGroup = _ref.SCOORDGroup,
+      toolType = _ref.toolType,
+      sopInstanceUIDToImageIdMap = _ref.sopInstanceUIDToImageIdMap,
+      metadata = _ref.metadata;
+    const ReferencedSOPSequence = SCOORDGroup.ContentSequence.ReferencedSOPSequence;
+    const ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
+      _ReferencedSOPSequenc = ReferencedSOPSequence.ReferencedFrameNumber,
+      ReferencedFrameNumber = _ReferencedSOPSequenc === void 0 ? 1 : _ReferencedSOPSequenc;
     const referencedImageId = sopInstanceUIDToImageIdMap["".concat(ReferencedSOPInstanceUID, ":").concat(ReferencedFrameNumber)];
     const imagePlaneModule = metadata.get('imagePlaneModule', referencedImageId);
     const annotationUID = DicomMetaDictionary.uid();
@@ -158,10 +142,8 @@ class MeasurementReport {
     };
   }
   static processSCOORD3DGroup(_ref2) {
-    let {
-      SCOORD3DGroup,
-      toolType
-    } = _ref2;
+    let SCOORD3DGroup = _ref2.SCOORD3DGroup,
+      toolType = _ref2.toolType;
     const annotationUID = DicomMetaDictionary.uid();
     const toolData = {
       SCOORD3DGroup,
@@ -187,17 +169,15 @@ class MeasurementReport {
         }
       }
     };
-    utilities.updatePlaneRestriction(toPoint3(SCOORD3DGroup.GraphicData), toolData.state.annotation.metadata);
+    utilities$1.updatePlaneRestriction(toPoint3(SCOORD3DGroup.GraphicData), toolData.state.annotation.metadata);
     return toolData;
   }
   static getSpatialCoordinatesState(_ref3) {
     var _contentSequenceArr$f, _contentSequenceArr$f2;
-    let {
-      NUMGroup,
-      sopInstanceUIDToImageIdMap,
-      metadata,
-      toolType
-    } = _ref3;
+    let NUMGroup = _ref3.NUMGroup,
+      sopInstanceUIDToImageIdMap = _ref3.sopInstanceUIDToImageIdMap,
+      metadata = _ref3.metadata,
+      toolType = _ref3.toolType;
     const contentSequenceArr = toArray(NUMGroup.ContentSequence);
     const SCOORDGroup = (_contentSequenceArr$f = contentSequenceArr.find(group => group.ValueType === 'SCOORD' && !isSecondaryScoordGroup(group))) !== null && _contentSequenceArr$f !== void 0 ? _contentSequenceArr$f : contentSequenceArr.find(group => group.ValueType === 'SCOORD');
     const SCOORD3DGroup = (_contentSequenceArr$f2 = contentSequenceArr.find(group => group.ValueType === 'SCOORD3D' && !isSecondaryScoordGroup(group))) !== null && _contentSequenceArr$f2 !== void 0 ? _contentSequenceArr$f2 : contentSequenceArr.find(group => group.ValueType === 'SCOORD3D');
@@ -216,33 +196,30 @@ class MeasurementReport {
     return result;
   }
   static processSpatialCoordinatesGroup(_ref4) {
-    let {
-      NUMGroup,
-      sopInstanceUIDToImageIdMap,
-      metadata,
-      findingGroup,
-      findingSiteGroups,
-      commentGroup,
-      commentPositionGroup,
-      controlPointsGroup,
-      toolType
-    } = _ref4;
-    const {
-      state,
-      SCOORDGroup,
-      ReferencedSOPSequence,
-      ReferencedSOPInstanceUID,
-      ReferencedFrameNumber,
-      SCOORD3DGroup,
-      FrameOfReferenceUID,
-      referencedImageId,
-      textBoxPosition
-    } = this.getSpatialCoordinatesState({
-      NUMGroup,
-      sopInstanceUIDToImageIdMap,
-      metadata,
-      toolType
-    });
+    let NUMGroup = _ref4.NUMGroup,
+      sopInstanceUIDToImageIdMap = _ref4.sopInstanceUIDToImageIdMap,
+      metadata = _ref4.metadata,
+      findingGroup = _ref4.findingGroup,
+      findingSiteGroups = _ref4.findingSiteGroups,
+      commentGroup = _ref4.commentGroup,
+      commentPositionGroup = _ref4.commentPositionGroup,
+      controlPointsGroup = _ref4.controlPointsGroup,
+      toolType = _ref4.toolType;
+    const _this$getSpatialCoord = this.getSpatialCoordinatesState({
+        NUMGroup,
+        sopInstanceUIDToImageIdMap,
+        metadata,
+        toolType
+      }),
+      state = _this$getSpatialCoord.state,
+      SCOORDGroup = _this$getSpatialCoord.SCOORDGroup,
+      ReferencedSOPSequence = _this$getSpatialCoord.ReferencedSOPSequence,
+      ReferencedSOPInstanceUID = _this$getSpatialCoord.ReferencedSOPInstanceUID,
+      ReferencedFrameNumber = _this$getSpatialCoord.ReferencedFrameNumber,
+      SCOORD3DGroup = _this$getSpatialCoord.SCOORD3DGroup,
+      FrameOfReferenceUID = _this$getSpatialCoord.FrameOfReferenceUID,
+      referencedImageId = _this$getSpatialCoord.referencedImageId,
+      textBoxPosition = _this$getSpatialCoord.textBoxPosition;
     const finding = findingGroup ? addAccessors(findingGroup.ConceptCodeSequence) : undefined;
     const findingSites = findingSiteGroups.map(fsg => {
       return addAccessors(fsg.ConceptCodeSequence);
@@ -289,9 +266,7 @@ class MeasurementReport {
     };
   }
   static getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, toolType) {
-    const {
-      ContentSequence
-    } = MeasurementGroup;
+    const ContentSequence = MeasurementGroup.ContentSequence;
     const contentSequenceArr = toArray(ContentSequence);
     const findingGroup = contentSequenceArr.find(group => this.codeValueMatch(group, FINDING));
     const commentGroup = contentSequenceArr.find(group => this.codeValueMatch(group, COMMENT));
@@ -316,9 +291,7 @@ class MeasurementReport {
       controlPointsGroup,
       toolType
     });
-    const {
-      referencedImageId
-    } = spatialGroup.state.annotation.metadata;
+    const referencedImageId = spatialGroup.state.annotation.metadata.referencedImageId;
     const is3DMeasurement = !!spatialGroup.SCOORD3DGroup;
     const scoordArgs = {
       referencedImageId,
@@ -334,27 +307,21 @@ class MeasurementReport {
     });
   }
   static generateReferencedSOPSequence(_ref5) {
-    let {
-      toolData,
-      toolTypes,
-      metadataProvider,
-      imageId,
-      sopInstanceUIDsToSeriesInstanceUIDMap,
-      derivationSourceDatasets
-    } = _ref5;
+    let toolData = _ref5.toolData,
+      toolTypes = _ref5.toolTypes,
+      metadataProvider = _ref5.metadataProvider,
+      imageId = _ref5.imageId,
+      sopInstanceUIDsToSeriesInstanceUIDMap = _ref5.sopInstanceUIDsToSeriesInstanceUIDMap,
+      derivationSourceDatasets = _ref5.derivationSourceDatasets;
     const effectiveImageId = imageId === NO_IMAGE_ID ? this.getImageIdFromVolume({
       toolData,
       toolTypes
     }) : imageId;
     const sopCommonModule = metadataProvider.get('sopCommonModule', effectiveImageId);
     const instance = metadataProvider.get('instance', effectiveImageId);
-    const {
-      sopInstanceUID,
-      sopClassUID
-    } = sopCommonModule;
-    const {
-      SeriesInstanceUID: seriesInstanceUID
-    } = instance;
+    const sopInstanceUID = sopCommonModule.sopInstanceUID,
+      sopClassUID = sopCommonModule.sopClassUID;
+    const seriesInstanceUID = instance.SeriesInstanceUID;
     sopInstanceUIDsToSeriesInstanceUIDMap[sopInstanceUID] = seriesInstanceUID;
     if (!derivationSourceDatasets.find(dsd => dsd.SeriesInstanceUID === seriesInstanceUID)) {
       const derivationSourceDataset = MeasurementReport.generateDerivationSourceDataset(instance);
@@ -373,10 +340,8 @@ class MeasurementReport {
   }
   static getImageIdFromVolume(_ref6) {
     var _toolData$toolTypes$, _referenceToolData$me;
-    let {
-      toolData,
-      toolTypes
-    } = _ref6;
+    let toolData = _ref6.toolData,
+      toolTypes = _ref6.toolTypes;
     const referenceToolData = toolData === null || toolData === void 0 || (_toolData$toolTypes$ = toolData[toolTypes === null || toolTypes === void 0 ? void 0 : toolTypes[0]]) === null || _toolData$toolTypes$ === void 0 || (_toolData$toolTypes$ = _toolData$toolTypes$.data) === null || _toolData$toolTypes$ === void 0 ? void 0 : _toolData$toolTypes$[0];
     const volumeId = referenceToolData === null || referenceToolData === void 0 || (_referenceToolData$me = referenceToolData.metadata) === null || _referenceToolData$me === void 0 ? void 0 : _referenceToolData$me.volumeId;
     const volume = cache.getVolume(volumeId);
@@ -447,9 +412,7 @@ class MeasurementReport {
     const GROUP = 'Measurement Group';
     const TRACKING_IDENTIFIER = 'Tracking Identifier';
     const TRACKING_UNIQUE_IDENTIFIER = 'Tracking Unique Identifier';
-    const {
-      imageId: predecessorImageId
-    } = dataset;
+    const predecessorImageId = dataset.imageId;
     const imagingMeasurementContent = toArray(dataset.ContentSequence).find(codeMeaningEquals(REPORT));
     const measurementGroups = toArray(imagingMeasurementContent.ContentSequence).filter(codeMeaningEquals(GROUP));
     const measurementData = {};
@@ -458,9 +421,7 @@ class MeasurementReport {
         var _hooks$getToolClass;
         const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
         const trackingIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER);
-        const {
-          TextValue: trackingIdentifierValue
-        } = trackingIdentifierGroup;
+        const trackingIdentifierValue = trackingIdentifierGroup.TextValue;
         const trackingUniqueIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_UNIQUE_IDENTIFIER);
         const trackingUniqueIdentifierValue = trackingUniqueIdentifierGroup === null || trackingUniqueIdentifierGroup === void 0 ? void 0 : trackingUniqueIdentifierGroup.UID;
         const toolAdapter = (hooks === null || hooks === void 0 || (_hooks$getToolClass = hooks.getToolClass) === null || _hooks$getToolClass === void 0 ? void 0 : _hooks$getToolClass.call(hooks, measurementGroup, dataset, this.measurementAdapterByToolType)) || this.getAdapterForTrackingIdentifier(trackingIdentifierValue) || this.getAdapterForCodeType(measurementGroup);
@@ -550,9 +511,7 @@ _MeasurementReport.measurementAdapterByToolType = new Map();
 _MeasurementReport.measurementAdaptersByType = new Map();
 _MeasurementReport.measurementAdapterByTrackingIdentifier = new Map();
 _MeasurementReport.codeValueMatch = (group, code, oldCode) => {
-  const {
-    ConceptNameCodeSequence
-  } = group;
+  const ConceptNameCodeSequence = group.ConceptNameCodeSequence;
   if (!ConceptNameCodeSequence) {
     return;
   }
@@ -560,10 +519,8 @@ _MeasurementReport.codeValueMatch = (group, code, oldCode) => {
   if (!seq) {
     return;
   }
-  const {
-    CodingSchemeDesignator,
-    CodeValue
-  } = seq;
+  const CodingSchemeDesignator = seq.CodingSchemeDesignator,
+    CodeValue = seq.CodeValue;
   return CodingSchemeDesignator == code.CodingSchemeDesignator && CodeValue == code.CodeValue || oldCode && CodingSchemeDesignator == oldCode.CodingSchemeDesignator && CodeValue == oldCode.CodeValue;
 };
 _MeasurementReport.generateDerivationSourceDataset = instance => {

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

@@ -1,11 +1,7 @@
 import { CornerstonePMAP } from '../../Cornerstone/index.js';
 
-const {
-  ParametricMap
-} = CornerstonePMAP;
-const {
-  generateToolState: generateToolStateCornerstone
-} = ParametricMap;
+const ParametricMap = CornerstonePMAP.ParametricMap;
+const generateToolStateCornerstone = ParametricMap.generateToolState;
 function generateToolState(imageIds, arrayBuffer, metadataProvider) {
   let skipOverlapping = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   let tolerance = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1e-3;

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

@@ -4,9 +4,9 @@ import { vec3 } from 'gl-matrix';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 import { toArray } from '../helpers/toArray.js';
-import 'dcmjs';
+import '../helpers/downloadDICOMData.js';
 import { toScoords } from '../helpers/toScoordType.js';
-import '@cornerstonejs/core';
+import '../helpers/scoordToWorld.js';
 import ControlPointPolyline from './ControlPointPolyline.js';
 import { SPLINE_TYPE_CODE } from './constants/index.js';
 
@@ -16,13 +16,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 class PlanarFreehandROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     var _state$annotation$dat, _state$annotation$dat2, _numSeq$find;
-    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 distanceBetweenFirstAndLastPoint = vec3.distance(worldCoords[worldCoords.length - 1], worldCoords[0]);
     let isOpenContour = true;
     if (distanceBetweenFirstAndLastPoint < this.closedContourThreshold) {
@@ -69,23 +68,16 @@ class PlanarFreehandROI extends BaseAdapter3D {
   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 {
-      handles
-    } = data;
-    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
@@ -96,16 +88,15 @@ class PlanarFreehandROI extends BaseAdapter3D {
       points.push(firstPoint);
     }
     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 {
-      area,
-      areaUnit,
-      modalityUnit,
-      perimeter,
-      mean,
-      max,
-      stdDev,
-      length
-    } = data.cachedStats["imageId:".concat(referencedImageId)] || {};
+    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,

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

@@ -2,15 +2,14 @@ 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);
@@ -18,13 +17,12 @@ class Probe extends BaseAdapter3D {
   }
   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,