@cornerstonejs/adapters 0.2.0 → 0.2.1

package/src/adapters/Cornerstone3D/EllipticalROI.js

@@ -1,204 +0,0 @@
-import { vec3 } from "gl-matrix";
-import { utilities } from "dcmjs";
-import CORNERSTONE_3D_TAG from "./cornerstone3DTag";
-import MeasurementReport from "./MeasurementReport";
-
-const { Ellipse: TID300Ellipse } = utilities.TID300;
-
-const ELLIPTICALROI = "EllipticalROI";
-const EPSILON = 1e-4;
-
-const trackingIdentifierTextValue = `${CORNERSTONE_3D_TAG}:${ELLIPTICALROI}`;
-
-class EllipticalROI {
-    static getMeasurementData(
-        MeasurementGroup,
-        sopInstanceUIDToImageIdMap,
-        imageToWorldCoords,
-        metadata
-    ) {
-        const { defaultState, NUMGroup, SCOORDGroup, ReferencedFrameNumber } =
-            MeasurementReport.getSetupMeasurementData(
-                MeasurementGroup,
-                sopInstanceUIDToImageIdMap,
-                metadata,
-                EllipticalROI.toolType
-            );
-
-        const referencedImageId =
-            defaultState.annotation.metadata.referencedImageId;
-
-        const { GraphicData } = SCOORDGroup;
-
-        // GraphicData is ordered as [majorAxisStartX, majorAxisStartY, majorAxisEndX, majorAxisEndY, minorAxisStartX, minorAxisStartY, minorAxisEndX, minorAxisEndY]
-        // But Cornerstone3D points are ordered as top, bottom, left, right for the
-        // ellipse so we need to identify if the majorAxis is horizontal or vertical
-        // in the image plane and then choose the correct points to use for the ellipse.
-        const pointsWorld = [];
-        for (let i = 0; i < GraphicData.length; i += 2) {
-            const worldPos = imageToWorldCoords(referencedImageId, [
-                GraphicData[i],
-                GraphicData[i + 1]
-            ]);
-
-            pointsWorld.push(worldPos);
-        }
-
-        const majorAxisStart = vec3.fromValues(...pointsWorld[0]);
-        const majorAxisEnd = vec3.fromValues(...pointsWorld[1]);
-        const minorAxisStart = vec3.fromValues(...pointsWorld[2]);
-        const minorAxisEnd = vec3.fromValues(...pointsWorld[3]);
-
-        const majorAxisVec = vec3.create();
-        vec3.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
-
-        // normalize majorAxisVec to avoid scaling issues
-        vec3.normalize(majorAxisVec, majorAxisVec);
-
-        const minorAxisVec = vec3.create();
-        vec3.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
-        vec3.normalize(minorAxisVec, minorAxisVec);
-
-        const imagePlaneModule = metadata.get(
-            "imagePlaneModule",
-            referencedImageId
-        );
-
-        if (!imagePlaneModule) {
-            throw new Error("imageId does not have imagePlaneModule metadata");
-        }
-
-        const { columnCosines } = imagePlaneModule;
-
-        // find which axis is parallel to the columnCosines
-        const columnCosinesVec = vec3.fromValues(...columnCosines);
-
-        const projectedMajorAxisOnColVec = vec3.dot(
-            columnCosinesVec,
-            majorAxisVec
-        );
-
-        const projectedMinorAxisOnColVec = vec3.dot(
-            columnCosinesVec,
-            minorAxisVec
-        );
-
-        const absoluteOfMajorDotProduct = Math.abs(projectedMajorAxisOnColVec);
-        const absoluteOfMinorDotProduct = Math.abs(projectedMinorAxisOnColVec);
-
-        let ellipsePoints = [];
-        if (Math.abs(absoluteOfMajorDotProduct - 1) < EPSILON) {
-            ellipsePoints = [
-                pointsWorld[0],
-                pointsWorld[1],
-                pointsWorld[2],
-                pointsWorld[3]
-            ];
-        } else if (Math.abs(absoluteOfMinorDotProduct - 1) < EPSILON) {
-            ellipsePoints = [
-                pointsWorld[2],
-                pointsWorld[3],
-                pointsWorld[0],
-                pointsWorld[1]
-            ];
-        } else {
-            console.warn("OBLIQUE ELLIPSE NOT YET SUPPORTED");
-        }
-
-        const state = defaultState;
-
-        state.annotation.data = {
-            handles: {
-                points: [...ellipsePoints],
-                activeHandleIndex: 0,
-                textBox: {
-                    hasMoved: false
-                }
-            },
-            cachedStats: {
-                [`imageId:${referencedImageId}`]: {
-                    area: NUMGroup
-                        ? NUMGroup.MeasuredValueSequence.NumericValue
-                        : 0
-                }
-            },
-            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(
-                "EllipticalROI.getTID300RepresentationArguments: referencedImageId is not defined"
-            );
-        }
-
-        const top = worldToImageCoords(referencedImageId, handles.points[0]);
-        const bottom = worldToImageCoords(referencedImageId, handles.points[1]);
-        const left = worldToImageCoords(referencedImageId, handles.points[2]);
-        const right = worldToImageCoords(referencedImageId, handles.points[3]);
-
-        // find the major axis and minor axis
-        const topBottomLength = Math.abs(top[1] - bottom[1]);
-        const leftRightLength = Math.abs(left[0] - right[0]);
-
-        let points = [];
-        if (topBottomLength > leftRightLength) {
-            // major axis is bottom to top
-            points.push({ x: top[0], y: top[1] });
-            points.push({ x: bottom[0], y: bottom[1] });
-
-            // minor axis is left to right
-            points.push({ x: left[0], y: left[1] });
-            points.push({ x: right[0], y: right[1] });
-        } else {
-            // major axis is left to right
-            points.push({ x: left[0], y: left[1] });
-            points.push({ x: right[0], y: right[1] });
-
-            // minor axis is bottom to top
-            points.push({ x: top[0], y: top[1] });
-            points.push({ x: bottom[0], y: bottom[1] });
-        }
-
-        const { area } = cachedStats[`imageId:${referencedImageId}`] || {};
-
-        return {
-            area,
-            points,
-            trackingIdentifierTextValue,
-            finding,
-            findingSites: findingSites || []
-        };
-    }
-}
-
-EllipticalROI.toolType = ELLIPTICALROI;
-EllipticalROI.utilityToolType = ELLIPTICALROI;
-EllipticalROI.TID300Representation = TID300Ellipse;
-EllipticalROI.isValidCornerstoneTrackingIdentifier = TrackingIdentifier => {
-    if (!TrackingIdentifier.includes(":")) {
-        return false;
-    }
-
-    const [cornerstone3DTag, toolType] = TrackingIdentifier.split(":");
-
-    if (cornerstone3DTag !== CORNERSTONE_3D_TAG) {
-        return false;
-    }
-
-    // The following is needed since the new cornerstone3D has changed
-    // the EllipticalRoi toolName (which was in the old cornerstone) to EllipticalROI
-    return toolType.toLowerCase() === ELLIPTICALROI.toLowerCase();
-};
-
-MeasurementReport.registerTool(EllipticalROI);
-
-export default EllipticalROI;

