@cornerstonejs/tools 3.10.25 → 3.10.27

package/dist/esm/stateManagement/annotation/config/ToolStyle.js

@@ -20,6 +20,7 @@ class ToolStyle {
             textBoxLinkLineDash: '2,3',
             textBoxShadow: true,
             markerSize: '10',
+            angleArcLineDash: '',
         };
         this._initializeConfig(defaultConfig);
     }

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

@@ -6,7 +6,7 @@ import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateMan
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import * as lineSegment from '../../utilities/math/line';
 import angleBetweenLines from '../../utilities/math/angle/angleBetweenLines';
-import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
+import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, drawPath as drawPathSvg, } from '../../drawingSvg';
 import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
@@ -19,6 +19,8 @@ class AngleTool extends AnnotationTool {
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
             shadow: true,
+            showAngleArc: false,
+            arcOffset: 5,
             preventHandleOutsideImage: false,
             getTextLines: defaultGetTextLines,
         },
@@ -297,7 +299,7 @@ class AngleTool extends AnnotationTool {
                 const { annotationUID, data } = annotation;
                 const { points, activeHandleIndex } = data.handles;
                 styleSpecifier.annotationUID = annotationUID;
-                const { color, lineWidth, lineDash } = this.getAnnotationStyle({
+                const { color, lineWidth, lineDash, angleArcLineDash } = this.getAnnotationStyle({
                     annotation,
                     styleSpecifier,
                 });
@@ -349,6 +351,36 @@ class AngleTool extends AnnotationTool {
                     width: lineWidth,
                     lineDash,
                 });
+                if (this.configuration.showAngleArc) {
+                    const center = canvasCoordinates[1];
+                    const offset = this.configuration.arcOffset;
+                    const radius = Math.min(lineSegment.distanceToPoint([center[0], center[1]], [canvasCoordinates[0][0], canvasCoordinates[0][1]], [canvasCoordinates[2][0], canvasCoordinates[2][1]]), lineSegment.distanceToPoint([center[0], center[1]], [canvasCoordinates[2][0], canvasCoordinates[2][1]], [canvasCoordinates[0][0], canvasCoordinates[0][1]])) / offset;
+                    const anglePoints = [];
+                    let startAngle = Math.atan2(canvasCoordinates[0][1] - center[1], canvasCoordinates[0][0] - center[0]);
+                    let endAngle = Math.atan2(canvasCoordinates[2][1] - center[1], canvasCoordinates[2][0] - center[0]);
+                    if (endAngle < startAngle) {
+                        endAngle += 2 * Math.PI;
+                    }
+                    const angleDifference = endAngle - startAngle;
+                    if (angleDifference > Math.PI) {
+                        const temp = startAngle;
+                        startAngle = endAngle;
+                        endAngle = temp + 2 * Math.PI;
+                    }
+                    const segments = 32;
+                    for (let i = 0; i <= segments; i++) {
+                        const angle = startAngle + (i / segments) * (endAngle - startAngle);
+                        anglePoints.push([
+                            center[0] + radius * Math.cos(angle),
+                            center[1] + radius * Math.sin(angle),
+                        ]);
+                    }
+                    drawPathSvg(svgDrawingHelper, annotationUID, '3', anglePoints, {
+                        color: color,
+                        width: lineWidth,
+                        lineDash: angleArcLineDash,
+                    });
+                }
                 if (!data.cachedStats[targetId]?.angle) {
                     continue;
                 }

package/dist/esm/tools/base/AnnotationTool.js

@@ -157,6 +157,7 @@ class AnnotationTool extends AnnotationDisplayTool {
         const locked = isAnnotationLocked(annotationUID);
         const lineWidth = getStyle('lineWidth');
         const lineDash = getStyle('lineDash');
+        const angleArcLineDash = getStyle('angleArcLineDash');
         const color = getStyle('color');
         const markerSize = getStyle('markerSize');
         const shadow = getStyle('shadow');
@@ -173,6 +174,7 @@ class AnnotationTool extends AnnotationDisplayTool {
             shadow,
             textbox: textboxStyle,
             markerSize,
+            angleArcLineDash,
         };
     }
     _imagePointNearToolOrHandle(element, annotation, canvasCoords, proximity) {

package/dist/esm/types/AnnotationStyle.d.ts

@@ -1,6 +1,6 @@
 type Modes = '' | 'Active' | 'Passive' | 'Enabled';
 type States = '' | 'Highlighted' | 'Selected' | 'Locked' | 'AutoGenerated';
-type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize';
+type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize' | 'angleArcLineDash';
 export type AnnotationStyle = {
     [key in `${Properties}${States}${Modes}`]?: string | number | boolean | Record<string, unknown>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.10.25",
+  "version": "3.10.27",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.10.25",
+    "@cornerstonejs/core": "^3.10.27",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "f6c51d0041add2cf40db4800ec86b53cd77f88f5"
+  "gitHead": "645eed0568edb1022f63342116ad92b41b6bb262"
 }