@cornerstonejs/adapters 3.31.11 → 3.31.13

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

@@ -49,8 +49,8 @@ const codeValueMatch = (group, code, oldCode) => {
 function getTID300ContentItem(tool, ReferencedSOPSequence, adapterClass) {
   const args = adapterClass.getTID300RepresentationArguments(tool);
   args.ReferencedSOPSequence = ReferencedSOPSequence;
-  const TID300Measurement = new adapterClass.TID300Representation(args);
-  return TID300Measurement;
+  const tid300Measurement = new adapterClass.TID300Representation(args);
+  return tid300Measurement;
 }
 function getMeasurementGroup(toolType, toolData, ReferencedSOPSequence) {
   const toolTypeData = toolData[toolType];
@@ -61,10 +61,10 @@ function getMeasurementGroup(toolType, toolData, ReferencedSOPSequence) {
 
   // Loop through the array of tool instances
   // for this tool
-  const Measurements = toolTypeData.data.map(tool => {
+  const measurements = toolTypeData.data.map(tool => {
     return getTID300ContentItem(tool, ReferencedSOPSequence, toolClass);
   });
-  return new TID1501MeasurementGroup(Measurements);
+  return new TID1501MeasurementGroup(measurements);
 }
 class MeasurementReport {
   static getSetupMeasurementData(MeasurementGroup) {
@@ -162,7 +162,7 @@ class MeasurementReport {
       });
       allMeasurementGroups = allMeasurementGroups.concat(measurementGroups);
     });
-    const MeasurementReport = new TID1500MeasurementReport({
+    const tid1500MeasurementReport = new TID1500MeasurementReport({
       TID1501MeasurementGroups: allMeasurementGroups
     }, options);
 
@@ -204,7 +204,7 @@ class MeasurementReport {
     derivationSourceDataset._meta = _meta;
     derivationSourceDataset._vrMap = _vrMap;
     const report = new StructuredReport([derivationSourceDataset]);
-    const contentItem = MeasurementReport.contentItem(derivationSourceDataset);
+    const contentItem = tid1500MeasurementReport.contentItem(derivationSourceDataset);
 
     // Merge the derived dataset with the content from the Measurement Report
     report.dataset = Object.assign(report.dataset, contentItem);

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

@@ -6,6 +6,8 @@ declare class Angle extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         point1: {

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

@@ -26,11 +26,8 @@ class Angle extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       cachedStats,
       frameNumber: ReferencedFrameNumber

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

@@ -6,6 +6,8 @@ declare class ArrowAnnotate extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         points: ({

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

@@ -2,7 +2,6 @@ import { utilities } from 'dcmjs';
 import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import CodingScheme from './CodingScheme.js';
 import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 
@@ -13,15 +12,11 @@ const {
 const {
   imageToWorldCoords
 } = utilities$1;
-const {
-  codeValues
-} = CodingScheme;
 class ArrowAnnotate extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, _trackingIdentifier) {
     const {
       state,
       SCOORDGroup,
-      scoordArgs,
       worldCoords,
       referencedImageId,
       ReferencedFrameNumber
@@ -49,12 +44,9 @@ class ArrowAnnotate extends BaseAdapter3D {
       ...state.annotation.data,
       text,
       handles: {
+        ...state.annotation.data.handles,
         arrowFirst: true,
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        points: worldCoords
       },
       frameNumber: ReferencedFrameNumber
     };
@@ -67,7 +59,7 @@ class ArrowAnnotate extends BaseAdapter3D {
       metadata,
       findingSites
     } = tool;
-    let {
+    const {
       finding
     } = tool;
     const {
@@ -93,13 +85,6 @@ class ArrowAnnotate extends BaseAdapter3D {
       ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
       use3DSpatialCoordinates: is3DMeasurement
     };
-    if (!finding || finding.CodeValue !== codeValues.CORNERSTONEFREETEXT) {
-      finding = {
-        CodeValue: codeValues.CORNERSTONEFREETEXT,
-        CodingSchemeDesignator: CodingScheme.CodingSchemeDesignator,
-        CodeMeaning: data.text
-      };
-    }
     return TID300RepresentationArguments;
   }
 }

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

@@ -36,6 +36,8 @@ export default class BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): TID300Arguments;
 }

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

@@ -6,6 +6,8 @@ declare class Bidirectional extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         longAxis: {

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

@@ -16,8 +16,6 @@ class Bidirectional extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     const {
       state,
-      NUMGroup,
-      scoord,
       scoordArgs,
       referencedImageId,
       ReferencedFrameNumber
@@ -35,11 +33,8 @@ class Bidirectional extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]]
       },
       frameNumber: ReferencedFrameNumber
     };

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

@@ -6,6 +6,8 @@ declare class CircleROI extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         area: any;

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

@@ -14,8 +14,6 @@ class CircleROI extends BaseAdapter3D {
     const {
       state,
       NUMGroup,
-      scoord,
-      scoordArgs,
       worldCoords,
       referencedImageId,
       ReferencedFrameNumber
@@ -23,11 +21,8 @@ class CircleROI extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       frameNumber: ReferencedFrameNumber
     };

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

@@ -6,6 +6,8 @@ declare class CobbAngle extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         point1: {

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

@@ -21,11 +21,8 @@ class CobbAngle extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]]
       },
       frameNumber: ReferencedFrameNumber
     };

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

@@ -6,6 +6,8 @@ declare class EllipticalROI extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         area: any;

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

@@ -21,11 +21,8 @@ class EllipticalROI extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       frameNumber: ReferencedFrameNumber
     };

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

@@ -9,6 +9,8 @@ export default class KeyImage extends Probe {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any): {
         points: ({

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

@@ -0,0 +1,11 @@
+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;
+    filterCornerstoneFreeText(contentEntries: any): void;
+    createQualitativeLabel(label: string): any;
+    createQualitativeLabelPosition(annotation: Types.Annotation): any;
+}

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

@@ -0,0 +1,102 @@
+import { COMMENT_CODE, TEXT_ANNOTATION_POSITION } from './constants/index.js';
+import dcmjs from 'dcmjs';
+import 'buffer';
+import { toScoord } from '../helpers/toScoordType.js';
+import '@cornerstonejs/core';
+
+const {
+  sr: {
+    valueTypes,
+    coding
+  }
+} = dcmjs;
+const CORNERSTONEFREETEXT = "CORNERSTONEFREETEXT";
+class LabelData {
+  constructor(tid300Item, annotation) {
+    this.tid300Item = tid300Item;
+    this.annotation = annotation;
+    this.ReferencedSOPSequence = tid300Item.ReferencedSOPSequence;
+  }
+  contentItem() {
+    const contentEntries = this.tid300Item.contentItem();
+    const {
+      label,
+      handles
+    } = this.annotation.data;
+    if (label) {
+      contentEntries.push(this.createQualitativeLabel(label));
+      this.filterCornerstoneFreeText(contentEntries);
+    }
+    if (handles?.textBox?.hasMoved) {
+      contentEntries.push(this.createQualitativeLabelPosition(this.annotation));
+    }
+    return contentEntries;
+  }
+  filterCornerstoneFreeText(contentEntries) {
+    for (let i = 0; i < contentEntries.length; i++) {
+      const group = contentEntries[i];
+      if (!group.ConceptCodeSequence) {
+        continue;
+      }
+      const csLabel = group.ConceptCodeSequence.find(item => item.CodeValue === CORNERSTONEFREETEXT);
+      if (csLabel !== -1) {
+        group.ConceptCodeSequence.splice(csLabel, 1);
+        if (group.ConceptCodeSequence.length === 0) {
+          contentEntries.splice(i, 1);
+        }
+        return;
+      }
+    }
+  }
+  createQualitativeLabel(label) {
+    const relationshipType = valueTypes.RelationshipTypes.CONTAINS;
+    return new valueTypes.TextContentItem({
+      name: new coding.CodedConcept(COMMENT_CODE),
+      relationshipType,
+      value: label
+    });
+  }
+  createQualitativeLabelPosition(annotation) {
+    const {
+      textBox
+    } = annotation.data.handles;
+    const {
+      referencedImageId,
+      FrameOfReferenceUID: frameOfReferenceUID
+    } = annotation.metadata;
+    const is3DMeasurement = !referencedImageId;
+    const {
+      worldPosition
+    } = textBox;
+    const {
+      x,
+      y,
+      z
+    } = toScoord({
+      is3DMeasurement,
+      referencedImageId
+    }, worldPosition);
+    const graphicType = valueTypes.GraphicTypes.POINT;
+    const relationshipType = valueTypes.RelationshipTypes.CONTAINS;
+    const name = new coding.CodedConcept(TEXT_ANNOTATION_POSITION);
+    if (is3DMeasurement) {
+      const graphicData = [x, y, z];
+      return new valueTypes.Scoord3DContentItem({
+        name,
+        relationshipType,
+        graphicType,
+        frameOfReferenceUID,
+        graphicData
+      });
+    }
+    const graphicData = [x, y];
+    return new valueTypes.ScoordContentItem({
+      name,
+      relationshipType,
+      graphicType,
+      graphicData
+    });
+  }
+}
+
+export { LabelData as default };

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

@@ -6,6 +6,8 @@ export default class Length extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         point1: {

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

@@ -15,8 +15,6 @@ class Length extends BaseAdapter3D {
     const {
       state,
       NUMGroup,
-      scoord,
-      scoordArgs,
       worldCoords,
       referencedImageId,
       ReferencedFrameNumber
@@ -29,11 +27,9 @@ class Length extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
+        ...state.annotation.data.handles,
         points: [worldCoords[0], worldCoords[1]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        activeHandleIndex: 0
       },
       cachedStats,
       frameNumber: ReferencedFrameNumber

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

@@ -1,5 +1,6 @@
 import { type Types as CSTypes } from "@cornerstonejs/core";
 import type { Types } from "@cornerstonejs/tools";
+import LabelData from "./LabelData";
 type Annotation = Types.Annotation;
 type SpatialCoordinatesState = {
     description?: string;
@@ -7,6 +8,8 @@ type SpatialCoordinatesState = {
     annotation: Annotation;
     finding?: unknown;
     findingSites?: unknown;
+    commentGroup?: any;
+    commentPositionGroup?: any;
 };
 type ScoordType = {
     GraphicData: number[];
@@ -30,6 +33,7 @@ type SetupMeasurementData = {
     ReferencedSOPSequence?: Record<string, unknown>;
     ReferencedSOPInstanceUID?: string;
     referencedImageId?: string;
+    textBoxPosition?: ScoordType;
     ReferencedFrameNumber?: string;
     SCOORD3DGroup?: ScoordType;
     FrameOfReferenceUID?: string;
@@ -58,7 +62,7 @@ export default class MeasurementReport {
     static measurementAdapterByToolType: Map<string, MeasurementAdapter>;
     static measurementAdaptersByType: Map<string, MeasurementAdapter[]>;
     static measurementAdapterByTrackingIdentifier: Map<string, MeasurementAdapter>;
-    static getTID300ContentItem(tool: any, ReferencedSOPSequence: any, toolClass: any, is3DMeasurement: any): any;
+    static getTID300ContentItem(tool: any, ReferencedSOPSequence: any, toolClass: any, is3DMeasurement: any): LabelData;
     static codeValueMatch: (group: any, code: any, oldCode?: any) => boolean;
     static getMeasurementGroup(toolType: any, toolData: any, ReferencedSOPSequence: any, is3DMeasurement: any): any;
     static getCornerstoneLabelFromDefaultState(defaultState: any): any;
@@ -101,6 +105,12 @@ export default class MeasurementReport {
             annotation: {
                 data: {
                     annotationUID: any;
+                    handles: {
+                        activeHandleIndex: number;
+                        textBox: {
+                            hasMoved: boolean;
+                        };
+                    };
                 };
                 annotationUID: any;
                 metadata: {
@@ -121,12 +131,14 @@ export default class MeasurementReport {
         metadata: any;
         toolType: any;
     }): SpatialCoordinatesData;
-    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, toolType }: {
+    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, commentGroup, commentPositionGroup, toolType }: {
         NUMGroup: any;
         sopInstanceUIDToImageIdMap: any;
         metadata: any;
         findingGroup: any;
         findingSiteGroups: any;
+        commentGroup: any;
+        commentPositionGroup: any;
         toolType: any;
     }): {
         defaultState: SpatialCoordinatesState;
@@ -137,6 +149,7 @@ export default class MeasurementReport {
         ReferencedSOPSequence: Record<string, unknown>;
         ReferencedSOPInstanceUID: string;
         referencedImageId: string;
+        textBoxPosition: ScoordType;
         ReferencedFrameNumber: string;
         SCOORD3DGroup: ScoordType;
         FrameOfReferenceUID: string;

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

@@ -9,7 +9,8 @@ import { copySeriesTags } from '../helpers/copySeriesTags.js';
 import { scoordToWorld } from '../helpers/scoordToWorld.js';
 import { toPoint3 } from '../helpers/toPoint3.js';
 import CodingScheme from './CodingScheme.js';
-import { NO_IMAGE_ID } from './constants/index.js';
+import { COMMENT_CODE, TEXT_ANNOTATION_POSITION, NO_IMAGE_ID } from './constants/index.js';
+import LabelData from './LabelData.js';
 
 var _MeasurementReport;
 const {
@@ -33,6 +34,14 @@ const FINDING = {
   CodingSchemeDesignator: "DCM",
   CodeValue: "121071"
 };
+const COMMENT = {
+  CodingSchemeDesignator: COMMENT_CODE.schemeDesignator,
+  CodeValue: COMMENT_CODE.value
+};
+const COMMENT_POSITION = {
+  CodingSchemeDesignator: TEXT_ANNOTATION_POSITION.schemeDesignator,
+  CodeValue: TEXT_ANNOTATION_POSITION.value
+};
 const FINDING_SITE = {
   CodingSchemeDesignator: "SCT",
   CodeValue: "363698007"
@@ -45,8 +54,9 @@ class MeasurementReport {
   static getTID300ContentItem(tool, ReferencedSOPSequence, toolClass, is3DMeasurement) {
     const args = toolClass.getTID300RepresentationArguments(tool, is3DMeasurement);
     args.ReferencedSOPSequence = ReferencedSOPSequence;
-    const TID300Measurement = new toolClass.TID300Representation(args);
-    return TID300Measurement;
+    const tid300Measurement = new toolClass.TID300Representation(args);
+    const labelMeasurement = new LabelData(tid300Measurement, tool);
+    return labelMeasurement;
   }
   static getMeasurementGroup(toolType, toolData, ReferencedSOPSequence, is3DMeasurement) {
     const toolTypeData = toolData[toolType];
@@ -62,8 +72,12 @@ class MeasurementReport {
   static getCornerstoneLabelFromDefaultState(defaultState) {
     const {
       findingSites = [],
-      finding
+      finding,
+      commentGroup
     } = defaultState;
+    if (commentGroup?.TextValue) {
+      return commentGroup.TextValue;
+    }
     const cornersoneFreeTextCodingValue = CodingScheme.codeValues.CORNERSTONEFREETEXT;
     const freeTextLabel = findingSites.find(fs => fs.CodeValue === cornersoneFreeTextCodingValue);
     if (freeTextLabel) {
@@ -124,7 +138,13 @@ class MeasurementReport {
         sopInstanceUid: ReferencedSOPInstanceUID,
         annotation: {
           data: {
-            annotationUID
+            annotationUID,
+            handles: {
+              activeHandleIndex: 0,
+              textBox: {
+                hasMoved: false
+              }
+            }
           },
           annotationUID,
           metadata: {
@@ -150,7 +170,13 @@ class MeasurementReport {
         annotation: {
           annotationUID,
           data: {
-            annotationUID
+            annotationUID,
+            handles: {
+              activeHandleIndex: 0,
+              textBox: {
+                hasMoved: false
+              }
+            }
           },
           metadata: {
             toolName: toolType,
@@ -169,23 +195,22 @@ class MeasurementReport {
       metadata,
       toolType
     } = _ref3;
-    const SCOORDGroup = toArray(NUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD");
-    const SCOORD3DGroup = toArray(NUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD3D");
-    if (SCOORDGroup) {
-      return this.processSCOORDGroup({
-        SCOORDGroup,
-        toolType,
-        metadata,
-        sopInstanceUIDToImageIdMap
-      });
-    } else if (SCOORD3DGroup) {
-      return this.processSCOORD3DGroup({
-        SCOORD3DGroup,
-        toolType
-      });
-    } else {
+    const contentSequenceArr = toArray(NUMGroup.ContentSequence);
+    const SCOORDGroup = contentSequenceArr.find(group => group.ValueType === "SCOORD");
+    const SCOORD3DGroup = contentSequenceArr.find(group => group.ValueType === "SCOORD3D");
+    const result = SCOORD3DGroup && this.processSCOORD3DGroup({
+      SCOORD3DGroup,
+      toolType
+    }) || SCOORDGroup && this.processSCOORDGroup({
+      SCOORDGroup,
+      toolType,
+      metadata,
+      sopInstanceUIDToImageIdMap
+    });
+    if (!result) {
       throw new Error("No spatial coordinates group found.");
     }
+    return result;
   }
   static processSpatialCoordinatesGroup(_ref4) {
     let {
@@ -194,6 +219,8 @@ class MeasurementReport {
       metadata,
       findingGroup,
       findingSiteGroups,
+      commentGroup,
+      commentPositionGroup,
       toolType
     } = _ref4;
     const {
@@ -204,7 +231,8 @@ class MeasurementReport {
       ReferencedFrameNumber,
       SCOORD3DGroup,
       FrameOfReferenceUID,
-      referencedImageId
+      referencedImageId,
+      textBoxPosition
     } = this.getSpatialCoordinatesState({
       NUMGroup,
       sopInstanceUIDToImageIdMap,
@@ -215,12 +243,25 @@ class MeasurementReport {
     const findingSites = findingSiteGroups.map(fsg => {
       return addAccessors(fsg.ConceptCodeSequence);
     });
+    if (commentPositionGroup) {
+      state.commentPositionGroup = commentPositionGroup;
+      const textBoxCoords = scoordToWorld({
+        is3DMeasurement: !referencedImageId,
+        referencedImageId
+      }, commentPositionGroup);
+      state.annotation.data.handles.textBox = {
+        hasMoved: true,
+        worldPosition: textBoxCoords[0]
+      };
+    }
     state.finding = finding;
     state.findingSites = findingSites;
+    state.commentGroup = commentGroup;
+    state.commentPositionGroup = commentPositionGroup;
     if (finding) {
       state.description = finding.CodeMeaning;
     }
-    state.annotation.data.label = MeasurementReport.getCornerstoneLabelFromDefaultState(state);
+    state.annotation.data.label = this.getCornerstoneLabelFromDefaultState(state);
     return {
       defaultState: state,
       state,
@@ -230,6 +271,7 @@ class MeasurementReport {
       ReferencedSOPSequence,
       ReferencedSOPInstanceUID,
       referencedImageId,
+      textBoxPosition,
       ReferencedFrameNumber,
       SCOORD3DGroup,
       FrameOfReferenceUID
@@ -241,6 +283,8 @@ class MeasurementReport {
     } = MeasurementGroup;
     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));
     const findingSiteGroups = contentSequenceArr.filter(group => this.codeValueMatch(group, FINDING_SITE, FINDING_SITE_OLD)) || [];
     const NUMGroup = contentSequenceArr.find(group => group.ValueType === "NUM") || {
       ContentSequence: contentSequenceArr.filter(group => group.ValueType === "SCOORD" || group.ValueType === "SCOORD3D")
@@ -251,6 +295,8 @@ class MeasurementReport {
       metadata,
       findingGroup,
       findingSiteGroups,
+      commentGroup,
+      commentPositionGroup,
       toolType
     });
     const {

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

@@ -7,6 +7,8 @@ declare class PlanarFreehandROI extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         points: ({

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

@@ -15,8 +15,6 @@ class PlanarFreehandROI extends BaseAdapter3D {
     const {
       state,
       NUMGroup,
-      scoord,
-      scoordArgs,
       worldCoords,
       referencedImageId,
       ReferencedFrameNumber
@@ -38,11 +36,8 @@ class PlanarFreehandROI extends BaseAdapter3D {
         closed: !isOpenContour
       },
       handles: {
-        points,
-        activeHandleIndex: null,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points
       },
       frameNumber: ReferencedFrameNumber
     };
@@ -102,7 +97,7 @@ class PlanarFreehandROI extends BaseAdapter3D {
       finding,
       findingSites: findingSites || [],
       ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
-      use3DSpatialCoordinates: false
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -7,6 +7,8 @@ declare class Probe extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         points: ({

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

@@ -18,8 +18,6 @@ class Probe extends BaseAdapter3D {
     const {
       state,
       NUMGroup,
-      scoord,
-      scoordArgs,
       worldCoords,
       referencedImageId,
       ReferencedFrameNumber
@@ -32,11 +30,8 @@ class Probe extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       cachedStats,
       frameNumber: ReferencedFrameNumber

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

@@ -6,6 +6,8 @@ export declare class RectangleROI extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         points: ({

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

@@ -28,11 +28,8 @@ class RectangleROI extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       cachedStats,
       frameNumber: ReferencedFrameNumber
@@ -47,10 +44,6 @@ class RectangleROI extends BaseAdapter3D {
       findingSites,
       metadata
     } = tool;
-    const {
-      polyline,
-      closed
-    } = data.contour;
     const {
       referencedImageId
     } = metadata;
@@ -58,7 +51,7 @@ class RectangleROI extends BaseAdapter3D {
       is3DMeasurement,
       referencedImageId
     };
-    const corners = toScoords(scoordProps, polyline);
+    const corners = toScoords(scoordProps, data.handles.points);
     const {
       area,
       perimeter
@@ -70,7 +63,7 @@ class RectangleROI extends BaseAdapter3D {
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -6,6 +6,8 @@ declare class UltrasoundDirectional extends BaseAdapter3D {
         annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement: any): {
         point1: {

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

@@ -20,11 +20,8 @@ class UltrasoundDirectional extends BaseAdapter3D {
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
-        points: worldCoords,
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
       frameNumber: ReferencedFrameNumber
     };

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

@@ -1 +1,12 @@
 export declare const NO_IMAGE_ID = "none";
+export declare const CS3D_DESIGNATOR = "99CS3D";
+export declare const TEXT_ANNOTATION_POSITION: {
+    schemeDesignator: string;
+    meaning: string;
+    value: string;
+};
+export declare const COMMENT_CODE: {
+    schemeDesignator: string;
+    meaning: string;
+    value: string;
+};

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

@@ -1,3 +1,14 @@
 const NO_IMAGE_ID = "none";
+const CS3D_DESIGNATOR = "99CS3D";
+const TEXT_ANNOTATION_POSITION = {
+  schemeDesignator: CS3D_DESIGNATOR,
+  meaning: "Text Annotation Position",
+  value: "TextPosition"
+};
+const COMMENT_CODE = {
+  schemeDesignator: "DCM",
+  meaning: "Comment",
+  value: "121106"
+};
 
-export { NO_IMAGE_ID };
+export { COMMENT_CODE, CS3D_DESIGNATOR, NO_IMAGE_ID, TEXT_ANNOTATION_POSITION };

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

@@ -37,6 +37,17 @@ declare const Cornerstone3DSR: {
         };
     };
     CORNERSTONE_3D_TAG: string;
+    COMMENT_CODE: {
+        schemeDesignator: string;
+        meaning: string;
+        value: string;
+    };
+    NO_IMAGE_ID: string;
+    TEXT_ANNOTATION_POSITION: {
+        schemeDesignator: string;
+        meaning: string;
+        value: string;
+    };
 };
 declare const Cornerstone3DSEG: {
     Segmentation: typeof Segmentation;

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

@@ -17,6 +17,7 @@ import * as index from './Segmentation/index.js';
 import * as index$1 from './ParametricMap/index.js';
 import * as index$2 from './RTStruct/index.js';
 import KeyImage from './KeyImage.js';
+import { COMMENT_CODE, NO_IMAGE_ID, TEXT_ANNOTATION_POSITION } from './constants/index.js';
 
 const Cornerstone3DSR = {
   BaseAdapter3D,
@@ -34,7 +35,10 @@ const Cornerstone3DSR = {
   KeyImage,
   MeasurementReport,
   CodeScheme: CodingScheme,
-  CORNERSTONE_3D_TAG
+  CORNERSTONE_3D_TAG,
+  COMMENT_CODE,
+  NO_IMAGE_ID,
+  TEXT_ANNOTATION_POSITION
 };
 const Cornerstone3DSEG = {
   Segmentation: index

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

@@ -36,6 +36,17 @@ declare const adaptersSR: {
             };
         };
         CORNERSTONE_3D_TAG: string;
+        COMMENT_CODE: {
+            schemeDesignator: string;
+            meaning: string;
+            value: string;
+        };
+        NO_IMAGE_ID: string;
+        TEXT_ANNOTATION_POSITION: {
+            schemeDesignator: string;
+            meaning: string;
+            value: string;
+        };
     };
 };
 declare const adaptersSEG: {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.31.11";
+export declare const version = "3.31.13";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.31.11",
+    "version": "3.31.13",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -90,8 +90,8 @@
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.31.11",
-        "@cornerstonejs/tools": "^3.31.11"
+        "@cornerstonejs/core": "^3.31.13",
+        "@cornerstonejs/tools": "^3.31.13"
     },
-    "gitHead": "ef652d1dc272c927ac5ad55dd460972bf765d0df"
+    "gitHead": "927b4adb9c9c46af4bb04f372c4580e40b9ee508"
 }