package/src/adapters/Cornerstone3D/Length.js

@@ -1,113 +0,0 @@
-import { utilities } from "dcmjs";
-import CORNERSTONE_3D_TAG from "./cornerstone3DTag";
-import MeasurementReport from "./MeasurementReport";
-
-const { Length: TID300Length } = utilities.TID300;
-
-const LENGTH = "Length";
-const trackingIdentifierTextValue = `${CORNERSTONE_3D_TAG}:${LENGTH}`;
-
-class Length {
-    // 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,
-                Length.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]],
-                activeHandleIndex: 0,
-                textBox: {
-                    hasMoved: false
-                }
-            },
-            cachedStats: {
-                [`imageId:${referencedImageId}`]: {
-                    length: NUMGroup
-                        ? NUMGroup.MeasuredValueSequence.NumericValue
-                        : 0
-                }
-            },
-            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(
-                "Length.getTID300RepresentationArguments: referencedImageId is not defined"
-            );
-        }
-
-        const start = worldToImageCoords(referencedImageId, handles.points[0]);
-        const end = worldToImageCoords(referencedImageId, handles.points[1]);
-
-        const point1 = { x: start[0], y: start[1] };
-        const point2 = { x: end[0], y: end[1] };
-
-        const { length: distance } =
-            cachedStats[`imageId:${referencedImageId}`] || {};
-
-        return {
-            point1,
-            point2,
-            distance,
-            trackingIdentifierTextValue,
-            finding,
-            findingSites: findingSites || []
-        };
-    }
-}
-
-Length.toolType = LENGTH;
-Length.utilityToolType = LENGTH;
-Length.TID300Representation = TID300Length;
-Length.isValidCornerstoneTrackingIdentifier = TrackingIdentifier => {
-    if (!TrackingIdentifier.includes(":")) {
-        return false;
-    }
-
-    const [cornerstone3DTag, toolType] = TrackingIdentifier.split(":");
-
-    if (cornerstone3DTag !== CORNERSTONE_3D_TAG) {
-        return false;
-    }
-
-    return toolType === LENGTH;
-};
-
-MeasurementReport.registerTool(Length);
-
-export default Length;