@cornerstonejs/adapters 4.0.0-beta.3 → 4.0.0-beta.5

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

@@ -1,4 +1,7 @@
 import { utilities } from 'dcmjs';
+import 'buffer';
+import { toScoords } from '../helpers/toScoordType.js';
+import '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 
@@ -7,140 +10,51 @@ const {
   Polyline: TID300Polyline
 } = utilities.TID300;
 class RectangleROI extends BaseAdapter3D {
-  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     const {
-      defaultState,
-      NUMGroup,
-      SCOORDGroup,
-      SCOORD3DGroup,
+      state,
+      worldCoords,
+      referencedImageId,
       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
-    } = 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;
+    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const areaGroup = MeasurementGroup.ContentSequence.find(g => g.ValueType === "NUM" && g.ConceptNameCodeSequence[0].CodeMeaning === "Area");
+    const cachedStats = referencedImageId ? {
+      [`imageId:${referencedImageId}`]: {
+        area: areaGroup?.MeasuredValueSequence?.[0]?.NumericValue || 0,
+        areaUnit: areaGroup?.MeasuredValueSequence?.[0]?.MeasurementUnitsCodeSequence?.CodeValue
+      }
+    } : {};
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
-        points: [worldCoords[0], worldCoords[1], worldCoords[3], worldCoords[2]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
-      },
-      cachedStats: {
-        [`imageId:${referencedImageId}`]: {
-          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
-        }
+        ...state.annotation.data.handles,
+        points: [worldCoords[0], worldCoords[1], worldCoords[3], worldCoords[2]]
       },
+      cachedStats,
       frameNumber: ReferencedFrameNumber
     };
     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) {
+  static getTID300RepresentationArguments(tool) {
+    let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       data,
       finding,
       findingSites,
       metadata
     } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
     const {
       referencedImageId
     } = metadata;
-    if (!referencedImageId) {
-      return this.getTID300RepresentationArgumentsSCOORD3D(tool);
-    }
-    const corners = handles.points.map(point => worldToImageCoords(referencedImageId, point));
-    const {
-      area,
-      perimeter
-    } = cachedStats;
-    return {
-      points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
-      area,
-      perimeter,
-      trackingIdentifierTextValue: this.trackingIdentifierTextValue,
-      finding,
-      findingSites: findingSites || [],
-      use3DSpatialCoordinates: false
+    const scoordProps = {
+      is3DMeasurement,
+      referencedImageId
     };
-  }
-  static getTID300RepresentationArgumentsSCOORD3D(tool) {
-    const {
-      data,
-      finding,
-      findingSites,
-      metadata
-    } = tool;
-    const {
-      cachedStats = {},
-      handles
-    } = data;
-    const corners = handles.points;
+    const corners = toScoords(scoordProps, data.handles.points);
     const {
       area,
       perimeter
-    } = cachedStats;
+    } = data.cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
       area,
@@ -148,8 +62,7 @@ class RectangleROI extends BaseAdapter3D {
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],
-      ReferencedFrameOfReferenceUID: metadata.FrameOfReferenceUID,
-      use3DSpatialCoordinates: true
+      use3DSpatialCoordinates: is3DMeasurement
     };
   }
 }
@@ -159,4 +72,4 @@ _RectangleROI = RectangleROI;
   _RectangleROI.registerLegacy();
 })();
 
-export { RectangleROI as default };
+export { RectangleROI, RectangleROI as default };

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

