@cornerstonejs/tools 4.16.4 → 4.17.0

package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js

@@ -7,7 +7,7 @@ import { shouldSmooth, getInterpolatedPoints, } from '../../../utilities/planarF
 import getMouseModifierKey from '../../../eventDispatchers/shared/getMouseModifier';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
 import { triggerAnnotationModified, triggerContourAnnotationCompleted, } from '../../../stateManagement/annotation/helpers/state';
-import findOpenUShapedContourVectorToPeak from './findOpenUShapedContourVectorToPeak';
+import { resolveVectorToPeak } from './findOpenUShapedContourVectorToPeak';
 import { polyline } from '../../../utilities/math';
 import { removeAnnotation } from '../../../stateManagement/annotation/annotationState';
 import { ContourWindingDirection } from '../../../types/ContourAnnotation';
@@ -193,10 +193,12 @@ function completeDrawOpenContour(element, options) {
         worldPoints[0],
         worldPoints[worldPoints.length - 1],
     ];
-    if (annotation.data.isOpenUShapeContour === true ||
-        annotation.data.isOpenUShapeContour === 'farthestT') {
-        annotation.data.openUShapeContourVectorToPeak =
-            findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
+    if (!annotation.data.isOpenUShapeContour &&
+        this.configuration?.openUShapeContour) {
+        annotation.data.isOpenUShapeContour = this.configuration.openUShapeContour;
+    }
+    if (annotation.data.isOpenUShapeContour) {
+        annotation.data.openUShapeContourVectorToPeak = resolveVectorToPeak(canvasPoints, viewport, annotation.data.isOpenUShapeContour);
     }
     if (!textBox.hasMoved) {
         triggerContourAnnotationCompleted(annotation, contourHoleProcessingEnabled);

package/dist/esm/tools/annotation/planarFreehandROITool/findOpenUShapedContourVectorToPeak.d.ts

@@ -1,4 +1,5 @@
 import type { Types } from '@cornerstonejs/core';
 import type { PlanarFreehandROIAnnotation } from '../../../types/ToolSpecificAnnotationTypes';
 export default function findOpenUShapedContourVectorToPeak(canvasPoints: Types.Point2[], viewport: Types.IStackViewport | Types.IVolumeViewport): Types.Point3[];
-export declare function findOpenUShapedContourVectorToPeakOnRender(enabledElement: Types.IEnabledElement, annotation: PlanarFreehandROIAnnotation): Types.Point3[];
+export declare function resolveVectorToPeak(canvasPoints: Types.Point2[], viewport: Types.IStackViewport | Types.IVolumeViewport, variant: PlanarFreehandROIAnnotation['data']['isOpenUShapeContour']): Types.Point3[] | null;
+export declare function resolveVectorToPeakOnRender(enabledElement: Types.IEnabledElement, annotation: PlanarFreehandROIAnnotation): Types.Point3[] | null;

package/dist/esm/tools/annotation/planarFreehandROITool/findOpenUShapedContourVectorToPeak.js

@@ -32,8 +32,66 @@ export default function findOpenUShapedContourVectorToPeak(canvasPoints, viewpor
     const toFurthestWorld = toFurthest.map(viewport.canvasToWorld);
     return toFurthestWorld;
 }
-export function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation) {
+export function resolveVectorToPeak(canvasPoints, viewport, variant) {
+    if (variant === 'orthogonalT') {
+        return findOpenUShapedContourVectorToPeakOrthogonal(canvasPoints, viewport);
+    }
+    if (variant === 'lineSegment') {
+        return null;
+    }
+    if (variant) {
+        return findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
+    }
+    return null;
+}
+export function resolveVectorToPeakOnRender(enabledElement, annotation) {
     const { viewport } = enabledElement;
     const canvasPoints = annotation.data.contour.polyline.map(viewport.worldToCanvas);
-    return findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
+    return resolveVectorToPeak(canvasPoints, viewport, annotation.data.isOpenUShapeContour);
+}
+function findOpenUShapedContourVectorToPeakOrthogonal(canvasPoints, viewport) {
+    const first = canvasPoints[0];
+    const last = canvasPoints[canvasPoints.length - 1];
+    const firstToLastUnitVector = vec2.sub(vec2.create(), last, first);
+    vec2.normalize(firstToLastUnitVector, firstToLastUnitVector);
+    const chordDir = [
+        firstToLastUnitVector[0],
+        firstToLastUnitVector[1],
+    ];
+    const centerOfFirstToLast = [
+        (first[0] + last[0]) / 2,
+        (first[1] + last[1]) / 2,
+    ];
+    const delta = vec2.create();
+    let prevDp = null;
+    let prevPoint = null;
+    let orthogonalPoint = null;
+    for (const p of canvasPoints) {
+        vec2.sub(delta, p, centerOfFirstToLast);
+        const dp = vec2.dot(chordDir, delta);
+        if (prevDp !== null && prevDp * dp < 0) {
+            const t = Math.abs(prevDp) / (Math.abs(prevDp) + Math.abs(dp));
+            orthogonalPoint = [
+                prevPoint[0] + t * (p[0] - prevPoint[0]),
+                prevPoint[1] + t * (p[1] - prevPoint[1]),
+            ];
+            break;
+        }
+        if (Math.abs(dp) < 1e-10) {
+            orthogonalPoint = p;
+            break;
+        }
+        prevDp = dp;
+        prevPoint = p;
+    }
+    if (!orthogonalPoint) {
+        console.warn('No orthogonal intersection found for open U-shaped contour');
+        return null;
+    }
+    const toOrthogonal = [
+        orthogonalPoint,
+        centerOfFirstToLast,
+    ];
+    const toOrthogonalWorld = toOrthogonal.map(viewport.canvasToWorld);
+    return toOrthogonalWorld;
 }

package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js

@@ -7,7 +7,7 @@ import { polyline } from '../../../utilities/math';
 import { shouldSmooth, getInterpolatedPoints, } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
 import updateContourPolyline from '../../../utilities/contours/updateContourPolyline';
-import findOpenUShapedContourVectorToPeak from './findOpenUShapedContourVectorToPeak';
+import { resolveVectorToPeak } from './findOpenUShapedContourVectorToPeak';
 import { triggerAnnotationModified } from '../../../stateManagement/annotation/helpers/state';
 const { addCanvasPointsToArray, getSubPixelSpacingAndXYDirections } = polyline;
 function activateOpenContourEdit(evt, annotation, viewportIdsToRender) {
@@ -289,8 +289,7 @@ function completeOpenContourEdit(element) {
             worldPoints[worldPoints.length - 1],
         ];
         if (annotation.data.isOpenUShapeContour) {
-            annotation.data.openUShapeContourVectorToPeak =
-                findOpenUShapedContourVectorToPeak(fusedCanvasPoints, viewport);
+            annotation.data.openUShapeContourVectorToPeak = resolveVectorToPeak(fusedCanvasPoints, viewport, annotation.data.isOpenUShapeContour);
         }
         triggerAnnotationModified(annotation, element);
     }

package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js

@@ -1,6 +1,6 @@
 import { drawHandles as drawHandlesSvg, drawPolyline as drawPolylineSvg, drawPath as drawPathSvg, } from '../../../drawingSvg';
 import { polyline } from '../../../utilities/math';
-import { findOpenUShapedContourVectorToPeakOnRender } from './findOpenUShapedContourVectorToPeak';
+import { resolveVectorToPeakOnRender } from './findOpenUShapedContourVectorToPeak';
 import getContourHolesDataCanvas from '../../../utilities/contours/getContourHolesDataCanvas';
 const { pointsAreWithinCloseContourProximity } = polyline;
 function _getRenderingOptions(enabledElement, annotation) {
@@ -20,7 +20,9 @@ function _getRenderingOptions(enabledElement, annotation) {
         width: lineWidth,
         lineDash,
         fillColor,
-        fillOpacity,
+        fillOpacity: this.configuration?.fillOpacity !== undefined
+            ? this.configuration.fillOpacity
+            : fillOpacity,
         closePath: isClosedContour,
     };
     return options;
@@ -34,7 +36,9 @@ function renderContour(enabledElement, svgDrawingHelper, annotation) {
     }
     else {
         if (annotation.data.isOpenUShapeContour) {
-            calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation);
+            if (annotation.data.isOpenUShapeContour !== 'lineSegment') {
+                calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation);
+            }
             this.renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation);
         }
         else {
@@ -44,8 +48,7 @@ function renderContour(enabledElement, svgDrawingHelper, annotation) {
 }
 function calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation) {
     if (!annotation.data.openUShapeContourVectorToPeak) {
-        annotation.data.openUShapeContourVectorToPeak =
-            findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation);
+        annotation.data.openUShapeContourVectorToPeak = resolveVectorToPeakOnRender(enabledElement, annotation);
     }
 }
 function renderClosedContour(enabledElement, svgDrawingHelper, annotation) {
@@ -97,15 +100,12 @@ function renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation)
     const { openUShapeContourVectorToPeak } = annotation.data;
     const { polyline } = annotation.data.contour;
     this.renderOpenContour(enabledElement, svgDrawingHelper, annotation);
