@cornerstonejs/adapters 3.14.3 → 3.15.0

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

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

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

@@ -12,8 +12,34 @@ class RectangleROI extends BaseAdapter3D {
       defaultState,
       NUMGroup,
       SCOORDGroup,
+      SCOORD3DGroup,
       ReferencedFrameNumber
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, RectangleROI.toolType);
+    if (SCOORDGroup) {
+      return this.getMeasurementDataFromScoord({
+        defaultState,
+        SCOORDGroup,
+        imageToWorldCoords,
+        NUMGroup,
+        ReferencedFrameNumber
+      });
+    } else if (SCOORD3DGroup) {
+      return this.getMeasurementDataFromScoord3D({
+        SCOORD3DGroup,
+        defaultState
+      });
+    } 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 RectangleROI extends BaseAdapter3D {
     };
     return state;
   }
+  static getMeasurementDataFromScoord3D(_ref2) {
+    let {
+      SCOORD3DGroup,
+      defaultState
+    } = _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], worldCoords[2]],
+        activeHandleIndex: 0,
+        textBox: {
+          hasMoved: false
+        }
+      },
+      cachedStats: {}
+    };
+    return state;
+  }
   static getTID300RepresentationArguments(tool, worldToImageCoords) {
     const {
       data,
@@ -56,7 +108,7 @@ class RectangleROI extends BaseAdapter3D {
       referencedImageId
     } = metadata;
     if (!referencedImageId) {
-      throw new Error("CobbAngle.getTID300RepresentationArguments: referencedImageId is not defined");
+      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const corners = handles.points.map(point => worldToImageCoords(referencedImageId, point));
     const {
@@ -69,7 +121,35 @@ class RectangleROI extends BaseAdapter3D {
       perimeter,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
-      findingSites: findingSites || []
+      findingSites: findingSites || [],
+      use3DSpatialCoordinates: false
+    };
+  }
+  static getTID300RepresentationArgumentsSCOORD3D(tool) {
+    const {
+      data,
+      finding,
+      findingSites,
+      metadata
+    } = tool;
+    const {
+      cachedStats = {},
+      handles
+    } = data;
+    const corners = handles.points;
+    const {
+      area,
+      perimeter
+    } = cachedStats;
+    return {
+      points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
+      area,
+      perimeter,
+      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+      finding,
+      findingSites: findingSites || [],
+      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
+      use3DSpatialCoordinates: true
     };
   }
 }

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

@@ -1,20 +1,19 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class UltrasoundDirectional extends BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
-        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): {
         point1: {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.14.3";
+export declare const version = "3.15.0";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.14.3",
+    "version": "3.15.0",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -85,13 +85,13 @@
     "dependencies": {
         "@babel/runtime-corejs2": "^7.17.8",
         "buffer": "^6.0.3",
-        "dcmjs": "^0.29.8",
+        "dcmjs": "^0.40.0",
         "gl-matrix": "^3.4.3",
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.14.3",
-        "@cornerstonejs/tools": "^3.14.3"
+        "@cornerstonejs/core": "^3.15.0",
+        "@cornerstonejs/tools": "^3.15.0"
     },
-    "gitHead": "902ff8c03f0bb19963532fcf6286155ecbdd2d98"
+    "gitHead": "77edfa9761d0f7dcf841386dd453dca9fbc83ca9"
 }