feat(probe): isPointNearTool for probe tool, and use line width from …

…config (#1721)
cornerstonejs · Dec 20, 2024 · 90c1a98 · 90c1a98
1 parent dcac6b4
commit 90c1a98
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/common/reviews/api/tools.api.md b/common/reviews/api/tools.api.md
@@ -4464,7 +4464,7 @@ export class ProbeTool extends AnnotationTool {
     // (undocumented)
     isHandleOutsideImage: boolean;
     // (undocumented)
-    isPointNearTool(): boolean;
+    isPointNearTool(element: HTMLDivElement, annotation: ProbeAnnotation, canvasCoords: Types_2.Point2, proximity: number): boolean;
     // (undocumented)
     static probeDefaults: {
         supportedInteractionTypes: string[];

diff --git a/packages/tools/src/tools/annotation/ProbeTool.ts b/packages/tools/src/tools/annotation/ProbeTool.ts
@@ -126,10 +126,20 @@ class ProbeTool extends AnnotationTool {
     );
   }
 
-  // Not necessary for this tool but needs to be defined since it's an abstract
-  // method from the parent class.
-  isPointNearTool(): boolean {
-    return false;
+  isPointNearTool(
+    element: HTMLDivElement,
+    annotation: ProbeAnnotation,
+    canvasCoords: Types.Point2,
+    proximity: number
+  ): boolean {
+    const enabledElement = getEnabledElement(element);
+    const { viewport } = enabledElement;
+
+    const { data } = annotation;
+    const point = data.handles.points[0];
+    const annotationCanvasCoordinate = viewport.worldToCanvas(point);
+
+    return vec2.distance(canvasCoords, annotationCanvasCoordinate) < proximity;
   }
 
   toolSelectedCallback() {}
@@ -471,7 +481,10 @@ class ProbeTool extends AnnotationTool {
 
       styleSpecifier.annotationUID = annotationUID;
 
-      const { color } = this.getAnnotationStyle({ annotation, styleSpecifier });
+      const { color, lineWidth } = this.getAnnotationStyle({
+        annotation,
+        styleSpecifier,
+      });
 
       if (!data.cachedStats) {
         data.cachedStats = {};
@@ -545,7 +558,7 @@ class ProbeTool extends AnnotationTool {
         annotationUID,
         handleGroupUID,
         [canvasCoordinates],
-        { color }
+        { color, lineWidth }
       );
 
       renderStatus = true;