@cornerstonejs/adapters 3.14.4 → 3.15.1

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

@@ -1,42 +1,94 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class Angle extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
-        description: any;
-        sopInstanceUid: any;
-        annotation: {
-            annotationUID: any;
-            metadata: {
-                toolName: any;
-                referencedImageId: any;
-                FrameOfReferenceUID: any;
-                label: string;
-            };
-            data: any;
+    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[];
+        findingSites: any;
+        use3DSpatialCoordinates: boolean;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArgumentsSCOORD3D(tool: 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;
     };
 }
 export default Angle;

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

@@ -12,8 +12,34 @@ class Angle extends BaseAdapter3D {
       defaultState,
       NUMGroup,
       SCOORDGroup,
+      SCOORD3DGroup,
       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
@@ -41,6 +67,32 @@ class Angle extends BaseAdapter3D {
     };
     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) {
     const {
       data,
@@ -56,7 +108,7 @@ class Angle extends BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("Angle.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const start1 = worldToImageCoords(referencedImageId, handles.points[0]);
     const middle = worldToImageCoords(referencedImageId, handles.points[1]);
@@ -85,7 +137,55 @@ class Angle extends BaseAdapter3D {
       rAngle: angle,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
-      findingSites: findingSites || []
+      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 cachedStatsKeys = Object.keys(cachedStats)[0];
+    const {
+      angle
+    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
+    return {
+      point1,
+      point2,
+      point3,
+      point4,
+      rAngle: angle,
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      finding,
+      findingSites: findingSites || [],
+      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
+      use3DSpatialCoordinates: true
     };
   }
 }

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

@@ -1,29 +1,41 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class ArrowAnnotate extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any, _trackingIdentifier: any): {
-        description: any;
-        sopInstanceUid: any;
-        annotation: {
-            annotationUID: any;
-            metadata: {
-                toolName: any;
-                referencedImageId: any;
-                FrameOfReferenceUID: any;
-                label: string;
-            };
-            data: any;
-        };
+    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;
-        findingSites: any[];
+        use3DSpatialCoordinates: boolean;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
         points: {
             x: any;
             y: any;
+            z: any;
         }[];
         trackingIdentifierTextValue: string;
         findingSites: any;
         finding: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
     };
 }
 export default ArrowAnnotate;

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

@@ -15,10 +15,69 @@ class ArrowAnnotate extends BaseAdapter3D {
     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 {
+      SCOORDGroup,
+      referencedImageId,
+      metadata,
+      imageToWorldCoords,
+      defaultState,
+      text,
+      ReferencedFrameNumber
+    } = _ref2;
     const {
       GraphicData
     } = SCOORDGroup;
@@ -70,7 +129,7 @@ class ArrowAnnotate extends BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("ArrowAnnotate.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const {
       points,
@@ -97,7 +156,57 @@ class ArrowAnnotate extends BaseAdapter3D {
       }],
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       findingSites: findingSites || [],
+      finding,
+      use3DSpatialCoordinates: false
+    };
+    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 TID300RepresentationArguments = {
+      points: [{
+        x: pointImage[0],
+        y: pointImage[1],
+        z: pointImage[2]
+      }, {
+        x: pointImage2[0],
+        y: pointImage2[1],
+        z: pointImage2[2]
+      }],
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      findingSites: findingSites || [],
+      finding,
+      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
+      use3DSpatialCoordinates: true
     };
     if (!finding || finding.CodeValue !== codeValues.CORNERSTONEFREETEXT) {
       finding = {

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

@@ -24,20 +24,29 @@ export default class BaseAdapter3D {
     static registerSubType(adapter: MeasurementAdapter, toolType: string, replace?: any): any;
     static isValidCornerstoneTrackingIdentifier(trackingIdentifier: string): boolean;
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, _imageToWorldCoords: any, metadata: any, trackingIdentifier?: string): {
-        description: any;
-        sopInstanceUid: any;
+        description?: string;
+        sopInstanceUid?: string;
         annotation: {
-            annotationUID: any;
+            annotationUID: string;
             metadata: {
-                toolName: any;
-                referencedImageId: any;
-                FrameOfReferenceUID: any;
+                toolName: string;
+                referencedImageId?: string;
+                FrameOfReferenceUID: string;
                 label: string;
             };
-            data: any;
         };
-        finding: any;
-        findingSites: any[];
+        finding?: unknown;
+        findingSites?: unknown;
     };
     static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): TID300Arguments;
+    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
+        points: {
+            x: any;
+            y: any;
+            z: any;
+        }[];
+        trackingIdentifierTextValue: string;
+        findingSites: any;
+        finding: any;
+    };
 }

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

