@cornerstonejs/tools 1.50.3 → 1.51.1

package/src/tools/annotation/RectangleROITool.ts

@@ -3,8 +3,6 @@ import { AnnotationTool } from '../base';
 import {
   getEnabledElement,
   VolumeViewport,
-  triggerEvent,
-  eventTarget,
   utilities as csUtils,
 } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
@@ -22,6 +20,10 @@ import {
 } from '../../stateManagement';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
+import {
+  triggerAnnotationCompleted,
+  triggerAnnotationModified,
+} from '../../stateManagement/annotation/helpers/state';
 import {
   drawHandles as drawHandlesSvg,
   drawLinkedTextBox as drawLinkedTextBoxSvg,
@@ -48,10 +50,6 @@ import {
   SVGDrawingHelper,
 } from '../../types';
 import { RectangleROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
-import {
-  AnnotationCompletedEventDetail,
-  AnnotationModifiedEventDetail,
-} from '../../types/EventTypes';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
 import { getModalityUnit } from '../../utilities/getModalityUnit';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
@@ -369,8 +367,7 @@ class RectangleROITool extends AnnotationTool {
 
     resetElementCursor(element);
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
+    const { renderingEngine } = getEnabledElement(element);
 
     this.editData = null;
     this.isDrawing = false;
@@ -385,13 +382,7 @@ class RectangleROITool extends AnnotationTool {
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
 
     if (newAnnotation) {
-      const eventType = Events.ANNOTATION_COMPLETED;
-
-      const eventDetail: AnnotationCompletedEventDetail = {
-        annotation,
-      };
-
-      triggerEvent(eventTarget, eventType, eventDetail);
+      triggerAnnotationCompleted(annotation);
     }
   };
 
@@ -520,8 +511,7 @@ class RectangleROITool extends AnnotationTool {
       annotation.highlighted = false;
       data.handles.activeHandleIndex = null;
 
-      const enabledElement = getEnabledElement(element);
-      const { renderingEngine } = enabledElement;
+      const { renderingEngine } = getEnabledElement(element);
 
       triggerAnnotationRenderForViewportIds(
         renderingEngine,
@@ -529,13 +519,7 @@ class RectangleROITool extends AnnotationTool {
       );
 
       if (newAnnotation) {
-        const eventType = Events.ANNOTATION_COMPLETED;
-
-        const eventDetail: AnnotationCompletedEventDetail = {
-          annotation,
-        };
-
-        triggerEvent(eventTarget, eventType, eventDetail);
+        triggerAnnotationCompleted(annotation);
       }
 
       this.editData = null;
@@ -872,7 +856,8 @@ class RectangleROITool extends AnnotationTool {
     enabledElement
   ) => {
     const { data } = annotation;
-    const { viewportId, renderingEngineId, viewport } = enabledElement;
+    const { viewport } = enabledElement;
+    const { element } = viewport;
 
     const worldPos1 = data.handles.points[0];
     const worldPos2 = data.handles.points[3];
@@ -988,14 +973,7 @@ class RectangleROITool extends AnnotationTool {
     annotation.invalidated = false;
 
     // Dispatching annotation modified
-    const eventType = Events.ANNOTATION_MODIFIED;
-
-    const eventDetail: AnnotationModifiedEventDetail = {
-      annotation,
-      viewportId,
-      renderingEngineId,
-    };
-    triggerEvent(eventTarget, eventType, eventDetail);
+    triggerAnnotationModified(annotation, element);
 
     return cachedStats;
   };

package/src/tools/annotation/SplineROITool.ts

@@ -20,14 +20,14 @@ import {
   ChangeTypes,
 } from '../../enums';
 import { resetElementCursor } from '../../cursors/elementCursor';
-import {
+import type {
   Annotation,
   EventTypes,
   ToolHandle,
   TextBoxHandle,
   PublicToolProps,
   ToolProps,
-  SVGDrawingHelper,
+  AnnotationRenderContext,
 } from '../../types';
 import {
   math,
@@ -41,7 +41,10 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 
 import { SplineROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
-import { AnnotationModifiedEventDetail } from '../../types/EventTypes';
+import {
+  AnnotationCompletedEventDetail,
+  AnnotationModifiedEventDetail,
+} from '../../types/EventTypes';
 import { ISpline } from '../../types/ISpline';
 import { CardinalSpline } from './splines/CardinalSpline';
 import { LinearSpline } from './splines/LinearSpline';
@@ -93,7 +96,10 @@ class SplineROITool extends ContourSegmentationBaseTool {
   } | null;
   isDrawing: boolean;
   isHandleOutsideImage = false;
-  fireChangeOnUpdate: ChangeTypes = null;
+  fireChangeOnUpdate: {
+    annotationUID: string;
+    changeType: ChangeTypes;
+  } = null;
 
   constructor(
     toolProps: PublicToolProps = {},
@@ -327,9 +333,13 @@ class SplineROITool extends ContourSegmentationBaseTool {
       removeAnnotation(annotation.annotationUID);
     }
 
-    this.fireChangeOnUpdate ||= newAnnotation
-      ? ChangeTypes.Completed
-      : ChangeTypes.HandlesUpdated;
+    this.fireChangeOnUpdate ||= {
+      annotationUID: annotation.annotationUID,
+      changeType: newAnnotation
+        ? ChangeTypes.Completed
+        : ChangeTypes.HandlesUpdated,
+    };
+
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
 
     this.editData = null;
@@ -509,6 +519,19 @@ class SplineROITool extends ContourSegmentationBaseTool {
     return annotation.annotationUID;
   }
 
+  /**
+   * Triggers an annotation completed event.
+   */
+  triggerAnnotationCompleted = (annotation: SplineROIAnnotation): void => {
+    const eventType = Events.ANNOTATION_COMPLETED;
+    const eventDetail: AnnotationCompletedEventDetail = {
+      annotation,
+      changeType: ChangeTypes.Completed,
+    };
+
+    triggerEvent(eventTarget, eventType, eventDetail);
+  };
+
   /**
    * Triggers an annotation modified event.
    */
@@ -518,11 +541,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
     changeType = ChangeTypes.StatsUpdated
   ): void => {
     const { viewportId, renderingEngineId } = enabledElement;
-    const eventType =
-      changeType === ChangeTypes.Completed
-        ? Events.ANNOTATION_COMPLETED
-        : Events.ANNOTATION_MODIFIED;
-
+    const eventType = Events.ANNOTATION_MODIFIED;
     const eventDetail: AnnotationModifiedEventDetail = {
       annotation,
       viewportId,
@@ -533,6 +552,21 @@ class SplineROITool extends ContourSegmentationBaseTool {
     triggerEvent(eventTarget, eventType, eventDetail);
   };
 
+  /**
+   * Triggers an annotation complete or modified event based on changeType.
+   */
+  triggerChangeEvent = (
+    annotation: SplineROIAnnotation,
+    enabledElement: Types.IEnabledElement,
+    changeType = ChangeTypes.StatsUpdated
+  ): void => {
+    if (changeType === ChangeTypes.Completed) {
+      this.triggerAnnotationCompleted(annotation);
+    } else {
+      this.triggerAnnotationModified(annotation, enabledElement, changeType);
+    }
+  };
+
   private _activateModify = (element) => {
     state.isInteractingWithTool = true;
 
@@ -596,13 +630,9 @@ class SplineROITool extends ContourSegmentationBaseTool {
    * @param renderContext - Render context that contains the annotation, enabledElement, etc.
    * @returns True if the annotation is rendered or false otherwise
    */
-  protected renderAnnotationInstance(renderContext: {
-    enabledElement: Types.IEnabledElement;
-    targetId: string;
-    annotation: Annotation;
-    annotationStyle: Record<string, any>;
-    svgDrawingHelper: SVGDrawingHelper;
-  }): boolean {
+  protected renderAnnotationInstance(
+    renderContext: AnnotationRenderContext
+  ): boolean {
     const { enabledElement, targetId, svgDrawingHelper, annotationStyle } =
       renderContext;
     const { viewport } = enabledElement;
@@ -734,11 +764,11 @@ class SplineROITool extends ContourSegmentationBaseTool {
       annotationStyle.textbox
     );
 
-    if (this.fireChangeOnUpdate) {
-      this.triggerAnnotationModified(
+    if (this.fireChangeOnUpdate?.annotationUID === annotationUID) {
+      this.triggerChangeEvent(
         annotation,
         enabledElement,
-        this.fireChangeOnUpdate
+        this.fireChangeOnUpdate.changeType
       );
       this.fireChangeOnUpdate = null;
     }
@@ -1058,8 +1088,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
       const deltaInY = vec3.distance(originalWorldPoint, deltaYPoint);
 
       const scale = getCalibratedScale(image);
-      let area =
-        math.polyline.calculateAreaOfPoints(canvasCoordinates) / scale / scale;
+      let area = math.polyline.getArea(canvasCoordinates) / scale / scale;
 
       // Convert from canvas_pixels ^2 to mm^2
       area *= deltaInX * deltaInY;

package/src/tools/annotation/UltrasoundDirectionalTool.ts

@@ -1,8 +1,6 @@
 import { Events } from '../../enums';
 import {
   getEnabledElement,
-  triggerEvent,
-  eventTarget,
   utilities as csUtils,
   StackViewport,
 } from '@cornerstonejs/core';
@@ -15,6 +13,10 @@ import {
   getAnnotations,
   removeAnnotation,
 } from '../../stateManagement/annotation/annotationState';
+import {
+  triggerAnnotationCompleted,
+  triggerAnnotationModified,
+} from '../../stateManagement/annotation/helpers/state';
 import { UltrasoundDirectionalAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 
 import {
@@ -27,10 +29,6 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { roundNumber } from '../../utilities';
 import { distanceToPoint } from '../../utilities/math/point';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
-import {
-  AnnotationCompletedEventDetail,
-  AnnotationModifiedEventDetail,
-} from '../../types/EventTypes';
 
 import {
   resetElementCursor,
@@ -310,13 +308,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
 
     if (newAnnotation) {
-      const eventType = Events.ANNOTATION_COMPLETED;
-
-      const eventDetail: AnnotationCompletedEventDetail = {
-        annotation,
-      };
-
-      triggerEvent(eventTarget, eventType, eventDetail);
+      triggerAnnotationCompleted(annotation);
     }
 
     this.editData = null;
@@ -398,13 +390,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
       );
 
       if (newAnnotation) {
-        const eventType = Events.ANNOTATION_COMPLETED;
-
-        const eventDetail: AnnotationCompletedEventDetail = {
-          annotation,
-        };
-
-        triggerEvent(eventTarget, eventType, eventDetail);
+        triggerAnnotationCompleted(annotation);
       }
 
       this.editData = null;
@@ -797,7 +783,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
 
   _calculateCachedStats(annotation, renderingEngine, enabledElement) {
     const data = annotation.data;
-    const { viewportId, renderingEngineId } = enabledElement;
+    const { element } = enabledElement.viewport;
 
     // Until we have all two anchors bail out
     if (data.handles.points.length !== 2) {
@@ -873,14 +859,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
     annotation.invalidated = false;
 
     // Dispatching annotation modified
-    const eventType = Events.ANNOTATION_MODIFIED;
-
-    const eventDetail: AnnotationModifiedEventDetail = {
-      annotation,
-      viewportId,
-      renderingEngineId,
-    };
-    triggerEvent(eventTarget, eventType, eventDetail);
+    triggerAnnotationModified(annotation, element);
 
     return cachedStats;
   }

package/src/tools/annotation/planarFreehandROITool/closedContourEditLoop.ts

@@ -1,3 +1,4 @@
+import { vec3, vec2 } from 'gl-matrix';
 import { getEnabledElement } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import { state } from '../../../store';
@@ -8,19 +9,16 @@ import {
 } from '../../../cursors/elementCursor';
 import { EventTypes } from '../../../types';
 import { polyline } from '../../../utilities/math';
-import { vec3, vec2 } from 'gl-matrix';
 import { PlanarFreehandROIAnnotation } from '../../../types/ToolSpecificAnnotationTypes';
 import {
   getInterpolatedPoints,
   shouldSmooth,
 } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
+import { triggerAnnotationModified } from '../../../stateManagement/annotation/helpers/state';
 
-const {
-  getSubPixelSpacingAndXYDirections,
-  addCanvasPointsToArray,
-  calculateAreaOfPoints,
-} = polyline;
+const { getSubPixelSpacingAndXYDirections, addCanvasPointsToArray, getArea } =
+  polyline;
 
 /**
  * Activates the closed contour edit event loop.
@@ -236,7 +234,7 @@ function finishEditAndStartNewEdit(evt: EventTypes.InteractionEventType): void {
     annotation.autoGenerated = false;
   }
 
-  this.triggerAnnotationModified(annotation, enabledElement);
+  triggerAnnotationModified(annotation, element);
 
   const lastEditCanvasPoint = editCanvasPoints.pop();
 
@@ -408,8 +406,8 @@ function fuseEditPointsWithClosedContour(
     }
   }
 
-  const areaPointSet1 = calculateAreaOfPoints(pointSet1);
-  const areaPointSet2 = calculateAreaOfPoints(pointSet2);
+  const areaPointSet1 = getArea(pointSet1);
+  const areaPointSet2 = getArea(pointSet2);
 
   const pointsToRender: Types.Point2[] =
     areaPointSet1 > areaPointSet2 ? pointSet1 : pointSet2;
@@ -453,14 +451,14 @@ function completeClosedContourEdit(element: HTMLDivElement) {
     );
     annotation.data.contour.polyline = worldPoints;
     annotation.data.contour.closed = true;
-
     annotation.invalidated = true;
+
     // If any manual update, triggered on an annotation, then it will be treated as non-autogenerated.
     if (annotation.autoGenerated) {
       annotation.autoGenerated = false;
     }
 
-    this.triggerAnnotationModified(annotation, enabledElement);
+    triggerAnnotationModified(annotation, element);
   }
 
   this.isEditingClosed = false;

package/src/tools/annotation/planarFreehandROITool/drawLoop.ts

@@ -12,6 +12,7 @@ import {
   getInterpolatedPoints,
 } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
+import { triggerAnnotationCompleted } from '../../../stateManagement/annotation/helpers/state';
 import { PlanarFreehandROIAnnotation } from '../../../types/ToolSpecificAnnotationTypes';
 import findOpenUShapedContourVectorToPeak from './findOpenUShapedContourVectorToPeak';
 import { polyline } from '../../../utilities/math';
@@ -21,7 +22,7 @@ import reverseIfAntiClockwise from '../../../utilities/contours/reverseIfAntiClo
 const {
   addCanvasPointsToArray,
   pointsAreWithinCloseContourProximity,
-  getFirstIntersectionWithPolyline,
+  getFirstLineSegmentIntersectionIndexes,
   getSubPixelSpacingAndXYDirections,
 } = polyline;
 
@@ -233,10 +234,11 @@ function completeDrawClosedContour(element: HTMLDivElement): boolean {
 
   annotation.data.contour.polyline = worldPoints;
   annotation.data.contour.closed = true;
+  annotation.invalidated = true;
   const { textBox } = annotation.data.handles;
 
   if (!textBox.hasMoved) {
-    this.triggerAnnotationCompleted(annotation);
+    triggerAnnotationCompleted(annotation);
   }
 
   this.isDrawing = false;
@@ -261,7 +263,7 @@ function removeCrossedLinesOnCompleteDraw(): void {
   const endToStart = [canvasPoints[0], canvasPoints[numPoints - 1]];
   const canvasPointsMinusEnds = canvasPoints.slice(0, -1).slice(1);
 
-  const lineSegment = getFirstIntersectionWithPolyline(
+  const lineSegment = getFirstLineSegmentIntersectionIndexes(
     canvasPointsMinusEnds,
     endToStart[0],
     endToStart[1],
@@ -303,6 +305,7 @@ function completeDrawOpenContour(element: HTMLDivElement): boolean {
 
   annotation.data.contour.polyline = worldPoints;
   annotation.data.contour.closed = false;
+  annotation.invalidated = true;
   const { textBox } = annotation.data.handles;
 
   // Add the first and last points to the list of handles. These means they
@@ -319,7 +322,7 @@ function completeDrawOpenContour(element: HTMLDivElement): boolean {
   }
 
   if (!textBox.hasMoved) {
-    this.triggerAnnotationCompleted(annotation);
+    triggerAnnotationCompleted(annotation);
   }
 
   this.isDrawing = false;
@@ -349,7 +352,7 @@ function findCrossingIndexDuringCreate(
   const { canvasPoints } = this.drawData;
   const pointsLessLastOne = canvasPoints.slice(0, -1);
 
-  const lineSegment = getFirstIntersectionWithPolyline(
+  const lineSegment = getFirstLineSegmentIntersectionIndexes(
     pointsLessLastOne,
     canvasPos,
     lastCanvasPoint,

package/src/tools/annotation/planarFreehandROITool/editLoopCommon.ts

@@ -3,7 +3,8 @@ import { vec2 } from 'gl-matrix';
 import { polyline } from '../../../utilities/math';
 import { EventTypes } from '../../../types';
 
-const { addCanvasPointsToArray, getFirstIntersectionWithPolyline } = polyline;
+const { addCanvasPointsToArray, getFirstLineSegmentIntersectionIndexes } =
+  polyline;
 
 /**
  * Check if the `editCanvasPoints` have crossed the `prevCanvasPoints` during
@@ -28,7 +29,7 @@ function checkForFirstCrossing(
   const lastCanvasPoint = lastPoints.canvas;
   const { editCanvasPoints, prevCanvasPoints } = this.editData;
 
-  const crossedLineSegment = getFirstIntersectionWithPolyline(
+  const crossedLineSegment = getFirstLineSegmentIntersectionIndexes(
     prevCanvasPoints,
     canvasPos,
     lastCanvasPoint,
@@ -91,7 +92,7 @@ function checkForFirstCrossing(
       ];
 
       const crossedLineSegmentFromExtendedPoint =
-        getFirstIntersectionWithPolyline(
+        getFirstLineSegmentIntersectionIndexes(
           prevCanvasPoints,
           extendedPoint,
           editCanvasPoints[0],
@@ -133,7 +134,7 @@ function removePointsUpUntilFirstCrossing(isClosedContour: boolean): void {
   for (let i = 0; i < editCanvasPoints.length - 1; i++) {
     const firstLine = [editCanvasPoints[i], editCanvasPoints[i + 1]];
 
-    const didCrossLine = !!getFirstIntersectionWithPolyline(
+    const didCrossLine = !!getFirstLineSegmentIntersectionIndexes(
       prevCanvasPoints,
       firstLine[0],
       firstLine[1],
@@ -173,7 +174,7 @@ function checkForSecondCrossing(
   // for the second crossing of the prevCanvasPoints, by checking if the last
   // mouse drag crossed these. This class method is only called if the edit loop
   // has already has a crossing earlier in the edit.
-  const crossedLineSegment = getFirstIntersectionWithPolyline(
+  const crossedLineSegment = getFirstLineSegmentIntersectionIndexes(
     prevCanvasPoints,
     canvasPos,
     lastCanvasPoint,
@@ -199,7 +200,7 @@ function removePointsAfterSecondCrossing(isClosedContour: boolean): void {
   for (let i = editCanvasPoints.length - 1; i > 0; i--) {
     const lastLine = [editCanvasPoints[i], editCanvasPoints[i - 1]];
 
-    const didCrossLine = !!getFirstIntersectionWithPolyline(
+    const didCrossLine = !!getFirstLineSegmentIntersectionIndexes(
       prevCanvasPoints,
       lastLine[0],
       lastLine[1],
@@ -255,7 +256,7 @@ function findSnapIndex(): number {
     const snapCanvasPosition = prevCanvasPoints[index];
     const lastEditCanvasPoint = editCanvasPoints[editCanvasPoints.length - 1];
 
-    const crossedLineSegment = getFirstIntersectionWithPolyline(
+    const crossedLineSegment = getFirstLineSegmentIntersectionIndexes(
       editCanvasPointsLessLastOne,
       snapCanvasPosition,
       lastEditCanvasPoint,
@@ -290,7 +291,7 @@ function checkAndRemoveCrossesOnEditLine(
 
   const editCanvasPointsLessLastOne = editCanvasPoints.slice(0, -2);
 
-  const crossedLineSegment = getFirstIntersectionWithPolyline(
+  const crossedLineSegment = getFirstLineSegmentIntersectionIndexes(
     editCanvasPointsLessLastOne,
     canvasPos,
     lastCanvasPoint,

package/src/tools/annotation/planarFreehandROITool/openContourEditLoop.ts

@@ -1,3 +1,4 @@
+import { vec3, vec2 } from 'gl-matrix';
 import { getEnabledElement } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import { state } from '../../../store';
@@ -8,7 +9,6 @@ import {
 } from '../../../cursors/elementCursor';
 import type { EventTypes } from '../../../types';
 import { PlanarFreehandROIAnnotation } from '../../../types/ToolSpecificAnnotationTypes';
-import { vec3, vec2 } from 'gl-matrix';
 import { polyline } from '../../../utilities/math';
 import {
   shouldSmooth,
@@ -16,6 +16,7 @@ import {
 } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
 import findOpenUShapedContourVectorToPeak from './findOpenUShapedContourVectorToPeak';
+import { triggerAnnotationModified } from '../../../stateManagement/annotation/helpers/state';
 
 const { addCanvasPointsToArray, getSubPixelSpacingAndXYDirections } = polyline;
 
@@ -226,7 +227,7 @@ function openContourEditOverwriteEnd(
   ];
   annotation.data.handles.activeHandleIndex = 1;
 
-  this.triggerAnnotationModified(annotation, enabledElement);
+  triggerAnnotationModified(annotation, element);
 
   this.isEditingOpen = false;
   this.editData = undefined;
@@ -505,7 +506,7 @@ function finishEditOpenOnSecondCrossing(
     worldPoints[worldPoints.length - 1],
   ];
 
-  this.triggerAnnotationModified(annotation, enabledElement);
+  triggerAnnotationModified(annotation, element);
 
   const lastEditCanvasPoint = editCanvasPoints.pop();
 
@@ -553,6 +554,8 @@ function completeOpenContourEdit(element: HTMLDivElement) {
     const worldPoints = updatedPoints.map((canvasPoint) =>
       viewport.canvasToWorld(canvasPoint)
     );
+
+    annotation.invalidated = true;
     annotation.data.contour.polyline = worldPoints;
     annotation.data.contour.closed = false;
     annotation.data.handles.points = [
@@ -566,9 +569,7 @@ function completeOpenContourEdit(element: HTMLDivElement) {
         findOpenUShapedContourVectorToPeak(fusedCanvasPoints, viewport);
     }
 
-    annotation.invalidated = true;
-
-    this.triggerAnnotationModified(annotation, enabledElement);
+    triggerAnnotationModified(annotation, element);
   }
 
   this.isEditingOpen = false;

package/src/tools/base/ContourBaseTool.ts

@@ -4,13 +4,14 @@ import {
   addAnnotation,
   getAnnotations,
 } from '../../stateManagement/annotation/annotationState';
-import {
+import type {
   Annotation,
   ContourAnnotation,
   EventTypes,
   PublicToolProps,
   ToolProps,
   SVGDrawingHelper,
+  AnnotationRenderContext,
 } from '../../types';
 import { drawPolyline as drawPolylineSvg } from '../../drawingSvg';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
@@ -191,13 +192,9 @@ abstract class ContourBaseTool extends AnnotationTool {
   /**
    * Render a contour segmentation instance
    */
-  protected renderAnnotationInstance(renderContext: {
-    enabledElement: Types.IEnabledElement;
-    targetId: string;
-    annotation: Annotation;
-    annotationStyle: Record<string, any>;
-    svgDrawingHelper: SVGDrawingHelper;
-  }): boolean {
+  protected renderAnnotationInstance(
+    renderContext: AnnotationRenderContext
+  ): boolean {
     const { enabledElement, annotationStyle, svgDrawingHelper } = renderContext;
     const annotation = renderContext.annotation as ContourAnnotation;
     const { annotationUID } = annotation;