@cornerstonejs/adapters 3.31.0 → 3.31.2

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

@@ -1,5 +1,6 @@
 import { vec3 } from 'gl-matrix';
 import { utilities } from 'dcmjs';
+import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 
@@ -7,56 +8,22 @@ var _EllipticalROI;
 const {
   Ellipse: TID300Ellipse
 } = utilities.TID300;
+const {
+  worldToImageCoords
+} = utilities$1;
 const EPSILON = 1e-4;
 class EllipticalROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
     const {
-      defaultState,
+      state,
       NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
+      scoord,
+      scoordArgs,
+      worldCoords,
+      referencedImageId,
       ReferencedFrameNumber
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType);
-    if (SCOORDGroup) {
-      return this.getMeasurementDataFromScoord({
-        defaultState,
-        SCOORDGroup,
-        imageToWorldCoords,
-        metadata,
-        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,
-      metadata,
-      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 majorAxisStart = vec3.fromValues(...pointsWorld[0]);
-    const majorAxisEnd = vec3.fromValues(...pointsWorld[1]);
-    const minorAxisStart = vec3.fromValues(...pointsWorld[2]);
-    const minorAxisEnd = vec3.fromValues(...pointsWorld[3]);
+    const [majorAxisStart, majorAxisEnd, minorAxisStart, minorAxisEnd] = worldCoords;
     const majorAxisVec = vec3.create();
     vec3.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
     vec3.normalize(majorAxisVec, majorAxisVec);
@@ -77,14 +44,15 @@ class EllipticalROI extends BaseAdapter3D {
     const absoluteOfMinorDotProduct = Math.abs(projectedMinorAxisOnColVec);
     let ellipsePoints = [];
     if (Math.abs(absoluteOfMajorDotProduct - 1) < EPSILON) {
-      ellipsePoints = [pointsWorld[0], pointsWorld[1], pointsWorld[2], pointsWorld[3]];
+      ellipsePoints = worldCoords;
     } else if (Math.abs(absoluteOfMinorDotProduct - 1) < EPSILON) {
-      ellipsePoints = [pointsWorld[2], pointsWorld[3], pointsWorld[0], pointsWorld[1]];
+      ellipsePoints = [worldCoords[2], worldCoords[3], worldCoords[0], worldCoords[1]];
     } else {
       console.warn("OBLIQUE ELLIPSE NOT YET SUPPORTED");
+      return null;
     }
-    const state = defaultState;
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
         points: [...ellipsePoints],
         activeHandleIndex: 0,
@@ -92,52 +60,19 @@ class EllipticalROI extends BaseAdapter3D {
           hasMoved: false
         }
       },
-      cachedStats: {
+      frameNumber: ReferencedFrameNumber
+    };
+    if (referencedImageId) {
+      state.annotation.data.cachedStats = {
         [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 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 majorAxisStart = vec3.fromValues(...pointsWorld[0]);
-    const majorAxisEnd = vec3.fromValues(...pointsWorld[1]);
-    const minorAxisStart = vec3.fromValues(...pointsWorld[2]);
-    const minorAxisEnd = vec3.fromValues(...pointsWorld[3]);
-    const majorAxisVec = vec3.create();
-    vec3.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
-    vec3.normalize(majorAxisVec, majorAxisVec);
-    const minorAxisVec = vec3.create();
-    vec3.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
-    vec3.normalize(minorAxisVec, minorAxisVec);
-    const state = defaultState;
-    state.annotation.data = {
-      handles: {
-        points: [majorAxisStart, majorAxisEnd, minorAxisStart, minorAxisEnd],
-        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,
@@ -152,9 +87,6 @@ class EllipticalROI extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
     let top, bottom, left, right;
     if (rotation == 90 || rotation == 270) {
       bottom = worldToImageCoords(referencedImageId, handles.points[2]);
@@ -167,8 +99,8 @@ class EllipticalROI extends BaseAdapter3D {
       left = worldToImageCoords(referencedImageId, handles.points[2]);
       right = worldToImageCoords(referencedImageId, handles.points[3]);
     }
-    const topBottomLength = Math.abs(top[1] - bottom[1]);
-    const leftRightLength = Math.abs(left[0] - right[0]);
+    const topBottomLength = Math.abs(top.y - bottom.y);
+    const leftRightLength = Math.abs(left.x - right.x);
     const points = [];
     if (topBottomLength > leftRightLength) {
       points.push({
@@ -214,91 +146,8 @@ class EllipticalROI extends BaseAdapter3D {
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
-    };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats,
-      handles
-    } = data;
-    const rotation = data.initialRotation || 0;
-    let top, bottom, left, right;
-    if (rotation == 90 || rotation == 270) {
-      bottom = handles.points[2];
-      top = handles.points[3];
-      left = handles.points[0];
-      right = handles.points[1];
-    } else {
-      top = handles.points[0];
-      bottom = handles.points[1];
-      left = handles.points[2];
-      right = handles.points[3];
-    }
-    const topBottomLength = Math.sqrt((top[0] - bottom[0]) ** 2 + (top[1] - bottom[1]) ** 2 + (top[2] - bottom[2]) ** 2);
-    const leftRightLength = Math.sqrt((left[0] - right[0]) ** 2 + (left[1] - right[1]) ** 2 + (left[2] - right[2]) ** 2);
-    const points = [];
-    if (topBottomLength > leftRightLength) {
-      points.push({
-        x: top[0],
-        y: top[1],
-        z: top[2]
-      });
-      points.push({
-        x: bottom[0],
-        y: bottom[1],
-        z: bottom[2]
-      });
-      points.push({
-        x: left[0],
-        y: left[1],
-        z: left[2]
-      });
-      points.push({
-        x: right[0],
-        y: right[1],
-        z: right[2]
-      });
-    } else {
-      points.push({
-        x: left[0],
-        y: left[1],
-        z: left[2]
-      });
-      points.push({
-        x: right[0],
-        y: right[1],
-        z: right[2]
-      });
-      points.push({
-        x: top[0],
-        y: top[1],
-        z: top[2]
-      });
-      points.push({
-        x: bottom[0],
-        y: bottom[1],
-        z: bottom[2]
-      });
-    }
-    const cachedStatsKeys = Object.keys(cachedStats)[0];
-    const {
-      area = undefined
-    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
-    return {
-      area,
-      points,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -4,22 +4,20 @@ export default class KeyImage extends Probe {
     static trackingPointIdentifier: string;
     static trackingSeriesPointIdentifier: string;
     static getMeasurementData(measurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any, trackingIdentifier: any): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        points: {
+    static getTID300RepresentationArguments(tool: any): {
+        points: ({
             x: any;
             y: any;
             z: any;
-        }[];
-        trackingIdentifierTextValue: string;
-        ReferencedFrameOfReferenceUID: any;
-        findingSites: any;
-        finding: any;
-        use3DSpatialCoordinates: boolean;
-    } | {
-        points: any;
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
+        })[];
         trackingIdentifierTextValue: string;
         findingSites: any;
         finding: any;
+        ReferencedFrameOfReferenceUID: any;
         use3DSpatialCoordinates: boolean;
     };
 }

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

@@ -14,8 +14,8 @@ class KeyImage extends Probe {
     data.isPoint = trackingIdentifier.indexOf("Point") !== -1;
     return baseData;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
-    const tid300Arguments = super.getTID300RepresentationArguments(tool, worldToImageCoords);
+  static getTID300RepresentationArguments(tool) {
+    const tid300Arguments = super.getTID300RepresentationArguments(tool);
     const {
       data
     } = tool;

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

@@ -1,59 +1,30 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 export default class Length extends BaseAdapter3D {
-    static getMeasurementDataFromScoord({ defaultState, NUMGroup, SCOORDGroup, ReferencedFrameNumber, imageToWorldCoords }: {
-        defaultState: any;
-        NUMGroup: any;
-        SCOORDGroup: any;
-        ReferencedFrameNumber: any;
-        imageToWorldCoords: any;
-    }): any;
-    static getMeasurementDataFromScoord3d({ defaultState, SCOORD3DGroup }: {
-        defaultState: any;
-        SCOORD3DGroup: any;
-    }): any;
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        point1: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        point2: {
-            x: any;
-            y: any;
-            z: any;
-        };
-        distance: any;
-        trackingIdentifierTextValue: string;
-        finding: any;
-        findingSites: any;
-        ReferencedFrameOfReferenceUID: any;
-        use3DSpatialCoordinates: boolean;
-    } | {
-        point1: {
-            x: any;
-            y: any;
-        };
-        point2: {
-            x: any;
-            y: any;
-        };
-        distance: 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;
         };
         distance: any;
         trackingIdentifierTextValue: string;

package/dist/esm/adapters/Cornerstone3D/Length.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 _Length;
 const {
@@ -8,25 +11,23 @@ const {
 } = utilities.TID300;
 const LENGTH = "Length";
 class Length extends BaseAdapter3D {
-  static getMeasurementDataFromScoord(_ref) {
-    let {
-      defaultState,
-      NUMGroup,
-      SCOORDGroup,
-      ReferencedFrameNumber,
-      imageToWorldCoords
-    } = _ref;
-    const referencedImageId = defaultState.annotation.metadata.referencedImageId;
+  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     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,
+      NUMGroup,
+      scoord,
+      scoordArgs,
+      worldCoords,
+      referencedImageId,
+      ReferencedFrameNumber
+    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const cachedStats = referencedImageId ? {
+      [`imageId:${referencedImageId}`]: {
+        length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
+      }
+    } : {};
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
         points: [worldCoords[0], worldCoords[1]],
         activeHandleIndex: 0,
@@ -34,63 +35,13 @@ class Length extends BaseAdapter3D {
           hasMoved: false
         }
       },
-      cachedStats: {
-        [`imageId:${referencedImageId}`]: {
-          length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
-        }
-      },
+      cachedStats,
       frameNumber: ReferencedFrameNumber
     };
     return state;
   }
-  static getMeasurementDataFromScoord3d(_ref2) {
-    let {
-      defaultState,
-      SCOORD3DGroup
-    } = _ref2;
-    const {
-      GraphicData
-    } = SCOORD3DGroup;
-    const worldCoords = GraphicData;
-    const state = defaultState;
-    state.annotation.data = {
-      handles: {
-        points: [worldCoords.slice(0, 3), worldCoords.slice(3, 6)],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
-      },
-      cachedStats: {}
-    };
-    return state;
-  }
-  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
-    const {
-      defaultState,
-      NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
-      ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
-    if (SCOORDGroup) {
-      return this.getMeasurementDataFromScoord({
-        defaultState,
-        NUMGroup,
-        SCOORDGroup,
-        ReferencedFrameNumber,
-        imageToWorldCoords
-      });
-    } else if (SCOORD3DGroup) {
-      return this.getMeasurementDataFromScoord3d({
-        defaultState,
-        SCOORD3DGroup
-      });
-    } else {
-      throw new Error("Can't get measurement data with missing SCOORD and SCOORD3D groups.");
-    }
-  }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       finding,
@@ -104,19 +55,12 @@ class Length extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const start = worldToImageCoords(referencedImageId, handles.points[0]);
-    const end = worldToImageCoords(referencedImageId, handles.points[1]);
-    const point1 = {
-      x: start[0],
-      y: start[1]
-    };
-    const point2 = {
-      x: end[0],
-      y: end[1]
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
+    const point1 = toScoord(scoordProps, handles.points[0]);
+    const point2 = toScoord(scoordProps, handles.points[1]);
     const {
       length: distance
     } = cachedStats[`imageId:${referencedImageId}`] || {};
@@ -127,45 +71,8 @@ class Length extends BaseAdapter3D {
       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 end = handles.points[1];
-    const point1 = {
-      x: start[0],
-      y: start[1],
-      z: start[2]
-    };
-    const point2 = {
-      x: end[0],
-      y: end[1],
-      z: end[2]
-    };
-    const cachedStatsKeys = Object.keys(cachedStats)[0];
-    const {
-      length: distance = undefined
-    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
-    return {
-      point1,
-      point2,
-      distance,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }