@cornerstonejs/tools 4.15.27 → 4.15.29

package/dist/esm/stateManagement/segmentation/helpers/clearSegmentValue.d.ts

@@ -1 +1,3 @@
-export declare function clearSegmentValue(segmentationId: string, segmentIndex: number): void;
+export declare function clearSegmentValue(segmentationId: string, segmentIndex: number, options?: {
+    recordHistory?: boolean;
+}): void;

package/dist/esm/stateManagement/segmentation/helpers/clearSegmentValue.js

@@ -1,7 +1,9 @@
-import { cache } from '@cornerstonejs/core';
+import { cache, utilities } from '@cornerstonejs/core';
 import { getSegmentation } from '../getSegmentation';
 import { triggerSegmentationDataModified } from '../triggerSegmentationEvents';
-export function clearSegmentValue(segmentationId, segmentIndex) {
+import { createLabelmapMemo } from '../../../utilities/segmentation/createLabelmapMemo';
+const { DefaultHistoryMemo } = utilities.HistoryMemo;
+export function clearSegmentValue(segmentationId, segmentIndex, options) {
     const segmentation = getSegmentation(segmentationId);
     if (segmentation.representationData.Labelmap) {
         const { representationData } = segmentation;
@@ -15,11 +17,18 @@ export function clearSegmentValue(segmentationId, segmentIndex) {
                     return;
                 }
                 const { voxelManager } = item;
+                const memo = options?.recordHistory
+                    ? createLabelmapMemo(segmentationId, voxelManager)
+                    : null;
+                const useVoxelManager = memo?.voxelManager ?? voxelManager;
                 voxelManager.forEach(({ value, index }) => {
                     if (value === segmentIndex) {
-                        voxelManager.setAtIndex(index, 0);
+                        useVoxelManager.setAtIndex(index, 0);
                     }
                 });
+                if (memo?.commitMemo()) {
+                    DefaultHistoryMemo.push(memo);
+                }
             });
         }
         triggerSegmentationDataModified(segmentationId);

package/dist/esm/stateManagement/segmentation/helpers/removeSegmentAnnotations.d.ts

@@ -1 +1,3 @@
-export declare function removeContourSegmentAnnotations(segmentationId: string, segmentIndex: number): void;
+export declare function removeContourSegmentAnnotations(segmentationId: string, segmentIndex: number, options?: {
+    recordHistory?: boolean;
+}): void;

package/dist/esm/stateManagement/segmentation/helpers/removeSegmentAnnotations.js

@@ -1,19 +1,36 @@
 import { getAnnotation } from '../../annotation/annotationState';
+import AnnotationTool from '../../../tools/base/AnnotationTool';
 import { getAnnotationsUIDMapFromSegmentation, removeCompleteContourAnnotation, } from '../utilities';
 import { isContourSegmentationAnnotation } from '../../../utilities/contourSegmentation';
