@cornerstonejs/adapters 3.31.0 → 3.31.2

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

@@ -1,101 +1,49 @@
 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 _CircleROI;
 const {
   Circle: TID300Circle
 } = utilities.TID300;
 class CircleROI extends BaseAdapter3D {
-  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     const {
-      defaultState,
+      state,
       NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
+      scoord,
+      scoordArgs,
+      worldCoords,
+      referencedImageId,
       ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CircleROI.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 pointsWorld = [];
-    for (let i = 0; i < GraphicData.length; i += 2) {
-      const worldPos = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
-      pointsWorld.push(worldPos);
-    }
-    const state = defaultState;
+    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
-        points: [...pointsWorld],
+        points: worldCoords,
         activeHandleIndex: 0,
         textBox: {
           hasMoved: false
         }
       },
-      cachedStats: {
+      frameNumber: ReferencedFrameNumber
+    };
+    if (referencedImageId) {
+      state.annotation.data.cachedStats = {
         [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
           radius: 0,
           perimeter: 0
         }
-      },
-      frameNumber: ReferencedFrameNumber
-    };
-    return state;
-  }
-  static getMeasurementDataFromScoord3D(_ref2) {
-    let {
-      defaultState,
-      SCOORD3DGroup
-    } = _ref2;
-    const {
-      GraphicData
-    } = SCOORD3DGroup;
-    const pointsWorld = [];
-    for (let i = 0; i < GraphicData.length; i += 3) {
-      const worldPos = [GraphicData[i], GraphicData[i + 1], GraphicData[i + 2]];
-      pointsWorld.push(worldPos);
+      };
     }
-    const state = defaultState;
-    state.annotation.data = {
-      handles: {
-        points: [...pointsWorld],
-        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,
@@ -109,20 +57,12 @@ class CircleROI extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const center = worldToImageCoords(referencedImageId, handles.points[0]);
-    const end = worldToImageCoords(referencedImageId, handles.points[1]);
-    const points = [];
-    points.push({
-      x: center[0],
-      y: center[1]
-    });
-    points.push({
-      x: end[0],
-      y: end[1]
-    });
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
+    };
+    const center = toScoord(scoordProps, handles.points[0]);
+    const end = toScoord(scoordProps, handles.points[1]);
     const {
       area,
       radius
@@ -132,53 +72,12 @@ class CircleROI extends BaseAdapter3D {
       area,
       perimeter,
       radius,
-      points,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
-    };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const center = handles.points[0];
-    const end = handles.points[1];
-    const points = [];
-    points.push({
-      x: center[0],
-      y: center[1],
-      z: center[2]
-    });
-    points.push({
-      x: end[0],
-      y: end[1],
-      z: center[2]
-    });
-    const cachedStatsKeys = Object.keys(cachedStats)[0];
-    const {
-      area = undefined,
-      radius = 0
-    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
-    const perimeter = 2 * Math.PI * radius;
-    return {
-      area,
-      perimeter,
-      radius,
-      points,
+      points: [center, end],
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -1,87 +1,48 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class CobbAngle 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, 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/CobbAngle.js

@@ -1,56 +1,25 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
+import 'buffer';
+import { toScoords } from '../helpers/toScoordType.js';
+import '@cornerstonejs/core';
 
 var _CobbAngle;
 const {
   CobbAngle: TID300CobbAngle
 } = utilities.TID300;
 class CobbAngle extends BaseAdapter3D {
-  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     const {
-      defaultState,
+      state,
       NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
+      referencedImageId,
+      worldCoords,
       ReferencedFrameNumber
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CobbAngle.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;
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
         points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]],
         activeHandleIndex: 0,
@@ -58,42 +27,19 @@ class CobbAngle extends BaseAdapter3D {
           hasMoved: false
         }
       },
-      cachedStats: {
+      frameNumber: ReferencedFrameNumber
+    };
+    if (referencedImageId) {
+      state.annotation.data.cachedStats = {
         [`imageId:${referencedImageId}`]: {
           angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
         }
-      },
-      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[2], 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,29 +53,12 @@ class CobbAngle extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const start1 = worldToImageCoords(referencedImageId, handles.points[0]);
-    const end1 = worldToImageCoords(referencedImageId, handles.points[1]);
-    const start2 = worldToImageCoords(referencedImageId, handles.points[2]);
-    const end2 = worldToImageCoords(referencedImageId, handles.points[3]);
-    const point1 = {
-      x: start1[0],
-      y: start1[1]
-    };
-    const point2 = {
-      x: end1[0],
-      y: end1[1]
-    };
-    const point3 = {
-      x: start2[0],
-      y: start2[1]
-    };
-    const point4 = {
-      x: end2[0],
-      y: end2[1]
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
+    const points = toScoords(scoordProps, handles.points);
+    const [point1, point2, point3, point4] = points;
     const {
       angle
     } = cachedStats[`imageId:${referencedImageId}`] || {};
@@ -142,59 +71,8 @@ class CobbAngle extends BaseAdapter3D {
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
-    };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const start1 = handles.points[0];
-    const end1 = handles.points[1];
-    const start2 = handles.points[2];
-    const end2 = handles.points[3];
-    const point1 = {
-      x: start1[0],
-      y: start1[1],
-      z: start1[2]
-    };
-    const point2 = {
-      x: end1[0],
-      y: end1[1],
-      z: end1[2]
-    };
-    const point3 = {
-      x: start2[0],
-      y: start2[1],
-      z: start2[2]
-    };
-    const point4 = {
-      x: end2[0],
-      y: end2[1],
-      z: end2[2]
-    };
-    const cachedStatsKeys = Object.keys(cachedStats)[0];
-    const {
-      angle = undefined
-    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
-    return {
-      point1,
-      point2,
-      point3,
-      point4,
-      rAngle: angle,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -1,35 +1,13 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class EllipticalROI extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): any;
-    static getMeasurementDataFromScoord({ defaultState, SCOORDGroup, imageToWorldCoords, metadata, NUMGroup, ReferencedFrameNumber }: {
-        defaultState: any;
-        SCOORDGroup: any;
-        imageToWorldCoords: any;
-        metadata: any;
-        NUMGroup: any;
-        ReferencedFrameNumber: any;
-    }): any;
-    static getMeasurementDataFromScoord3D({ defaultState, SCOORD3DGroup }: {
-        defaultState: any;
-        SCOORD3DGroup: any;
-    }): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        area: any;
-        points: any[];
-        trackingIdentifierTextValue: string;
-        finding: any;
-        findingSites: any;
-        ReferencedFrameOfReferenceUID: any;
-        use3DSpatialCoordinates: boolean;
-    } | {
-        area: any;
-        points: 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): {
         area: any;
         points: any[];
         trackingIdentifierTextValue: string;