@cornerstonejs/adapters 5.0.0-beta.1 → 5.0.0

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;
@@ -21,10 +17,10 @@ class LabelData {
   contentItem() {
     var _handles$textBox;
     const contentEntries = this.tid300Item.contentItem();
-    const {
-      label,
-      handles
-    } = this.annotation.data;
+    this.fixScoordRelationships(contentEntries);
+    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);
@@ -34,10 +30,26 @@ class LabelData {
     }
     return contentEntries;
   }
+  fixScoordRelationships(contentEntries) {
+    const INFERRED_FROM = valueTypes.RelationshipTypes.INFERRED_FROM;
+    for (const entry of contentEntries) {
+      const item = entry;
+      const contentSeq = item.ContentSequence;
+      const children = this.normalizeContentSequence(contentSeq);
+      for (const child of children) {
+        if ((child.ValueType === 'SCOORD' || child.ValueType === 'SCOORD3D') && (child.RelationshipType === 'CONTAINS' || child.RelationshipType === 'Contains')) {
+          child.RelationshipType = INFERRED_FROM;
+        }
+      }
+    }
+  }
+  normalizeContentSequence(contentSeq) {
+    if (!contentSeq) return [];
+    if (Array.isArray(contentSeq)) return contentSeq;
+    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];
@@ -63,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.d.ts

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

package/dist/esm/adapters/Cornerstone3D/Length.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';
 
 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 LENGTH = "Length";
+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.d.ts

@@ -148,7 +148,7 @@ export default class MeasurementReport {
         metadata: any;
         toolType: any;
     }): SpatialCoordinatesData;
