@cornerstonejs/adapters 3.30.3 → 3.31.1

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

@@ -3,6 +3,7 @@ import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 import { toArray } from '../helpers/toArray.js';
 import 'buffer';
+import '@cornerstonejs/core';
 
 const {
   Bidirectional: TID300Bidirectional

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

@@ -2,6 +2,7 @@ import { utilities, derivations, normalizers, data } from 'dcmjs';
 import { toArray } from '../helpers/toArray.js';
 import { codeMeaningEquals } from '../helpers/codeMeaningEquals.js';
 import 'buffer';
+import '@cornerstonejs/core';
 
 const {
   TID1500,

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

@@ -1,87 +1,48 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class Angle extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): any;
-    static getMeasurementDataFromScoord({ defaultState, SCOORDGroup, imageToWorldCoords, NUMGroup, ReferencedFrameNumber }: {
-        defaultState: any;
-        SCOORDGroup: any;
-        imageToWorldCoords: any;
-        NUMGroup: any;
-        ReferencedFrameNumber: any;
-    }): any;
-    static getMeasurementDataFromScoord3D({ defaultState, SCOORD3DGroup }: {
-        defaultState: any;
-        SCOORD3DGroup: any;
-    }): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        point1: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        point2: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        point3: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        point4: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        rAngle: any;
-        trackingIdentifierTextValue: string;
-        finding: any;
-        findingSites: any;
-        ReferencedFrameOfReferenceUID: any;
-        use3DSpatialCoordinates: boolean;
-    } | {
-        point1: {
-            x: any;
-            y: any;
-        };
-        point2: {
-            x: any;
-            y: any;
-        };
-        point3: {
-            x: any;
-            y: any;
-        };
-        point4: {
-            x: any;
-            y: any;
-        };
-        rAngle: any;
-        trackingIdentifierTextValue: string;
-        finding: any;
-        findingSites: any;
-        use3DSpatialCoordinates: boolean;
+    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
+        description?: string;
+        sopInstanceUid?: string;
+        annotation: import("packages/tools/dist/esm/types").Annotation;
+        finding?: unknown;
+        findingSites?: unknown;
     };
-    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         point1: {
             x: any;
             y: any;
             z: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
         };
         point2: {
             x: any;
             y: any;
             z: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
         };
         point3: {
             x: any;
             y: any;
             z: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
         };
         point4: {
             x: any;
             y: any;
             z: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
         };
         rAngle: any;
         trackingIdentifierTextValue: string;

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

@@ -1,6 +1,9 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
+import 'buffer';
+import { toScoord } from '../helpers/toScoordType.js';
+import '@cornerstonejs/core';
 
 var _Angle;
 const {
@@ -9,91 +12,35 @@ const {
 class Angle extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
     const {
-      defaultState,
+      state,
       NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
+      scoord,
+      scoordArgs,
+      worldCoords,
+      referencedImageId,
       ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, Angle.toolType);
-    if (SCOORDGroup) {
-      return this.getMeasurementDataFromScoord({
-        defaultState,
-        SCOORDGroup,
-        imageToWorldCoords,
-        NUMGroup,
-        ReferencedFrameNumber
-      });
-    } else if (SCOORD3DGroup) {
-      return this.getMeasurementDataFromScoord3D({
-        defaultState,
-        SCOORD3DGroup
-      });
-    } else {
-      throw new Error("Can't get measurement data with missing SCOORD and SCOORD3D groups.");
-    }
-  }
-  static getMeasurementDataFromScoord(_ref) {
-    let {
-      defaultState,
-      SCOORDGroup,
-      imageToWorldCoords,
-      NUMGroup,
-      ReferencedFrameNumber
-    } = _ref;
-    const referencedImageId = defaultState.annotation.metadata.referencedImageId;
-    const {
-      GraphicData
-    } = SCOORDGroup;
-    const worldCoords = [];
-    for (let i = 0; i < GraphicData.length; i += 2) {
-      const point = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
-      worldCoords.push(point);
-    }
-    const state = defaultState;
+    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const cachedStats = referencedImageId ? {
+      [`imageId:${referencedImageId}`]: {
+        angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
+      }
+    } : {};
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
-        points: [worldCoords[0], worldCoords[1], worldCoords[3]],
+        points: worldCoords,
         activeHandleIndex: 0,
         textBox: {
           hasMoved: false
         }
       },
-      cachedStats: {
-        [`imageId:${referencedImageId}`]: {
-          angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
-        }
-      },
+      cachedStats,
       frameNumber: ReferencedFrameNumber
     };
     return state;
   }