-    if (!openUShapeContourVectorToPeak) {
+    const isLineSegmentOnly = annotation.data.isOpenUShapeContour === 'lineSegment';
+    if (!isLineSegmentOnly && !openUShapeContourVectorToPeak) {
         return;
     }
     const firstCanvasPoint = viewport.worldToCanvas(polyline[0]);
     const lastCanvasPoint = viewport.worldToCanvas(polyline[polyline.length - 1]);
-    const openUShapeContourVectorToPeakCanvas = [
-        viewport.worldToCanvas(openUShapeContourVectorToPeak[0]),
-        viewport.worldToCanvas(openUShapeContourVectorToPeak[1]),
-    ];
     const options = this._getRenderingOptions(enabledElement, annotation);
     drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, 'first-to-last', [firstCanvasPoint, lastCanvasPoint], {
         color: options.color,
@@ -113,15 +113,31 @@ function renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation)
         closePath: false,
         lineDash: '2,2',
     });
-    drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, 'midpoint-to-open-contour', [
-        openUShapeContourVectorToPeakCanvas[0],
-        openUShapeContourVectorToPeakCanvas[1],
-    ], {
-        color: options.color,
-        width: options.width,
-        closePath: false,
-        lineDash: '2,2',
-    });
+    if (!isLineSegmentOnly) {
+        const openUShapeContourVectorToPeakCanvas = [
+            viewport.worldToCanvas(openUShapeContourVectorToPeak[0]),
+            viewport.worldToCanvas(openUShapeContourVectorToPeak[1]),
+        ];
+        drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, 'midpoint-to-open-contour', [
+            openUShapeContourVectorToPeakCanvas[0],
+            openUShapeContourVectorToPeakCanvas[1],
+        ], {
+            color: options.color,
+            width: options.width,
+            closePath: false,
+            lineDash: '2,2',
+        });
+    }
+    if (options.fillOpacity > 0) {
+        const canvasPolyline = polyline.map((worldPos) => viewport.worldToCanvas(worldPos));
+        drawPathSvg(svgDrawingHelper, annotation.annotationUID, 'u-shape-fill', [[...canvasPolyline, firstCanvasPoint]], {
+            color: options.fillColor || options.color,
+            fillColor: options.fillColor || options.color,
+            fillOpacity: options.fillOpacity,
+            closePath: true,
+            width: 0,
+        });
+    }
 }
 function renderContourBeingDrawn(enabledElement, svgDrawingHelper, annotation) {
     const options = this._getRenderingOptions(enabledElement, annotation);

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.16.4";
+export declare const version = "4.17.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.16.4';
+export const version = '4.17.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.16.4",
+  "version": "4.17.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.16.4",
+    "@cornerstonejs/core": "4.17.0",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "8f2403461fd69c52ba70d54f5a84b436782f5d56"
+  "gitHead": "f5a86e32f08c55617ab0c6213607ce341bb7b02c"
 }