-    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, commentGroup, commentPositionGroup, toolType, }: {
+    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, commentGroup, commentPositionGroup, controlPointsGroup, toolType, }: {
         NUMGroup: any;
         sopInstanceUIDToImageIdMap: any;
         metadata: any;
@@ -156,6 +156,7 @@ export default class MeasurementReport {
         findingSiteGroups: any;
         commentGroup: any;
         commentPositionGroup: any;
+        controlPointsGroup: any;
         toolType: any;
     }): {
         defaultState: SpatialCoordinatesState;

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

@@ -1,40 +1,30 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
-import { utilities as utilities$1, derivations, normalizers, data } from 'dcmjs';
-import { utilities, cache, Enums } from '@cornerstonejs/core';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+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';
-import { COMMENT_CODE, TEXT_ANNOTATION_POSITION, metaSRAnnotation, NO_IMAGE_ID } from './constants/index.js';
+import { COMMENT_CODE, TEXT_ANNOTATION_POSITION, metaSRAnnotation, NO_IMAGE_ID, CONTROL_POINTS_CODE } from './constants/index.js';
 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'
@@ -47,6 +37,10 @@ const COMMENT_POSITION = {
   CodingSchemeDesignator: TEXT_ANNOTATION_POSITION.schemeDesignator,
   CodeValue: TEXT_ANNOTATION_POSITION.value
 };
+const CONTROL_POINTS = {
+  CodingSchemeDesignator: CONTROL_POINTS_CODE.schemeDesignator,
+  CodeValue: CONTROL_POINTS_CODE.value
+};
 const FINDING_SITE = {
   CodingSchemeDesignator: 'SCT',
   CodeValue: '363698007'
@@ -55,6 +49,14 @@ const FINDING_SITE_OLD = {
   CodingSchemeDesignator: 'SRT',
   CodeValue: 'G-C0E3'
 };
+function isSecondaryScoordGroup(group) {
+  if (group.ValueType !== 'SCOORD' && group.ValueType !== 'SCOORD3D') {
+    return false;
+  }
+  const conceptNameCodeSequence = group.ConceptNameCodeSequence;
+  const conceptCode = Array.isArray(conceptNameCodeSequence) ? conceptNameCodeSequence[0] : conceptNameCodeSequence;
+  return !!conceptCode && conceptCode.CodingSchemeDesignator === CONTROL_POINTS.CodingSchemeDesignator && conceptCode.CodeValue === CONTROL_POINTS.CodeValue;
+}
 class MeasurementReport {
   static getTID300ContentItem(tool, ReferencedSOPSequence, toolClass, is3DMeasurement) {
     const args = toolClass.getTID300RepresentationArguments(tool, is3DMeasurement);
@@ -78,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;
     }
@@ -99,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();
@@ -146,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,
@@ -175,19 +169,18 @@ 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) {
-    let {
-      NUMGroup,
-      sopInstanceUIDToImageIdMap,
-      metadata,
-      toolType
-    } = _ref3;
+    var _contentSequenceArr$f, _contentSequenceArr$f2;
+    let NUMGroup = _ref3.NUMGroup,
+      sopInstanceUIDToImageIdMap = _ref3.sopInstanceUIDToImageIdMap,
+      metadata = _ref3.metadata,
+      toolType = _ref3.toolType;
     const contentSequenceArr = toArray(NUMGroup.ContentSequence);
-    const SCOORDGroup = contentSequenceArr.find(group => group.ValueType === 'SCOORD');
-    const SCOORD3DGroup = contentSequenceArr.find(group => group.ValueType === 'SCOORD3D');
+    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');
     const result = SCOORD3DGroup && this.processSCOORD3DGroup({
       SCOORD3DGroup,
       toolType
@@ -203,32 +196,30 @@ class MeasurementReport {
     return result;
   }
   static processSpatialCoordinatesGroup(_ref4) {
-    let {
-      NUMGroup,
-      sopInstanceUIDToImageIdMap,
-      metadata,
-      findingGroup,
-      findingSiteGroups,
-      commentGroup,
-      commentPositionGroup,
-      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);
@@ -244,6 +235,13 @@ class MeasurementReport {
         worldPosition: textBoxCoords[0]
       };
     }
+    if (controlPointsGroup) {
+      const controlPoints = scoordToWorld({
+        is3DMeasurement: !referencedImageId,
+        referencedImageId
+      }, controlPointsGroup);
+      state.annotation.data.handles.points = controlPoints;
+    }
     state.finding = finding;
     state.findingSites = findingSites;
     state.commentGroup = commentGroup;
@@ -268,15 +266,18 @@ 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));
     const commentPositionGroup = contentSequenceArr.find(group => this.codeValueMatch(group, COMMENT_POSITION));
+    let controlPointsGroup = contentSequenceArr.find(group => this.codeValueMatch(group, CONTROL_POINTS));
+    const NUMGroupForLookup = contentSequenceArr.find(group => group.ValueType === 'NUM');
+    if (!controlPointsGroup && NUMGroupForLookup !== null && NUMGroupForLookup !== void 0 && NUMGroupForLookup.ContentSequence) {
+      controlPointsGroup = toArray(NUMGroupForLookup.ContentSequence).find(item => this.codeValueMatch(item, CONTROL_POINTS));
+    }
     const findingSiteGroups = contentSequenceArr.filter(group => this.codeValueMatch(group, FINDING_SITE, FINDING_SITE_OLD)) || [];
-    const NUMGroup = contentSequenceArr.find(group => group.ValueType === 'NUM') || {
+    const NUMGroup = NUMGroupForLookup || {
       ContentSequence: contentSequenceArr.filter(group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D')
     };
     const spatialGroup = this.processSpatialCoordinatesGroup({
@@ -287,11 +288,10 @@ class MeasurementReport {
       findingSiteGroups,
       commentGroup,
       commentPositionGroup,
+      controlPointsGroup,
       toolType
     });
-    const {
-      referencedImageId
-    } = spatialGroup.state.annotation.metadata;
+    const referencedImageId = spatialGroup.state.annotation.metadata.referencedImageId;
     const is3DMeasurement = !!spatialGroup.SCOORD3DGroup;
     const scoordArgs = {
       referencedImageId,
@@ -307,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);
@@ -346,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);
@@ -420,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 = {};
@@ -431,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);
@@ -523,16 +511,16 @@ _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;
   }
-  const {
-    CodingSchemeDesignator,
-    CodeValue
-  } = ConceptNameCodeSequence;
+  const seq = Array.isArray(ConceptNameCodeSequence) ? ConceptNameCodeSequence[0] : ConceptNameCodeSequence;
+  if (!seq) {
+    return;
+  }
+  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.d.ts

@@ -1,4 +1,4 @@
-import BaseAdapter3D from "./BaseAdapter3D";
+import BaseAdapter3D from './BaseAdapter3D';
 declare class PlanarFreehandROI extends BaseAdapter3D {
     static closedContourThreshold: number;
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any): {
@@ -20,6 +20,15 @@ declare class PlanarFreehandROI extends BaseAdapter3D {
             y: number;
             z?: undefined;
         })[];
+        controlPoints: ({
+            x: any;
+            y: any;
+            z: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
+        })[];
         area: any;
         areaUnit: any;
         perimeter: any;
@@ -27,6 +36,7 @@ declare class PlanarFreehandROI extends BaseAdapter3D {
         mean: any;
         max: any;
         stdDev: any;
+        splineType: any;
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;