@@ -1,28 +1,22 @@
 import BaseAdapter3D from "./BaseAdapter3D";
 declare class UltrasoundDirectional extends BaseAdapter3D {
-    static getMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, imageToWorldCoords: any, metadata: any): {
+    static getMeasurementData(measurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any): {
         description?: string;
         sopInstanceUid?: string;
-        annotation: {
-            annotationUID: string;
-            metadata: {
-                toolName: string;
-                referencedImageId?: string;
-                FrameOfReferenceUID: string;
-                label: string;
-            };
-        };
+        annotation: import("packages/tools/dist/esm/types").Annotation;
         finding?: unknown;
         findingSites?: unknown;
+        commentGroup?: any;
+        commentPositionGroup?: any;
     };
-    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,37 +7,27 @@ var _UltrasoundDirectional;
 const {
   Length: TID300Length
 } = utilities.TID300;
+const {
+  worldToImageCoords
+} = utilities$1;
 class UltrasoundDirectional extends BaseAdapter3D {
-  static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+  static getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata) {
     const {
-      defaultState,
-      SCOORDGroup,
+      state,
+      worldCoords,
       ReferencedFrameNumber
-    } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, UltrasoundDirectional.toolType);
-    const referencedImageId = defaultState.annotation.metadata.referencedImageId;
-    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;
+    } = MeasurementReport.getSetupMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
     state.annotation.data = {
+      ...state.annotation.data,
       handles: {
-        points: [worldCoords[0], worldCoords[1]],
-        activeHandleIndex: 0,
-        textBox: {
-          hasMoved: false
-        }
+        ...state.annotation.data.handles,
+        points: worldCoords
       },
-      cachedStats: {},
       frameNumber: ReferencedFrameNumber
     };
     return state;
   }
