@cornerstonejs/adapters 3.14.4 → 3.15.0

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

@@ -21,9 +21,39 @@ class Bidirectional extends BaseAdapter3D {
       ContentSequence
     } = MeasurementGroup;
     const longAxisNUMGroup = toArray(ContentSequence).find(group => group.ConceptNameCodeSequence.CodeMeaning === LONG_AXIS);
-    const longAxisSCOORDGroup = toArray(longAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD");
     const shortAxisNUMGroup = toArray(ContentSequence).find(group => group.ConceptNameCodeSequence.CodeMeaning === SHORT_AXIS);
+    const longAxisSCOORDGroup = toArray(longAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD");
     const shortAxisSCOORDGroup = toArray(shortAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD");
+    if (longAxisSCOORDGroup && shortAxisSCOORDGroup) {
+      return this.getMeasurementDataFromScoord({
+        longAxisNUMGroup,
+        shortAxisNUMGroup,
+        longAxisSCOORDGroup,
+        shortAxisSCOORDGroup,
+        referencedImageId,
+        imageToWorldCoords,
+        ReferencedFrameNumber,
+        defaultState
+      });
+    } else {
+      return this.getMeasurementDataFromScoord3d({
+        longAxisNUMGroup,
+        shortAxisNUMGroup,
+        defaultState
+      });
+    }
+  }
+  static getMeasurementDataFromScoord(_ref) {
+    let {
+      longAxisNUMGroup,
+      shortAxisNUMGroup,
+      longAxisSCOORDGroup,
+      shortAxisSCOORDGroup,
+      referencedImageId,
+      imageToWorldCoords,
+      ReferencedFrameNumber,
+      defaultState
+    } = _ref;
     const worldCoords = [];
     [longAxisSCOORDGroup, shortAxisSCOORDGroup].forEach(group => {
       const {
@@ -53,6 +83,37 @@ class Bidirectional extends BaseAdapter3D {
     };
     return state;
   }
+  static getMeasurementDataFromScoord3d(_ref2) {
+    let {
+      longAxisNUMGroup,
+      shortAxisNUMGroup,
+      defaultState
+    } = _ref2;
+    const worldCoords = [];
+    const longAxisSCOORD3DGroup = toArray(longAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD3D");
+    const shortAxisSCOORD3DGroup = toArray(shortAxisNUMGroup.ContentSequence).find(group => group.ValueType === "SCOORD3D");
+    [longAxisSCOORD3DGroup, shortAxisSCOORD3DGroup].forEach(group => {
+      const {
+        GraphicData
+      } = group;
+      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) {
     const {
       data,
@@ -67,13 +128,6 @@ class Bidirectional extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      throw new Error("Bidirectional.getTID300RepresentationArguments: referencedImageId is not defined");
-    }
-    const {
-      length,
-      width
-    } = cachedStats[`imageId:${referencedImageId}`] || {};
     const {
       points
     } = handles;
@@ -90,10 +144,21 @@ class Bidirectional extends BaseAdapter3D {
       shortAxisPoints = secondPointPairs;
       longAxisPoints = firstPointPairs;
     }
+    if (!referencedImageId) {
+      return this.getTID300RepresentationArgumentsSCOORD3D({
+        tool,
+        shortAxisPoints,
+        longAxisPoints
+      });
+    }
     const longAxisStartImage = worldToImageCoords(referencedImageId, shortAxisPoints[0]);
     const longAxisEndImage = worldToImageCoords(referencedImageId, shortAxisPoints[1]);
     const shortAxisStartImage = worldToImageCoords(referencedImageId, longAxisPoints[0]);
     const shortAxisEndImage = worldToImageCoords(referencedImageId, longAxisPoints[1]);
+    const {
+      length,
+      width
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       longAxis: {
         point1: {
@@ -119,7 +184,66 @@ class Bidirectional extends BaseAdapter3D {
       shortAxisLength: width,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding: finding,
-      findingSites: findingSites || []
+      findingSites: findingSites || [],
+      use3DSpatialCoordinates: false
+    };
+  }
+  static getTID300RepresentationArgumentsSCOORD3D(_ref3) {
+    let {
+      tool,
+      shortAxisPoints,
+      longAxisPoints
+    } = _ref3;
+    const {
+      data,
+      finding,
+      findingSites,
+      metadata
+    } = tool;
+    const {
+      cachedStats = {}
+    } = data;
+    const longAxisStart = shortAxisPoints[0];
+    const longAxisEnd = shortAxisPoints[1];
+    const shortAxisStart = longAxisPoints[0];
+    const shortAxisEnd = longAxisPoints[1];
+    const cachedStatsKeys = Object.keys(cachedStats)[0];
+    const {
+      length,
+      width
+    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
+    return {
+      longAxis: {
+        point1: {
+          x: longAxisStart[0],
+          y: longAxisStart[1],
+          z: longAxisStart[2]
+        },
+        point2: {
+          x: longAxisEnd[0],
+          y: longAxisEnd[1],
+          z: longAxisEnd[2]
+        }
+      },
+      shortAxis: {
+        point1: {
+          x: shortAxisStart[0],
+          y: shortAxisStart[1],
+          z: shortAxisStart[2]
+        },
+        point2: {
+          x: shortAxisEnd[0],
+          y: shortAxisEnd[1],
+          z: shortAxisEnd[2]
+        }
+      },
+      longAxisLength: length,
+      shortAxisLength: width,
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      finding: finding,
+      findingSites: findingSites || [],
+      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
+      use3DSpatialCoordinates: true
     };
   }
 }

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

@@ -1,22 +1,38 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class CircleROI 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): {
+        area: any;
+        perimeter: number;
+        radius: any;
+        points: any[];
+        trackingIdentifierTextValue: string;
         finding: any;
-        findingSites: any[];
+        findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
+    } | {
+        area: any;
+        perimeter: number;
+        radius: any;
+        points: any[];
+        trackingIdentifierTextValue: string;
+        finding: any;
+        findingSites: any;
+        use3DSpatialCoordinates: boolean;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
         area: any;
         perimeter: number;
         radius: any;
@@ -24,6 +40,8 @@ declare class CircleROI extends BaseAdapter3D {
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
     };
 }
 export default CircleROI;

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

@@ -12,8 +12,34 @@ class CircleROI extends BaseAdapter3D {
       defaultState,
       NUMGroup,
       SCOORDGroup,
+      SCOORD3DGroup,
       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
@@ -43,6 +69,32 @@ class CircleROI extends BaseAdapter3D {
     };
     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) {
     const {
       data,
@@ -58,7 +110,7 @@ class CircleROI extends BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("CircleROI.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const center = worldToImageCoords(referencedImageId, handles.points[0]);
     const end = worldToImageCoords(referencedImageId, handles.points[1]);
@@ -83,7 +135,50 @@ class CircleROI extends BaseAdapter3D {
       points,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
-      findingSites: findingSites || []
+      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,
+      radius
+    } = cachedStatsKeys ? cachedStats[cachedStatsKeys] : {};
+    const perimeter = 2 * Math.PI * radius;
+    return {
+      area,
+      perimeter,
+      radius,
+      points,
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      finding,
+      findingSites: findingSites || [],
+      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
+      use3DSpatialCoordinates: true
     };
   }
 }

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

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

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

@@ -12,8 +12,34 @@ class CobbAngle extends BaseAdapter3D {
       defaultState,
       NUMGroup,
       SCOORDGroup,
+      SCOORD3DGroup,
       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
@@ -41,6 +67,32 @@ class CobbAngle 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[2], worldCoords[3]],
+        activeHandleIndex: 0,
+        textBox: {
+          hasMoved: false
+        }
+      },
+      cachedStats: {}
+    };
+    return state;
+  }
   static getTID300RepresentationArguments(tool, worldToImageCoords) {
     const {
       data,
@@ -56,7 +108,7 @@ class CobbAngle extends BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("CobbAngle.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const start1 = worldToImageCoords(referencedImageId, handles.points[0]);
     const end1 = worldToImageCoords(referencedImageId, handles.points[1]);
@@ -89,7 +141,60 @@ class CobbAngle 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 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
+    } = 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/EllipticalROI.d.ts

@@ -1,27 +1,42 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class EllipticalROI 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, 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[];
+        findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
+    } | {
+        area: any;
+        points: any[];
+        trackingIdentifierTextValue: string;
+        finding: any;
+        findingSites: any;
+        use3DSpatialCoordinates: boolean;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
         area: any;
         points: any[];
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;
+        ReferencedFrameOfReferenceUID: any;
+        use3DSpatialCoordinates: boolean;
     };
 }
 export default EllipticalROI;