@cornerstonejs/adapters 0.4.1 → 0.5.0

package/dist/@cornerstonejs/adapters.es.js

@@ -1028,8 +1028,8 @@ EllipticalRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifie
 
 MeasurementReport$1.registerTool(EllipticalRoi);
 
-var TID300Circle = utilities.TID300.Circle;
-var CIRCLEROI = "CircleRoi";
+var TID300Circle$1 = utilities.TID300.Circle;
+var CIRCLEROI$1 = "CircleRoi";
 
 var CircleRoi = /*#__PURE__*/function () {
   function CircleRoi() {
@@ -1128,9 +1128,9 @@ var CircleRoi = /*#__PURE__*/function () {
   return CircleRoi;
 }();
 
-CircleRoi.toolType = CIRCLEROI;
-CircleRoi.utilityToolType = CIRCLEROI;
-CircleRoi.TID300Representation = TID300Circle;
+CircleRoi.toolType = CIRCLEROI$1;
+CircleRoi.utilityToolType = CIRCLEROI$1;
+CircleRoi.TID300Representation = TID300Circle$1;
 
 CircleRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
   if (!TrackingIdentifier.includes(":")) {
@@ -1146,7 +1146,7 @@ CircleRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
     return false;
   }
 
-  return toolType === CIRCLEROI;
+  return toolType === CIRCLEROI$1;
 };
 
 MeasurementReport$1.registerTool(CircleRoi);
@@ -3428,7 +3428,8 @@ var MeasurementReport = /** @class */ (function () {
                     referencedImageId: referencedImageId,
                     FrameOfReferenceUID: imagePlaneModule.frameOfReferenceUID,
                     label: ""
-                }
+                },
+                data: undefined
             },
             finding: finding,
             findingSites: findingSites
@@ -4032,6 +4033,88 @@ function isValidCornerstoneTrackingIdentifier(trackingIdentifier) {
     return toolType.toLowerCase() === this.toolType.toLowerCase();
 }
 
+var TID300Circle = utilities.TID300.Circle;
+var CIRCLEROI = "CircleROI";
+var CircleROI = /** @class */ (function () {
+    function CircleROI() {
+    }
+    /** Gets the measurement data for cornerstone, given DICOM SR measurement data. */
+    CircleROI.getMeasurementData = function (MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+        var _a;
+        var _b = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CircleROI.toolType), defaultState = _b.defaultState, NUMGroup = _b.NUMGroup, SCOORDGroup = _b.SCOORDGroup, ReferencedFrameNumber = _b.ReferencedFrameNumber;
+        var referencedImageId = defaultState.annotation.metadata.referencedImageId;
+        var GraphicData = SCOORDGroup.GraphicData;
+        // GraphicData is ordered as [centerX, centerY, endX, endY]
+        var pointsWorld = [];
+        for (var i = 0; i < GraphicData.length; i += 2) {
+            var worldPos = imageToWorldCoords(referencedImageId, [
+                GraphicData[i],
+                GraphicData[i + 1]
+            ]);
+            pointsWorld.push(worldPos);
+        }
+        var state = defaultState;
+        state.annotation.data = {
+            handles: {
+                points: __spreadArray([], pointsWorld, true),
+                activeHandleIndex: 0,
+                textBox: {
+                    hasMoved: false
+                }
+            },
+            cachedStats: (_a = {},
+                _a["imageId:".concat(referencedImageId)] = {
+                    area: NUMGroup
+                        ? NUMGroup.MeasuredValueSequence.NumericValue
+                        : 0,
+                    // Dummy values to be updated by cornerstone
+                    radius: 0,
+                    perimeter: 0
+                },
+                _a),
+            frameNumber: ReferencedFrameNumber
+        };
+        return state;
+    };
+    /**
+     * Gets the TID 300 representation of a circle, given the cornerstone representation.
+     *
+     * @param {Object} tool
+     * @returns
+     */
+    CircleROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
+        var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
+        var _a = data.cachedStats, cachedStats = _a === void 0 ? {} : _a, handles = data.handles;
+        var referencedImageId = metadata.referencedImageId;
+        if (!referencedImageId) {
+            throw new Error("CircleROI.getTID300RepresentationArguments: referencedImageId is not defined");
+        }
+        var center = worldToImageCoords(referencedImageId, handles.points[0]);
+        var end = worldToImageCoords(referencedImageId, handles.points[1]);
+        var points = [];
+        points.push({ x: center[0], y: center[1] });
+        points.push({ x: end[0], y: end[1] });
+        var _b = cachedStats["imageId:".concat(referencedImageId)] || {}, area = _b.area, radius = _b.radius;
+        var perimeter = 2 * Math.PI * radius;
+        return {
+            area: area,
+            perimeter: perimeter,
+            radius: radius,
+            points: points,
+            trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+            finding: finding,
+            findingSites: findingSites || []
+        };
+    };
+    CircleROI.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(CIRCLEROI);
+    CircleROI.toolType = CIRCLEROI;
+    CircleROI.utilityToolType = CIRCLEROI;
+    CircleROI.TID300Representation = TID300Circle;
+    CircleROI.isValidCornerstoneTrackingIdentifier = isValidCornerstoneTrackingIdentifier;
+    return CircleROI;
+}());
+MeasurementReport.registerTool(CircleROI);
+
 var TID300Ellipse = utilities.TID300.Ellipse;
 var ELLIPTICALROI = "EllipticalROI";
 var EPSILON = 1e-4;
@@ -4120,14 +4203,25 @@ var EllipticalROI = /** @class */ (function () {
     EllipticalROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
         var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
         var _a = data.cachedStats, cachedStats = _a === void 0 ? {} : _a, handles = data.handles;
+        var rotation = data.initialRotation || 0;
         var referencedImageId = metadata.referencedImageId;
         if (!referencedImageId) {
             throw new Error("EllipticalROI.getTID300RepresentationArguments: referencedImageId is not defined");
         }
-        var top = worldToImageCoords(referencedImageId, handles.points[0]);
-        var bottom = worldToImageCoords(referencedImageId, handles.points[1]);
-        var left = worldToImageCoords(referencedImageId, handles.points[2]);
-        var right = worldToImageCoords(referencedImageId, handles.points[3]);
+        var top, bottom, left, right;
+        // this way when it's restored we can assume the initial rotation is 0.
+        if (rotation == 90 || rotation == 270) {
+            bottom = worldToImageCoords(referencedImageId, handles.points[2]);
+            top = worldToImageCoords(referencedImageId, handles.points[3]);
+            left = worldToImageCoords(referencedImageId, handles.points[0]);
+            right = worldToImageCoords(referencedImageId, handles.points[1]);
+        }
+        else {
+            top = worldToImageCoords(referencedImageId, handles.points[0]);
+            bottom = worldToImageCoords(referencedImageId, handles.points[1]);
+            left = worldToImageCoords(referencedImageId, handles.points[2]);
+            right = worldToImageCoords(referencedImageId, handles.points[3]);
+        }
         // find the major axis and minor axis
         var topBottomLength = Math.abs(top[1] - bottom[1]);
         var leftRightLength = Math.abs(left[0] - right[0]);
@@ -4554,6 +4648,7 @@ var Cornerstone3D = {
     CobbAngle: CobbAngle,
     Angle: Angle,
     Length: Length,
+    CircleROI: CircleROI,
     EllipticalROI: EllipticalROI,
     RectangleROI: RectangleROI,
     ArrowAnnotate: ArrowAnnotate,