@cornerstonejs/tools 3.15.5 → 3.15.6

package/dist/esm/tools/annotation/EllipticalROITool.js

@@ -18,6 +18,7 @@ import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnota
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
+import { vec2 } from 'gl-matrix';
 const { transformWorldToIndex } = csUtils;
 class EllipticalROITool extends AnnotationTool {
     static { this.toolName = 'EllipticalROI'; }
@@ -104,19 +105,22 @@ class EllipticalROITool extends AnnotationTool {
             const { data } = annotation;
             const { points } = data.handles;
             const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
-            const canvasCorners = getCanvasEllipseCorners(canvasCoordinates);
-            const [canvasPoint1, canvasPoint2] = canvasCorners;
+            const [bottom, top, left, right] = canvasCoordinates;
+            const w = Math.hypot(left[0] - right[0], left[1] - right[1]);
+            const h = Math.hypot(top[0] - bottom[0], top[1] - bottom[1]);
+            const angle = Math.atan2(left[1] - right[1], left[0] - right[0]);
+            const center = [(left[0] + right[0]) / 2, (top[1] + bottom[1]) / 2];
             const minorEllipse = {
-                left: Math.min(canvasPoint1[0], canvasPoint2[0]) + proximity / 2,
-                top: Math.min(canvasPoint1[1], canvasPoint2[1]) + proximity / 2,
-                width: Math.abs(canvasPoint1[0] - canvasPoint2[0]) - proximity,
-                height: Math.abs(canvasPoint1[1] - canvasPoint2[1]) - proximity,
+                center,
+                xRadius: (w - proximity) / 2,
+                yRadius: (h - proximity) / 2,
+                angle,
             };
             const majorEllipse = {
-                left: Math.min(canvasPoint1[0], canvasPoint2[0]) - proximity / 2,
-                top: Math.min(canvasPoint1[1], canvasPoint2[1]) - proximity / 2,
-                width: Math.abs(canvasPoint1[0] - canvasPoint2[0]) + proximity,
-                height: Math.abs(canvasPoint1[1] - canvasPoint2[1]) + proximity,
+                center,
+                xRadius: (w + proximity) / 2,
+                yRadius: (h + proximity) / 2,
+                angle,
             };
             const pointInMinorEllipse = this._pointInEllipseCanvas(minorEllipse, canvasCoords);
             const pointInMajorEllipse = this._pointInEllipseCanvas(majorEllipse, canvasCoords);
@@ -672,13 +676,12 @@ class EllipticalROITool extends AnnotationTool {
         triggerAnnotationRenderForViewportIds([viewport.id]);
     }; }
     _pointInEllipseCanvas(ellipse, location) {
-        const xRadius = ellipse.width / 2;
-        const yRadius = ellipse.height / 2;
+        const { xRadius, yRadius, center, angle } = ellipse;
+        const rotLocation = vec2.rotate(vec2.create(), location, center, -angle);
         if (xRadius <= 0.0 || yRadius <= 0.0) {
             return false;
         }
-        const center = [ellipse.left + xRadius, ellipse.top + yRadius];
-        const normalized = [location[0] - center[0], location[1] - center[1]];
+        const normalized = [rotLocation[0] - center[0], rotLocation[1] - center[1]];
         const inEllipse = (normalized[0] * normalized[0]) / (xRadius * xRadius) +
             (normalized[1] * normalized[1]) / (yRadius * yRadius) <=
             1.0;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.15.5";
+export declare const version = "3.15.6";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.15.5';
+export const version = '3.15.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.15.5",
+  "version": "3.15.6",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.15.5",
+    "@cornerstonejs/core": "^3.15.6",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "54b78585158c51f11dd6b312f08bcf56b148d4f1"
+  "gitHead": "c529e179b3e8aaa9e21d628d35c6f745419c0cf0"
 }