-export function removeContourSegmentAnnotations(segmentationId, segmentIndex) {
+export function removeContourSegmentAnnotations(segmentationId, segmentIndex, options) {
     const annotationUIDsMap = getAnnotationsUIDMapFromSegmentation(segmentationId);
     if (!annotationUIDsMap) {
         return;
     }
-    const annotationUIDs = annotationUIDsMap.get(segmentIndex);
-    if (!annotationUIDs) {
+    const annotationUIDsSet = annotationUIDsMap.get(segmentIndex);
+    if (!annotationUIDsSet) {
         return;
     }
-    annotationUIDs.forEach((annotationUID) => {
+    const annotationUIDs = Array.from(annotationUIDsSet);
+    const annotations = [];
+    for (const annotationUID of annotationUIDs) {
         const annotation = getAnnotation(annotationUID);
         if (isContourSegmentationAnnotation(annotation)) {
-            removeCompleteContourAnnotation(annotation);
+            annotations.push(annotation);
         }
-    });
+    }
+    if (annotations.length === 0) {
+        return;
+    }
+    for (const annotation of annotations) {
+        if (annotation.parentAnnotationUID) {
+            continue;
+        }
+        if (options?.recordHistory) {
+            AnnotationTool.createAnnotationMemo(null, annotation, {
+                deleting: true,
+            });
+        }
+        removeCompleteContourAnnotation(annotation);
+    }
 }

package/dist/esm/stateManagement/segmentation/removeSegment.d.ts

@@ -1,3 +1,4 @@
 export declare function removeSegment(segmentationId: string, segmentIndex: number, options?: {
-    setNextSegmentAsActive: boolean;
+    setNextSegmentAsActive?: boolean;
+    recordHistory?: boolean;
 }): void;

package/dist/esm/stateManagement/segmentation/removeSegment.js

@@ -11,10 +11,14 @@ export function removeSegment(segmentationId, segmentIndex, options = {
 }) {
     const segmentation = getSegmentation(segmentationId);
     if (segmentation?.representationData.Contour) {
-        removeContourSegmentAnnotations(segmentationId, segmentIndex);
+        removeContourSegmentAnnotations(segmentationId, segmentIndex, {
+            recordHistory: options.recordHistory,
+        });
     }
     else if (segmentation?.representationData.Labelmap) {
-        clearSegmentValue(segmentationId, segmentIndex);
+        clearSegmentValue(segmentationId, segmentIndex, {
+            recordHistory: options.recordHistory,
+        });
     }
     else {
         throw new Error('Invalid segmentation type');
@@ -33,7 +37,7 @@ export function removeSegment(segmentationId, segmentIndex, options = {
             },
         },
     ]);
-    if (isThisSegmentActive && options.setNextSegmentAsActive) {
+    if (isThisSegmentActive && options.setNextSegmentAsActive !== false) {
         const segmentIndices = Object.keys(segments)
             .map(Number)
             .sort((a, b) => a - b);

package/dist/esm/tools/base/AnnotationTool.d.ts

@@ -42,7 +42,7 @@ declare abstract class AnnotationTool extends AnnotationDisplayTool {
         data: import("../../types").AnnotationData;
         deleting: boolean;
     };
-    static createAnnotationMemo(element: any, annotation: Annotation, options?: {
+    static createAnnotationMemo(element: HTMLDivElement | null | undefined, annotation: Annotation, options?: {
         newAnnotation?: boolean;
         deleting?: boolean;
     }): {

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

@@ -216,7 +216,9 @@ class AnnotationTool extends AnnotationDisplayTool {
                 }
                 state.data = newState.data;
                 currentAnnotation.invalidated = true;
-                triggerAnnotationModified(currentAnnotation, element, ChangeTypes.History);
+                if (element) {
+                    triggerAnnotationModified(currentAnnotation, element, ChangeTypes.History);
+                }
             },
             id: annotationUID,
             operationType: 'annotation',

package/dist/esm/utilities/segmentation/createLabelmapMemo.js

@@ -1,6 +1,5 @@
-import { utilities, eventTarget } from '@cornerstonejs/core';
+import { utilities } from '@cornerstonejs/core';
 import { triggerSegmentationDataModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
-import Events from '../../enums/Events';
 const { VoxelManager, RLEVoxelMap } = utilities;
 export function createLabelmapMemo(segmentationId, segmentationVoxelManager) {
     return createRleMemo(segmentationId, segmentationVoxelManager);

package/dist/esm/utilities/segmentation/getReferenceVolumeForSegmentationVolume.js

@@ -13,7 +13,10 @@ export function getReferenceVolumeForSegmentationVolume(segmentationVolumeId) {
         const imageIds = segmentationVolume.imageIds;
         const image = cache.getImage(imageIds[0]);
         const referencedImageId = image.referencedImageId;
-        const volumeInfo = cache.getVolumeContainingImageId(referencedImageId);
+        let volumeInfo = cache.getVolumeContainingImageId(referencedImageId);
+        if (!volumeInfo?.volume) {
+            volumeInfo = cache.getVolumeContainingImageId(image.imageId);
+        }
         imageVolume = volumeInfo?.volume;
     }
     return imageVolume;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.27";
+export declare const version = "4.15.29";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.27';
+export const version = '4.15.29';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.27",
+  "version": "4.15.29",
   "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.15.27",
+    "@cornerstonejs/core": "4.15.29",
     "@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": "af3578dd13210050d2f9c309f69483deb1f67168"
+  "gitHead": "ff9cdf1e59a849b7ba2be95578dee05b311800d0"
 }