-  static getTID300RepresentationArguments(tool, worldToImageCoords) {
+  static getTID300RepresentationArguments(tool, is3DMeasurement) {
     const {
       data,
       finding,

package/dist/esm/adapters/Cornerstone3D/constants/index.d.ts

@@ -1 +1,12 @@
 export declare const NO_IMAGE_ID = "none";
+export declare const CS3D_DESIGNATOR = "99CS3D";
+export declare const TEXT_ANNOTATION_POSITION: {
+    schemeDesignator: string;
+    meaning: string;
+    value: string;
+};
+export declare const COMMENT_CODE: {
+    schemeDesignator: string;
+    meaning: string;
+    value: string;
+};

package/dist/esm/adapters/Cornerstone3D/constants/index.js

@@ -1,3 +1,14 @@
 const NO_IMAGE_ID = "none";
+const CS3D_DESIGNATOR = "99CS3D";
+const TEXT_ANNOTATION_POSITION = {
+  schemeDesignator: CS3D_DESIGNATOR,
+  meaning: "Text Annotation Position",
+  value: "TextPosition"
+};
+const COMMENT_CODE = {
+  schemeDesignator: "DCM",
+  meaning: "Comment",
+  value: "121106"
+};
 
-export { NO_IMAGE_ID };
+export { COMMENT_CODE, CS3D_DESIGNATOR, NO_IMAGE_ID, TEXT_ANNOTATION_POSITION };

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

@@ -37,6 +37,17 @@ declare const Cornerstone3DSR: {
         };
     };
     CORNERSTONE_3D_TAG: string;
+    COMMENT_CODE: {
+        schemeDesignator: string;
+        meaning: string;
+        value: string;
+    };
+    NO_IMAGE_ID: string;
+    TEXT_ANNOTATION_POSITION: {
+        schemeDesignator: string;
+        meaning: string;
+        value: string;
+    };
 };
 declare const Cornerstone3DSEG: {
     Segmentation: typeof Segmentation;

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

@@ -7,7 +7,7 @@ import Angle from './Angle.js';
 import CobbAngle from './CobbAngle.js';
 import CircleROI from './CircleROI.js';
 import EllipticalROI from './EllipticalROI.js';
-import RectangleROI from './RectangleROI.js';
+import { RectangleROI } from './RectangleROI.js';
 import Length from './Length.js';
 import PlanarFreehandROI from './PlanarFreehandROI.js';
 import Probe from './Probe.js';
@@ -17,6 +17,7 @@ import * as index from './Segmentation/index.js';
 import * as index$1 from './ParametricMap/index.js';
 import * as index$2 from './RTStruct/index.js';
 import KeyImage from './KeyImage.js';
+import { COMMENT_CODE, NO_IMAGE_ID, TEXT_ANNOTATION_POSITION } from './constants/index.js';
 
 const Cornerstone3DSR = {
   BaseAdapter3D,
@@ -34,7 +35,10 @@ const Cornerstone3DSR = {
   KeyImage,
   MeasurementReport,
   CodeScheme: CodingScheme,
-  CORNERSTONE_3D_TAG
+  CORNERSTONE_3D_TAG,
+  COMMENT_CODE,
+  NO_IMAGE_ID,
+  TEXT_ANNOTATION_POSITION
 };
 const Cornerstone3DSEG = {
   Segmentation: index

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

@@ -1,5 +1,5 @@
 import checkIfPerpendicular from './checkIfPerpendicular.js';
-import compareArrays from './compareArrays.js';
+import { utilities } from '@cornerstonejs/core';
 
 function checkOrientation(multiframe, validOrientations, sourceDataDimensions, tolerance) {
   const {
@@ -9,7 +9,7 @@ function checkOrientation(multiframe, validOrientations, sourceDataDimensions, t
   const sharedImageOrientationPatient = SharedFunctionalGroupsSequence.PlaneOrientationSequence ? SharedFunctionalGroupsSequence.PlaneOrientationSequence.ImageOrientationPatient : undefined;
   const PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[0];
   const iop = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
-  const inPlane = validOrientations.some(operation => compareArrays(iop, operation, tolerance));
+  const inPlane = validOrientations.some(operation => utilities.isEqual(iop, operation, tolerance));
   if (inPlane) {
     return "Planar";
   }

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/toArray.js

@@ -1,3 +1,3 @@
-const toArray = x => Array.isArray(x) ? x : [x];
+const toArray = x => Array.isArray(x) ? x : x !== undefined ? [x] : [];
 
 export { toArray };

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.d.ts

@@ -22,7 +22,7 @@ declare const adaptersSR: {
         Length: typeof import("./Cornerstone3D/Length").default;
         CircleROI: typeof import("./Cornerstone3D/CircleROI").default;
         EllipticalROI: typeof import("./Cornerstone3D/EllipticalROI").default;
-        RectangleROI: typeof import("./Cornerstone3D/RectangleROI").default;
+        RectangleROI: typeof import("./Cornerstone3D/RectangleROI").RectangleROI;
         ArrowAnnotate: typeof import("./Cornerstone3D/ArrowAnnotate").default;
         Probe: typeof import("./Cornerstone3D/Probe").default;
         PlanarFreehandROI: typeof import("./Cornerstone3D/PlanarFreehandROI").default;
@@ -36,6 +36,17 @@ declare const adaptersSR: {
             };
         };
         CORNERSTONE_3D_TAG: string;
+        COMMENT_CODE: {
+            schemeDesignator: string;
+            meaning: string;
+            value: string;
+        };
+        NO_IMAGE_ID: string;
+        TEXT_ANNOTATION_POSITION: {
+            schemeDesignator: string;
+            meaning: string;
+            value: string;
+        };
     };
 };
 declare const adaptersSEG: {

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 = "4.0.0-beta.3";
+export declare const version = "4.0.0-beta.5";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "4.0.0-beta.3",
+    "version": "4.0.0-beta.5",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -65,11 +65,10 @@
         "clean:deep": "yarn run clean && shx rm -rf node_modules",
         "dev": "rollup --watch  -c rollup.config.mjs",
         "build:all": "yarn build",
-        "format-check": "npx eslint ./src --quiet",
         "api-check": "echo 'No API check for this package'",
         "start": "rollup --watch -c rollup.config.mjs",
         "format": "prettier --write 'src/**/*.js' 'test/**/*.js'",
-        "lint": "eslint --fix .",
+        "lint": "oxlint .",
         "prebuild": "node ../../scripts/generate-version.js ./"
     },
     "repository": {
@@ -85,13 +84,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": "^4.0.0-beta.3",
-        "@cornerstonejs/tools": "^4.0.0-beta.3"
+        "@cornerstonejs/core": "^4.0.0-beta.5",
+        "@cornerstonejs/tools": "^4.0.0-beta.5"
     },
-    "gitHead": "31e0bdf0464c1671e8ead3146b7cd19b5a4681a8"
+    "gitHead": "c983ea46160362885b27f3c72cc84731cfe86b99"
 }

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

@@ -1 +0,0 @@
-export default function compareArrays(array1: number[], array2: number[], tolerance: number): boolean;

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

@@ -1,18 +0,0 @@
-import { utilities } from 'dcmjs';
-
-const {
-  nearlyEqual
-} = utilities.orientation;
-function compareArrays(array1, array2, tolerance) {
-  if (array1.length !== array2.length) {
-    return false;
-  }
-  for (let i = 0; i < array1.length; ++i) {
-    if (!nearlyEqual(array1[i], array2[i], tolerance)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-export { compareArrays as default };