-  static getMeasurementDataFromScoord3D(_ref2) {
-    let {
-      defaultState,
-      SCOORD3DGroup
-    } = _ref2;
-    const {
-      GraphicData
-    } = SCOORD3DGroup;
-    const worldCoords = [];
-    for (let i = 0; i < GraphicData.length; i += 3) {
-      const point = [GraphicData[i], GraphicData[i + 1], GraphicData[i + 2]];
-      worldCoords.push(point);
-    }
-    const state = defaultState;
-    state.annotation.data = {
-      handles: {
-        points: [worldCoords[0], worldCoords[1], worldCoords[3]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
-      },
-      cachedStats: {}
-    };
-    return state;
-  }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       finding,
@@ -107,74 +54,15 @@ class Angle extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const start1 = worldToImageCoords(referencedImageId, handles.points[0]);
-    const middle = worldToImageCoords(referencedImageId, handles.points[1]);
-    const end = worldToImageCoords(referencedImageId, handles.points[2]);
-    const point1 = {
-      x: start1[0],
-      y: start1[1]
-    };
-    const point2 = {
-      x: middle[0],
-      y: middle[1]
-    };
-    const point3 = point2;
-    const point4 = {
-      x: end[0],
-      y: end[1]
-    };
-    const {
-      angle
-    } = cachedStats[`imageId:${referencedImageId}`] || {};
-    return {
-      point1,
-      point2,
-      point3,
-      point4,
-      rAngle: angle,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
-    };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const start = handles.points[0];
-    const middle = handles.points[1];
-    const end = handles.points[2];
-    const point1 = {
-      x: start[0],
-      y: start[1],
-      z: start[2]
-    };
-    const point2 = {
-      x: middle[0],
-      y: middle[1],
-      z: middle[2]
-    };
-    const point3 = point2;
-    const point4 = {
-      x: end[0],
-      y: end[1],
-      z: end[2]
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
-    const cachedStatsKeys = Object.keys(cachedStats)[0];
-    const {
-      angle = undefined
-    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
+    const point1 = toScoord(scoordProps, handles.points[0]);
+    const point2 = toScoord(scoordProps, handles.points[1]);
+    const point3 = toScoord(scoordProps, handles.points[1]);
+    const point4 = toScoord(scoordProps, handles.points[2]);
+    const angle = cachedStats[`imageId:${referencedImageId}`]?.angle;
     return {
       point1,
       point2,
@@ -184,8 +72,8 @@ class Angle extends BaseAdapter3D {
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -1,36 +1,22 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class ArrowAnnotate extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any, _trackingIdentifier: any): any;
-    static getMeasurementDataFromScoord3D({ SCOORD3DGroup, defaultState, text }: {
-        SCOORD3DGroup: any;
-        defaultState: any;
-        text: any;
-    }): any;
-    static getMeasurementDataFromScoord({ SCOORDGroup, referencedImageId, metadata, imageToWorldCoords, defaultState, text, ReferencedFrameNumber }: {
-        SCOORDGroup: any;
-        referencedImageId: any;
-        metadata: any;
-        imageToWorldCoords: any;
-        defaultState: any;
-        text: any;
-        ReferencedFrameNumber: any;
-    }): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        points: {
-            x: any;
-            y: any;
-        }[];
-        trackingIdentifierTextValue: string;
-        findingSites: any;
-        finding: any;
-        use3DSpatialCoordinates: boolean;
+    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any, _trackingIdentifier: any): {
+        description?: string;
+        sopInstanceUid?: string;
+        annotation: import("packages/tools/dist/esm/types").Annotation;
+        finding?: unknown;
+        findingSites?: unknown;
     };
-    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
-        points: {
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
+        points: ({
             x: any;
             y: any;
             z: any;
-        }[];
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
+        })[];
         trackingIdentifierTextValue: string;
         findingSites: any;
         finding: any;

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

@@ -2,6 +2,9 @@ import MeasurementReport from './MeasurementReport.js';
 import { utilities } from 'dcmjs';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import CodingScheme from './CodingScheme.js';
+import 'buffer';
+import { toScoord } from '../helpers/toScoordType.js';
+import '@cornerstonejs/core';
 
 var _ArrowAnnotate;
 const {
@@ -13,80 +16,15 @@ const {
 class ArrowAnnotate extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata, _trackingIdentifier) {
     const {
-      defaultState,
-      SCOORDGroup,
-      SCOORD3DGroup,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, ArrowAnnotate.toolType);
-    const referencedImageId = defaultState.annotation.metadata.referencedImageId;
-    const text = defaultState.annotation.metadata.label;
-    if (SCOORDGroup) {
-      return this.getMeasurementDataFromScoord({
-        SCOORDGroup,
-        referencedImageId,
-        metadata,
-        imageToWorldCoords,
-        defaultState,
-        text,
-        ReferencedFrameNumber
-      });
-    } else if (SCOORD3DGroup) {
-      return this.getMeasurementDataFromScoord3D({
-        SCOORD3DGroup,
-        defaultState,
-        text
-      });
-    } else {
-      throw new Error("Can't get measurement data with missing SCOORD and SCOORD3D groups.");
-    }
-  }
-  static getMeasurementDataFromScoord3D(_ref) {
-    let {
-      SCOORD3DGroup,
-      defaultState,
-      text
-    } = _ref;
-    const {
-      GraphicData
-    } = SCOORD3DGroup;
-    const worldCoords = [];
-    for (let i = 0; i < GraphicData.length; i += 3) {
-      const point = [GraphicData[i], GraphicData[i + 1], GraphicData[i + 2]];
-      worldCoords.push(point);
-    }
-    const state = defaultState;
-    state.annotation.data = {
-      text,
-      handles: {
-        arrowFirst: true,
-        points: [worldCoords[0], worldCoords[1]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
-      }
-    };
-    return state;
-  }
-  static getMeasurementDataFromScoord(_ref2) {
-    let {
+      state,
       SCOORDGroup,
+      scoordArgs,
+      worldCoords,
       referencedImageId,
-      metadata,
-      imageToWorldCoords,
-      defaultState,
-      text,
       ReferencedFrameNumber
-    } = _ref2;
-    const {
-      GraphicData
-    } = SCOORDGroup;
-    const worldCoords = [];
-    for (let i = 0; i < GraphicData.length; i += 2) {
-      const point = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
-      worldCoords.push(point);
-    }
-    if (worldCoords.length === 1) {
+    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const text = state.annotation.data.label;
+    if (worldCoords.length === 1 && SCOORDGroup) {
       const imagePixelModule = metadata.get("imagePixelModule", referencedImageId);
       let xOffset = 10;
       let yOffset = 10;
@@ -98,15 +36,18 @@ class ArrowAnnotate extends BaseAdapter3D {
         xOffset = columns / 10;
         yOffset = rows / 10;
       }
+      const {
+        GraphicData
+      } = SCOORDGroup;
       const secondPoint = imageToWorldCoords(referencedImageId, [GraphicData[0] + xOffset, GraphicData[1] + yOffset]);
       worldCoords.push(secondPoint);
     }
-    const state = defaultState;
     state.annotation.data = {
+      ...state.annotation.data,
       text,
       handles: {
         arrowFirst: true,
-        points: [worldCoords[0], worldCoords[1]],
+        points: worldCoords,
         activeHandleIndex: 0,
         textBox: {
           hasMoved: false
@@ -116,7 +57,8 @@ class ArrowAnnotate extends BaseAdapter3D {
     };
     return state;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       metadata,
@@ -128,85 +70,25 @@ class ArrowAnnotate extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const {
-      points,
-      arrowFirst
-    } = data.handles;
-    let point;
-    let point2;
-    if (arrowFirst) {
-      point = points[0];
-      point2 = points[1];
-    } else {
-      point = points[1];
-      point2 = points[0];
-    }
-    const pointImage = worldToImageCoords(referencedImageId, point);
-    const pointImage2 = worldToImageCoords(referencedImageId, point2);
-    const TID300RepresentationArguments = {
-      points: [{
-        x: pointImage[0],
-        y: pointImage[1]
-      }, {
-        x: pointImage2[0],
-        y: pointImage2[1]
-      }],
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      findingSites: findingSites || [],
-      finding,
-      use3DSpatialCoordinates: false
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
-    if (!finding || finding.CodeValue !== codeValues.CORNERSTONEFREETEXT) {
-      finding = {
-        CodeValue: codeValues.CORNERSTONEFREETEXT,
-        CodingSchemeDesignator: CodingScheme.CodingSchemeDesignator,
-        CodeMeaning: data.text
-      };
-    }
-    return TID300RepresentationArguments;
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      findingSites,
-      metadata
-    } = tool;
-    let {
-      finding
-    } = tool;
     const {
       points,
       arrowFirst
     } = data.handles;
-    let point;
-    let point2;
-    if (arrowFirst) {
-      point = points[0];
-      point2 = points[1];
-    } else {
-      point = points[1];
-      point2 = points[0];
-    }
-    const pointImage = point;
-    const pointImage2 = point2;
+    const point = arrowFirst ? points[0] : points[1];
+    const point2 = arrowFirst ? points[1] : points[0];
+    const pointImage = toScoord(scoordProps, point);
+    const pointImage2 = toScoord(scoordProps, point2);
     const TID300RepresentationArguments = {
-      points: [{
-        x: pointImage[0],
-        y: pointImage[1],
-        z: pointImage[2]
-      }, {
-        x: pointImage2[0],
-        y: pointImage2[1],
-        z: pointImage2[2]
-      }],
+      points: [pointImage, pointImage2],
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       findingSites: findingSites || [],
       finding,
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
     if (!finding || finding.CodeValue !== codeValues.CORNERSTONEFREETEXT) {
       finding = {

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

@@ -26,19 +26,9 @@ export default class BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, _imageToWorldCoords: any, metadata: any, trackingIdentifier?: string): {
         description?: string;
         sopInstanceUid?: string;
-        annotation: {
-            annotationUID: string;
-            metadata: {
-                toolName: string;
-                referencedImageId?: string;
-                FrameOfReferenceUID: string;
-                label: string;
-            };
-            data?: unknown;
-        };
+        annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): TID300Arguments;
-    static getTID300RepresentationArgumentsSCOORD3D(tool: any): TID300Arguments;
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): TID300Arguments;
 }