@cornerstonejs/tools 3.15.5 → 3.16.0

package/dist/esm/utilities/math/fan/fanUtils.js

@@ -0,0 +1,99 @@
+function normalizeAngle(angle) {
+    return ((angle % 360) + 360) % 360;
+}
+export function angleFromCenter(center, point) {
+    const dx = point[0] - center[0];
+    const dy = point[1] - center[1];
+    const angle = Math.atan2(dy, dx) * (180 / Math.PI);
+    return normalizeAngle(angle);
+}
+export function intervalFromPoints(center, pair) {
+    const start = angleFromCenter(center, pair[0]);
+    const end = angleFromCenter(center, pair[1]);
+    return start < end ? [start, end] : [end, start];
+}
+export function mergeIntervals(intervals) {
+    if (!intervals.length) {
+        return [];
+    }
+    intervals.sort((a, b) => a[0] - b[0]);
+    const merged = [intervals[0].slice()];
+    for (let i = 1; i < intervals.length; i++) {
+        const last = merged[merged.length - 1];
+        const current = intervals[i];
+        if (current[0] <= last[1]) {
+            last[1] = Math.max(last[1], current[1]);
+        }
+        else {
+            merged.push(current.slice());
+        }
+    }
+    return merged;
+}
+export function subtractIntervals(blocked, target) {
+    const [T0, T1] = target;
+    if (T1 <= T0) {
+        return [];
+    }
+    const overlaps = blocked
+        .map(([a, b]) => [Math.max(a, T0), Math.min(b, T1)])
+        .filter(([a, b]) => b > a);
+    if (overlaps.length === 0) {
+        return [[T0, T1]];
+    }
+    overlaps.sort((p, q) => p[0] - q[0]);
+    const merged = [];
+    let [curA, curB] = overlaps[0];
+    for (let i = 1; i < overlaps.length; i++) {
+        const [a, b] = overlaps[i];
+        if (a <= curB) {
+            curB = Math.max(curB, b);
+        }
+        else {
+            merged.push([curA, curB]);
+            [curA, curB] = [a, b];
+        }
+    }
+    merged.push([curA, curB]);
+    const gaps = [];
+    let cursor = T0;
+    for (const [a, b] of merged) {
+        if (a > cursor) {
+            gaps.push([cursor, a]);
+        }
+        cursor = Math.max(cursor, b);
+    }
+    if (cursor < T1) {
+        gaps.push([cursor, T1]);
+    }
+    return gaps;
+}
+export function clipInterval(inner, outerMerged) {
+    const result = [];
+    for (const out of outerMerged) {
+        const start = Math.max(inner[0], out[0]);
+        const end = Math.min(inner[1], out[1]);
+        if (start < end) {
+            result.push([start, end]);
+        }
+    }
+    return result;
+}
+export function calculateInnerFanPercentage(center, outerFanPairs, innerFanPairs) {
+    const outerIntervals = outerFanPairs.map((pair) => intervalFromPoints(center, pair));
+    const mergedOuter = mergeIntervals(outerIntervals);
+    const outerTotal = mergedOuter.reduce((sum, [a, b]) => sum + (b - a), 0);
+    if (outerTotal === 0) {
+        return 0;
+    }
+    const clippedInnerIntervals = [];
+    for (const pair of innerFanPairs) {
+        const innerInterval = intervalFromPoints(center, pair);
+        const clipped = clipInterval(innerInterval, mergedOuter);
+        clippedInnerIntervals.push(...clipped);
+    }
+    const mergedInner = mergeIntervals(clippedInnerIntervals);
+    const innerTotal = mergedInner.reduce((sum, [a, b]) => sum + (b - a), 0);
+    const percentage = (innerTotal / outerTotal) * 100;
+    return Math.min(100, Math.max(0, percentage));
+}

package/dist/esm/utilities/math/line/intersectLine.d.ts

@@ -1,2 +1,2 @@
 import type { Types } from '@cornerstonejs/core';
-export default function intersectLine(line1Start: Types.Point2, line1End: Types.Point2, line2Start: Types.Point2, line2End: Types.Point2): number[];
+export default function intersectLine(line1Start: Types.Point2, line1End: Types.Point2, line2Start: Types.Point2, line2End: Types.Point2, infinite?: boolean): number[] | undefined;

package/dist/esm/utilities/math/line/intersectLine.js

@@ -9,18 +9,28 @@ function sign(x) {
                 : NaN
         : NaN;
 }