@@ -65,7 +65,7 @@ class BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("Probe.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const {
       handles: {
@@ -87,6 +87,30 @@ class BaseAdapter3D {
     };
     return tidArguments;
   }
+  static getTID300RepresentationArgumentsSCOORD3D(tool) {
+    const {
+      data,
+      finding,
+      findingSites
+    } = tool;
+    const {
+      handles: {
+        points = []
+      }
+    } = data;
+    const point = points[0];
+    const pointXYZ = {
+      x: point[0],
+      y: point[1],
+      z: point[2]
+    };
+    return {
+      points: [pointXYZ],
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      findingSites: findingSites || [],
+      finding
+    };
+  }
 }
 
 export { BaseAdapter3D as default };

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

@@ -1,40 +1,108 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class Bidirectional extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
-        description: any;
-        sopInstanceUid: any;
-        annotation: {
-            annotationUID: any;
-            metadata: {
-                toolName: any;
-                referencedImageId: any;
-                FrameOfReferenceUID: any;
-                label: string;
-            };
-            data: any;
+    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): any;
+    static getMeasurementDataFromScoord({ longAxisNUMGroup, shortAxisNUMGroup, longAxisSCOORDGroup, shortAxisSCOORDGroup, referencedImageId, imageToWorldCoords, ReferencedFrameNumber, defaultState }: {
+        longAxisNUMGroup: any;
+        shortAxisNUMGroup: any;
+        longAxisSCOORDGroup: any;
+        shortAxisSCOORDGroup: any;
+        referencedImageId: any;
+        imageToWorldCoords: any;
+        ReferencedFrameNumber: any;
+        defaultState: any;
+    }): any;
+    static getMeasurementDataFromScoord3d({ longAxisNUMGroup, shortAxisNUMGroup, defaultState }: {
+        longAxisNUMGroup: any;
+        shortAxisNUMGroup: any;
+        defaultState: any;
+    }): any;
+    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+        longAxis: {
+            point1: {
+                x: any;
+                y: any;
+                z: any;
+            };
+            point2: {
+                x: any;
+                y: any;
+                z: any;
+            };
+        };
+        shortAxis: {
+            point1: {
+                x: any;
+                y: any;
+                z: any;
+            };
+            point2: {
+                x: any;
+                y: any;
+                z: any;
+            };
+        };
+        longAxisLength: any;
+        shortAxisLength: any;
+        trackingIdentifierTextValue: string;
+        finding: any;
+        findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
+    } | {
+        longAxis: {
+            point1: {
+                x: any;
+                y: any;
+            };
+            point2: {
+                x: any;
+                y: any;
+            };
         };
+        shortAxis: {
+            point1: {
+                x: any;
+                y: any;
+            };
+            point2: {
+                x: any;
+                y: any;
+            };
+        };
+        longAxisLength: any;
+        shortAxisLength: any;
+        trackingIdentifierTextValue: string;
         finding: any;
-        findingSites: any[];
+        findingSites: any;
+        use3DSpatialCoordinates: boolean;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArgumentsSCOORD3D({ tool, shortAxisPoints, longAxisPoints }: {
+        tool: any;
+        shortAxisPoints: any;
+        longAxisPoints: any;
+    }): {
         longAxis: {
             point1: {
                 x: any;
                 y: any;
+                z: any;
             };
             point2: {
                 x: any;
                 y: any;
+                z: any;
             };
         };
         shortAxis: {
             point1: {
                 x: any;
                 y: any;
+                z: any;
             };
             point2: {
                 x: any;
                 y: any;
+                z: any;
             };
         };
         longAxisLength: any;
@@ -42,6 +110,8 @@ declare class Bidirectional extends BaseAdapter3D {
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
     };
 }
 export default Bidirectional;