@cornerstonejs/tools 5.6.7 → 5.6.9

package/dist/esm/utilities/contourSegmentation/applyContourStroke.d.ts

@@ -1,4 +1,4 @@
-import type { Types } from '@cornerstonejs/core';
+import { type Types } from '@cornerstonejs/core';
 import type { ContourSegmentationAnnotation } from '../../types/index.js';
 export declare function addContourStroke(viewport: Types.IViewport, sourceAnnotation: ContourSegmentationAnnotation): void;
 export declare function removeContourStroke(viewport: Types.IViewport, sourceAnnotation: ContourSegmentationAnnotation): void;

package/dist/esm/utilities/contourSegmentation/applyContourStroke.js

@@ -1,8 +1,9 @@
+import { utilities as csUtils } from '@cornerstonejs/core';
 import { ContourWindingDirection } from '../../types/ContourAnnotation.js';
 import { applyBoolean, BooleanOp, splitSelfIntersections, } from './clipperBooleanOps.js';
 import { unifyWeaklyConnectedPolygons } from './bridgeWeaklyConnected.js';
 import { convertContourPolylineToCanvasSpace, createNewAnnotationFromPolyline, getContourHolesData, updateViewportsForAnnotations, } from './sharedOperations.js';
-import { getAllAnnotations } from '../../stateManagement/annotation/annotationState.js';
+import { getAllAnnotations, getAnnotation, } from '../../stateManagement/annotation/annotationState.js';
 import { addAnnotation, addChildAnnotation, removeAnnotation, } from '../../stateManagement/annotation/annotationState.js';
 import { addContourSegmentationAnnotation } from './addContourSegmentationAnnotation.js';
 import { removeContourSegmentationAnnotation } from './removeContourSegmentationAnnotation.js';
@@ -11,6 +12,7 @@ import areSameSegment from './areSameSegment.js';
 import isContourSegmentationAnnotation from './isContourSegmentationAnnotation.js';
 import { hasToolByName } from '../../store/addTool.js';
 const DEFAULT_CONTOUR_SEG_TOOL_NAME = 'PlanarFreehandContourSegmentationTool';
+const { DefaultHistoryMemo } = csUtils.HistoryMemo;
 export function addContourStroke(viewport, sourceAnnotation) {
     applyStroke(viewport, sourceAnnotation, BooleanOp.Union);
 }
@@ -43,18 +45,20 @@ function applyStroke(viewport, sourceAnnotation, op) {
     const resultPolygons = op === BooleanOp.Union
         ? unifyWeaklyConnectedPolygons(booleanResult)
         : booleanResult;
-    const toRemove = [sourceAnnotation];
+    const previousAnnotations = [];
     for (const t of targets) {
-        toRemove.push(t);
+        previousAnnotations.push(t);
         for (const h of getContourHolesData(viewport, t)) {
-            toRemove.push(h.annotation);
+            previousAnnotations.push(h.annotation);
         }
     }
+    const toRemove = [sourceAnnotation, ...previousAnnotations];
     for (const annotation of toRemove) {
         removeAnnotationCompletely(annotation);
     }
     const template = targets[0] ?? sourceAnnotation;
     const { element } = viewport;
+    const resultAnnotations = [];
     for (const polygon of resultPolygons) {
         if (polygon.outer.length < 3) {
             continue;
@@ -62,6 +66,7 @@ function applyStroke(viewport, sourceAnnotation, op) {
         const parent = createNewAnnotationFromPolyline(viewport, template, polygon.outer, ContourWindingDirection.Clockwise);
         addAnnotation(parent, element);
         addContourSegmentationAnnotation(parent);
+        resultAnnotations.push(parent);
         polygon.holes?.forEach((holePolyline) => {
             if (holePolyline.length < 3) {
                 return;
@@ -69,12 +74,52 @@ function applyStroke(viewport, sourceAnnotation, op) {
             const hole = createNewAnnotationFromPolyline(viewport, template, holePolyline, ContourWindingDirection.CounterClockwise);
             addAnnotation(hole, element);
             addChildAnnotation(parent, hole);
+            resultAnnotations.push(hole);
             triggerAnnotationModified(hole, element);
         });
         triggerAnnotationModified(parent, element);
     }
+    replaceContourStrokeHistory(sourceAnnotation, previousAnnotations, resultAnnotations, viewport);
     updateViewportsForAnnotations(viewport, toRemove);
 }
+function replaceContourStrokeHistory(sourceAnnotation, previousAnnotations, resultAnnotations, viewport) {
+    const memo = {
+        id: sourceAnnotation.annotationUID,
+        operationType: 'annotation',
+        restoreMemo: (isUndo = true) => {
+            const annotationsToRemove = isUndo
+                ? resultAnnotations
+                : previousAnnotations;
+            const annotationsToAdd = isUndo ? previousAnnotations : resultAnnotations;
+            removeStoredAnnotations(annotationsToRemove);
+            addStoredAnnotations(annotationsToAdd, viewport.element);
+            updateViewportsForAnnotations(viewport, [
+                ...annotationsToRemove,
+                ...annotationsToAdd,
+            ]);
+        },
+    };
+    DefaultHistoryMemo.replaceCurrentMemo(memo, (currentMemo) => currentMemo.id === sourceAnnotation.annotationUID &&
+        currentMemo.operationType === 'annotation');
+}
+function removeStoredAnnotations(annotations) {
+    for (let i = annotations.length - 1; i >= 0; i--) {
+        const annotation = annotations[i];
+        if (getAnnotation(annotation.annotationUID)) {
+            removeAnnotation(annotation.annotationUID);
+        }
+        removeContourSegmentationAnnotation(annotation);
+    }
+}
+function addStoredAnnotations(annotations, element) {
+    for (const annotation of annotations) {
+        if (getAnnotation(annotation.annotationUID)) {
+            continue;
+        }
+        addAnnotation(annotation, element);
+        addContourSegmentationAnnotation(annotation);
+    }
+}
 function collectSamePlaneSegmentTargets(viewport, sourceAnnotation) {
     const sourceUID = sourceAnnotation.annotationUID;
     return getAllAnnotations().filter((candidate) => {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.6.7";
+export declare const version = "5.6.9";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.6.7';
+export const version = '5.6.9';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.6.7",
+  "version": "5.6.9",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.6.7",
+    "@cornerstonejs/core": "5.6.9",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.6.7",
+    "@cornerstonejs/core": "5.6.9",
     "@kitware/vtk.js": "36.4.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -149,5 +149,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "bee51c33d95c44284da74cd5cb1444d7a5d45e25"
+  "gitHead": "0b601d857e49de1a329d99f2ebdd7d7bf91cc312"
 }