@cornerstonejs/adapters 0.1.4 → 0.2.0

package/package.json

@@ -1,21 +1,20 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "0.1.4",
+    "version": "0.2.0",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "src": "src/index.js",
     "main": "src/index.js",
     "files": [
-        "build",
-        "build/@cornerstonejs",
+        "dist",
         "src"
     ],
     "directories": {
         "example": "examples",
-        "build": "build"
+        "build": "dist"
     },
     "exports": {
-        ".": "./build/@cornerstonejs/adapters.js",
-        "./es": "./build/@cornerstonejs/adapters.es.js"
+        ".": "./dist/@cornerstonejs/adapters.js",
+        "./es": "./dist/@cornerstonejs/adapters.es.js"
     },
     "publishConfig": {
         "access": "public"
@@ -23,7 +22,7 @@
     "scripts": {
         "test": "jest --testTimeout 60000",
         "build": "rollup -c",
-        "build:examples": "npm run build && npx cpx 'build/**/*.{js,map}' examples/js",
+        "build:examples": "npm run build && npx cpx 'dist/**/*.{js,map}' examples/js",
         "start": "rollup -c -w",
         "format": "prettier --write 'src/**/*.js' 'test/**/*.js'",
         "lint": "eslint --fix ."
@@ -70,5 +69,5 @@
         "ndarray": "^1.0.19",
         "pako": "^2.0.4"
     },
-    "gitHead": "100fd0c005ba2a0e12ad5eb75df9b9c2127b39f1"
+    "gitHead": "4bf312b91b14fad16638d488064a0a6c097e3514"
 }

package/src/adapters/Cornerstone3D/CobbAngle.js

@@ -0,0 +1,125 @@
+import { utilities } from "dcmjs";
+import CORNERSTONE_3D_TAG from "./cornerstone3DTag";
+import MeasurementReport from "./MeasurementReport";
+
+const { CobbAngle: TID300CobbAngle } = utilities.TID300;
+
+const MEASUREMENT_TYPE = "CobbAngle";
+const trackingIdentifierTextValue = `${CORNERSTONE_3D_TAG}:${MEASUREMENT_TYPE}`;
+
+class CobbAngle {
+    // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
+    static getMeasurementData(
+        MeasurementGroup,
+        sopInstanceUIDToImageIdMap,
+        imageToWorldCoords,
+        metadata
+    ) {
+        const { defaultState, NUMGroup, SCOORDGroup, ReferencedFrameNumber } =
+            MeasurementReport.getSetupMeasurementData(
+                MeasurementGroup,
+                sopInstanceUIDToImageIdMap,
+                metadata,
+                CobbAngle.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;
+
+        state.annotation.data = {
+            handles: {
+                points: [
+                    worldCoords[0],
+                    worldCoords[1],
+                    worldCoords[2],
+                    worldCoords[3]
+                ],
+                activeHandleIndex: 0,
+                textBox: {
+                    hasMoved: false
+                }
+            },
+            cachedStats: {
+                [`imageId:${referencedImageId}`]: {
+                    angle: NUMGroup
+                        ? NUMGroup.MeasuredValueSequence.NumericValue
+                        : null
+                }
+            },
+            frameNumber: ReferencedFrameNumber
+        };
+
+        return state;
+    }
+
+    static getTID300RepresentationArguments(tool, worldToImageCoords) {
+        const { data, finding, findingSites, metadata } = tool;
+        const { cachedStats = {}, handles } = data;
+
+        const { referencedImageId } = metadata;
+
+        if (!referencedImageId) {
+            throw new Error(
+                "CobbAngle.getTID300RepresentationArguments: referencedImageId is not defined"
+            );
+        }
+
+        const start1 = worldToImageCoords(referencedImageId, handles.points[0]);
+        const end1 = worldToImageCoords(referencedImageId, handles.points[1]);
+
+        const start2 = worldToImageCoords(referencedImageId, handles.points[2]);
+        const end2 = worldToImageCoords(referencedImageId, handles.points[3]);
+
+        const point1 = { x: start1[0], y: start1[1] };
+        const point2 = { x: end1[0], y: end1[1] };
+        const point3 = { x: start2[0], y: start2[1] };
+        const point4 = { x: end2[0], y: end2[1] };
+
+        const { angle } = cachedStats[`imageId:${referencedImageId}`] || {};
+
+        return {
+            point1,
+            point2,
+            point3,
+            point4,
+            rAngle: angle,
+            trackingIdentifierTextValue,
+            finding,
+            findingSites: findingSites || []
+        };
+    }
+}
+
+CobbAngle.toolType = MEASUREMENT_TYPE;
+CobbAngle.utilityToolType = MEASUREMENT_TYPE;
+console.log("TID300CobbAngle=", TID300CobbAngle);
+CobbAngle.TID300Representation = TID300CobbAngle;
+CobbAngle.isValidCornerstoneTrackingIdentifier = TrackingIdentifier => {
+    if (!TrackingIdentifier.includes(":")) {
+        return false;
+    }
+
+    const [cornerstone3DTag, toolType] = TrackingIdentifier.split(":");
+
+    if (cornerstone3DTag !== CORNERSTONE_3D_TAG) {
+        return false;
+    }
+
+    return toolType === MEASUREMENT_TYPE;
+};
+
+MeasurementReport.registerTool(CobbAngle);
+
+export default CobbAngle;

package/src/adapters/Cornerstone3D/index.js

@@ -4,6 +4,7 @@ import CORNERSTONE_3D_TAG from "./cornerstone3DTag";
 
 import ArrowAnnotate from "./ArrowAnnotate";
 import Bidirectional from "./Bidirectional";
+import CobbAngle from "./CobbAngle";
 import EllipticalROI from "./EllipticalROI";
 import Length from "./Length";
 import PlanarFreehandROI from "./PlanarFreehandROI";
@@ -11,6 +12,7 @@ import Probe from "./Probe";
 
 const Cornerstone3D = {
     Bidirectional,
+    CobbAngle,
     Length,
     EllipticalROI,
     ArrowAnnotate,