-export default function intersectLine(line1Start, line1End, line2Start, line2End) {
+export default function intersectLine(line1Start, line1End, line2Start, line2End, infinite = false) {
     const [x1, y1] = line1Start;
     const [x2, y2] = line1End;
     const [x3, y3] = line2Start;
     const [x4, y4] = line2End;
+    if (infinite) {
+        const denom = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
+        if (Math.abs(denom) < 1e-10) {
+            return undefined;
+        }
+        const t = ((x1 - x3) * (y3 - y4) - (y1 - y3) * (x3 - x4)) / denom;
+        const x = x1 + t * (x2 - x1);
+        const y = y1 + t * (y2 - y1);
+        return [x, y];
+    }
     const a1 = y2 - y1;
     const b1 = x1 - x2;
     const c1 = x2 * y1 - x1 * y2;
     const r3 = a1 * x3 + b1 * y3 + c1;
     const r4 = a1 * x4 + b1 * y4 + c1;
     if (r3 !== 0 && r4 !== 0 && sign(r3) === sign(r4)) {
-        return;
+        return undefined;
     }
     const a2 = y4 - y3;
     const b2 = x3 - x4;
@@ -28,14 +38,14 @@ export default function intersectLine(line1Start, line1End, line2Start, line2End
     const r1 = a2 * x1 + b2 * y1 + c2;
     const r2 = a2 * x2 + b2 * y2 + c2;
     if (r1 !== 0 && r2 !== 0 && sign(r1) === sign(r2)) {
-        return;
+        return undefined;
     }
-    const denom = a1 * b2 - a2 * b1;
+    const denomSegment = a1 * b2 - a2 * b1;
     let num;
     num = b1 * c2 - b2 * c1;
-    const x = num / denom;
+    const x = num / denomSegment;
     num = a2 * c1 - a1 * c2;
-    const y = num / denom;
+    const y = num / denomSegment;
     const intersectionPoint = [x, y];
     return intersectionPoint;
 }

package/dist/esm/utilities/math/polyline/convexHull.d.ts

@@ -0,0 +1,2 @@
+import type { Types } from '@cornerstonejs/core';
+export default function convexHull(pts: Array<Types.Point2>): Array<Types.Point2>;

package/dist/esm/utilities/math/polyline/convexHull.js

@@ -0,0 +1,31 @@
+export default function convexHull(pts) {
+    if (pts.length < 3) {
+        return pts.slice();
+    }
+    const points = pts
+        .map((p) => [p[0], p[1]])
+        .sort((a, b) => a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);
+    function cross(o, a, b) {
+        return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0]);
+    }
+    const lower = [];
+    for (const p of points) {
+        while (lower.length >= 2 &&
+            cross(lower[lower.length - 2], lower[lower.length - 1], p) <= 0) {
+            lower.pop();
+        }
+        lower.push(p);
+    }
+    const upper = [];
+    for (let i = points.length - 1; i >= 0; i--) {
+        const p = points[i];
+        while (upper.length >= 2 &&
+            cross(upper[upper.length - 2], upper[upper.length - 1], p) <= 0) {
+            upper.pop();
+        }
+        upper.push(p);
+    }
+    lower.pop();
+    upper.pop();
+    return lower.concat(upper);
+}

package/dist/esm/utilities/math/polyline/index.d.ts

@@ -20,4 +20,5 @@ import addCanvasPointsToArray from './addCanvasPointsToArray';
 import pointCanProjectOnLine from './pointCanProjectOnLine';
 import { isPointInsidePolyline3D } from './isPointInsidePolyline3D';
 import { projectTo2D } from './projectTo2D';
-export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, decimate, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, projectTo2D, };
+import convexHull from './convexHull';
+export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, decimate, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, projectTo2D, convexHull, };

package/dist/esm/utilities/math/polyline/index.js

@@ -20,4 +20,5 @@ import addCanvasPointsToArray from './addCanvasPointsToArray';
 import pointCanProjectOnLine from './pointCanProjectOnLine';
 import { isPointInsidePolyline3D } from './isPointInsidePolyline3D';
 import { projectTo2D } from './projectTo2D';
-export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, decimate, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, projectTo2D, };
+import convexHull from './convexHull';
+export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, decimate, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, projectTo2D, convexHull, };

package/dist/esm/version.d.ts

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

package/dist/esm/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.15.5",
+  "version": "3.16.0",
   "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.16.0",
     "@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": "16136620b12d12a19fe62f8b8a2ddbc468c4543b"
 }