@cornerstonejs/adapters 3.31.0 → 3.31.2

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

@@ -11,34 +11,20 @@ declare class Probe extends BaseAdapter3D {
         state: any;
         SCOORD3DGroup: any;
     }): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
-        points: {
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
+        points: ({
             x: any;
             y: any;
             z: any;
-        }[];
+        } | {
+            x: number;
+            y: number;
+            z?: undefined;
+        })[];
         trackingIdentifierTextValue: string;
-        ReferencedFrameOfReferenceUID: any;
         findingSites: any;
         finding: any;
-        use3DSpatialCoordinates: boolean;
-    } | {
-        points: any;
-        trackingIdentifierTextValue: string;
-        findingSites: any;
-        finding: any;
-        use3DSpatialCoordinates: boolean;
-    };
-    static getTID300RepresentationArgumentsSCOORD3D(tool: any): {
-        points: {
-            x: any;
-            y: any;
-            z: any;
-        }[];
-        trackingIdentifierTextValue: string;
         ReferencedFrameOfReferenceUID: any;
-        findingSites: any;
-        finding: any;
         use3DSpatialCoordinates: boolean;
     };
 }

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

@@ -1,6 +1,9 @@
 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 _Probe;
 const {
@@ -83,7 +86,8 @@ class Probe extends BaseAdapter3D {
     };
     return state;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       metadata
@@ -95,54 +99,23 @@ class Probe extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const {
-      handles: {
-        points = []
-      }
-    } = data;
-    const pointsImage = points.map(point => {
-      const pointImage = worldToImageCoords(referencedImageId, point);
-      return {
-        x: pointImage[0],
-        y: pointImage[1]
-      };
-    });
-    return {
-      points: pointsImage,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      findingSites: findingSites || [],
-      finding,
-      use3DSpatialCoordinates: false
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
     const {
       handles: {
         points = []
       }
     } = data;
-    const point = points[0];
-    const pointXYZ = {
-      x: point[0],
-      y: point[1],
-      z: point[2]
-    };
+    const pointsImage = toScoords(scoordProps, points);
     return {
-      points: [pointXYZ],
+      points: pointsImage,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
       findingSites: findingSites || [],
       finding,
-      use3DSpatialCoordinates: true
+      ReferencedFrameOfReferenceUID: is3DMeasurement ? metadata.FrameOfReferenceUID : null,
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }

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

@@ -12,7 +12,7 @@ declare class RectangleROI extends BaseAdapter3D {
         SCOORD3DGroup: any;
         defaultState: any;
     }): any;
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         points: any[];
         area: any;
         perimeter: any;

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

@@ -1,4 +1,5 @@
 import { utilities } from 'dcmjs';
+import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 
@@ -6,6 +7,9 @@ var _RectangleROI;
 const {
   Polyline: TID300Polyline
 } = utilities.TID300;
+const {
+  worldToImageCoords
+} = utilities$1;
 class RectangleROI extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
     const {
@@ -93,7 +97,8 @@ class RectangleROI extends BaseAdapter3D {
     };
     return state;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       finding,
@@ -107,7 +112,7 @@ class RectangleROI extends BaseAdapter3D {
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
+    if (is3DMeasurement) {
       return this.getTID300RepresentationArgumentsSCOORD3D(tool);
     }
     const corners = handles.points.map(point => worldToImageCoords(referencedImageId, point));

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

@@ -3,27 +3,18 @@ declare class UltrasoundDirectional extends BaseAdapter3D {
     static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
         description?: string;
         sopInstanceUid?: string;
-        annotation: {
-            annotationUID: string;
-            metadata: {
-                toolName: string;
-                referencedImageId?: string;
-                FrameOfReferenceUID: string;
-                label: string;
-            };
-            data?: unknown;
-        };
+        annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
     };
-    static getTID300RepresentationArguments(tool: any, worldToImageCoords: any): {
+    static getTID300RepresentationArguments(tool: any, is3DMeasurement: any): {
         point1: {
-            x: any;
-            y: any;
+            x: number;
+            y: number;
         };
         point2: {
-            x: any;
-            y: any;
+            x: number;
+            y: number;
         };
         trackingIdentifierTextValue: string;
         finding: any;

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

@@ -1,4 +1,5 @@
 import { utilities } from 'dcmjs';
+import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 
@@ -6,6 +7,9 @@ var _UltrasoundDirectional;
 const {
   Length: TID300Length
 } = utilities.TID300;
+const {
+  worldToImageCoords
+} = utilities$1;
 class UltrasoundDirectional extends BaseAdapter3D {
   static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
     const {
@@ -24,6 +28,7 @@ class UltrasoundDirectional extends BaseAdapter3D {
     }
     const state = defaultState;
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
         points: [worldCoords[0], worldCoords[1]],
         activeHandleIndex: 0,
@@ -31,12 +36,11 @@ class UltrasoundDirectional extends BaseAdapter3D {
           hasMoved: false
         }
       },
-      cachedStats: {},
       frameNumber: ReferencedFrameNumber
     };
     return state;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool, is3DMeasurement) {
     const {
       data,
       finding,

package/dist/esm/adapters/helpers/index.d.ts

@@ -4,4 +4,7 @@ import { graphicTypeEquals } from "./graphicTypeEquals";
 import { downloadDICOMData } from "./downloadDICOMData";
 export { copyStudyTags } from "./copyStudyTags";
 export { copySeriesTags } from "./copySeriesTags";
+export * from "./toScoordType";
+export * from "./scoordToWorld";
+export * from "./toPoint3";
 export { toArray, codeMeaningEquals, graphicTypeEquals, downloadDICOMData };

package/dist/esm/adapters/helpers/index.js

@@ -4,3 +4,6 @@ export { graphicTypeEquals } from './graphicTypeEquals.js';
 export { downloadDICOMData } from './downloadDICOMData.js';
 export { copyStudyTags } from './copyStudyTags.js';
 export { copySeriesTags } from './copySeriesTags.js';
+export { setWorldToImageCoords, toScoord, toScoords } from './toScoordType.js';
+export { scoordToWorld } from './scoordToWorld.js';
+export { toPoint3 } from './toPoint3.js';

package/dist/esm/adapters/helpers/scoordToWorld.d.ts

@@ -0,0 +1,5 @@
+import { type Types } from "@cornerstonejs/core";
+export declare function scoordToWorld({ is3DMeasurement, referencedImageId }: {
+    is3DMeasurement: any;
+    referencedImageId: any;
+}, scoord: any): Types.Point3[];

package/dist/esm/adapters/helpers/scoordToWorld.js

@@ -0,0 +1,32 @@
+import { utilities } from '@cornerstonejs/core';
+
+const {
+  imageToWorldCoords
+} = utilities;
+function scoordToWorld(_ref, scoord) {
+  let {
+    is3DMeasurement,
+    referencedImageId
+  } = _ref;
+  const worldCoords = [];
+  if (is3DMeasurement) {
+    const {
+      GraphicData
+    } = scoord;
+    for (let i = 0; i < GraphicData.length; i += 3) {
+      const point = [GraphicData[i], GraphicData[i + 1], GraphicData[i + 2]];
+      worldCoords.push(point);
+    }
+  } else {
+    const {
+      GraphicData
+    } = scoord;
+    for (let i = 0; i < GraphicData.length; i += 2) {
+      const point = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
+      worldCoords.push(point);
+    }
+  }
+  return worldCoords;
+}
+
+export { scoordToWorld };

package/dist/esm/adapters/helpers/toPoint3.d.ts

@@ -0,0 +1,3 @@
+import type { Types } from "@cornerstonejs/core";
+export declare function toPoint3(flatPoints: number[]): Types.Point3[];
+export default toPoint3;

package/dist/esm/adapters/helpers/toPoint3.js

@@ -0,0 +1,18 @@
+function toPoint3(flatPoints) {
+  const points = [];
+  if (!flatPoints?.length) {
+    return points;
+  }
+  const {
+    length: n
+  } = flatPoints;
+  if (n % 3 !== 0) {
+    throw new Error(`Points array should be divisible by 3 for SCOORD3D, but contents are: ${JSON.stringify(flatPoints)} of length ${n}`);
+  }
+  for (let i = 0; i < n; i += 3) {
+    points.push([flatPoints[i], flatPoints[i + 1], flatPoints[i + 2]]);
+  }
+  return points;
+}
+
+export { toPoint3 as default, toPoint3 };

package/dist/esm/adapters/helpers/toScoordType.d.ts

@@ -0,0 +1,23 @@
+import { type Types, utilities } from "@cornerstonejs/core";
+export declare function toScoord({ is3DMeasurement, referencedImageId }: {
+    is3DMeasurement: any;
+    referencedImageId: any;
+}, point: any): {
+    x: any;
+    y: any;
+    z: any;
+} | {
+    x: number;
+    y: number;
+    z?: undefined;
+};
+export declare function toScoords(scoordArgs: any, points: Array<Types.Point3>): ({
+    x: any;
+    y: any;
+    z: any;
+} | {
+    x: number;
+    y: number;
+    z?: undefined;
+})[];
+export declare function setWorldToImageCoords(worldToImage?: typeof utilities.worldToImageCoords): void;

package/dist/esm/adapters/helpers/toScoordType.js

@@ -0,0 +1,33 @@
+import { utilities } from '@cornerstonejs/core';
+
+const {
+  worldToImageCoords: globalWorldToImageCoords
+} = utilities;
+let useWorldToImageCoords = globalWorldToImageCoords;
+function toScoord(_ref, point) {
+  let {
+    is3DMeasurement,
+    referencedImageId
+  } = _ref;
+  if (is3DMeasurement) {
+    return {
+      x: point[0],
+      y: point[1],
+      z: point[2]
+    };
+  }
+  const point2 = useWorldToImageCoords(referencedImageId, point);
+  return {
+    x: point2[0],
+    y: point2[1]
+  };
+}
+function toScoords(scoordArgs, points) {
+  return points.map(point => toScoord(scoordArgs, point));
+}
+function setWorldToImageCoords() {
+  let worldToImage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : globalWorldToImageCoords;
+  useWorldToImageCoords = worldToImage;
+}
+
+export { setWorldToImageCoords, toScoord, toScoords };

package/dist/esm/adapters/index.js

@@ -4,6 +4,7 @@ import { VTKjsSEG } from './VTKjs/index.js';
 import './enums/Events.js';
 import 'dcmjs';
 import 'buffer';
+import '@cornerstonejs/core';
 
 const adaptersSR = {
   Cornerstone: CornerstoneSR,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.31.0";
+export declare const version = "3.31.2";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.31.0",
+    "version": "3.31.2",
     "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.42.0",
+        "dcmjs": "^0.43.1",
         "gl-matrix": "^3.4.3",
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.31.0",
-        "@cornerstonejs/tools": "^3.31.0"
+        "@cornerstonejs/core": "^3.31.2",
+        "@cornerstonejs/tools": "^3.31.2"
     },
-    "gitHead": "ea3e44970a9e535db1f38c8186653ffb7376ecf9"
+    "gitHead": "43718ecc1e9a5ba7f970b9fd7213c41f152d22ee"
 }