@cornerstonejs/tools 1.61.6 → 1.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.61.6",
+  "version": "1.62.0",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.61.6",
+    "@cornerstonejs/core": "^1.62.0",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "4d53b47bb74d03a1858b78489b38996e7d537adc"
+  "gitHead": "f42feae4b86eba94ce9ca3b493fb080905241007"
 }

package/src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts

@@ -359,7 +359,7 @@ function combinePolylines(
       metadata: {
         ...metadata,
         toolName: DEFAULT_CONTOUR_SEG_TOOLNAME,
-        originalToolName: targetAnnotation.metadata.toolName,
+        originalToolName: metadata.originalToolName || metadata.toolName,
       },
       data: {
         cachedStats: {},

package/src/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.ts

@@ -127,6 +127,7 @@ class FrameOfReferenceSpecificAnnotationManager implements IAnnotationManager {
    * @param toolName - Optional. The name of the tool to retrieve annotations for.
    * @returns The annotations associated with the specified group (default FrameOfReferenceUID) and tool,
    * or all annotations for the group (FrameOfReferenceUID) if the tool name is not provided.
+   * WARNING: The list returned here is internal tool data, not a copy, so do NOT modify it.
    */
   getAnnotations = (
     groupKey: string,

package/src/utilities/contourSegmentation/removeContourSegmentationAnnotation.ts

@@ -3,9 +3,10 @@ import { ContourSegmentationAnnotation } from '../../types';
 
 /**
  * Removes a contour segmentation annotation from the given annotation.
- * If the annotation does not have a segmentation data, an error is thrown.
+ * If the annotation does not have a segmentation data, this method returns
+ * quietly.  This can occur for interpolated segmentations that have not yet
+ * been converted to real segmentations or other in-process segmentations.
  * @param annotation - The contour segmentation annotation to remove.
- * @throws Error if the annotation does not have a segmentation data.
  */
 export function removeContourSegmentationAnnotation(
   annotation: ContourSegmentationAnnotation
@@ -18,8 +19,8 @@ export function removeContourSegmentationAnnotation(
 
   const { segmentationId, segmentIndex } = annotation.data.segmentation;
   const segmentation = state.getSegmentation(segmentationId);
-  const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
-  const annotationsUIDsSet = annotationUIDsMap.get(segmentIndex);
+  const { annotationUIDsMap } = segmentation?.representationData.CONTOUR || {};
+  const annotationsUIDsSet = annotationUIDsMap?.get(segmentIndex);
 
   if (!annotationsUIDsSet) {
     return;

package/src/utilities/contours/interpolation/createPolylineToolData.ts

@@ -30,6 +30,7 @@ export default function createPolylineToolData(
     autoGenerated: true,
     annotationUID: undefined,
     cachedStats: {},
+    childAnnotationUIDs: [],
   });
   Object.assign(annotation.data, {
     handles: {

package/src/utilities/contours/interpolation/getInterpolationData.ts

@@ -45,21 +45,37 @@ export default function getInterpolationData(
   const interpolationDatas = new Map<number, Annotation[]>();
   const { toolName, originalToolName } = annotation.metadata;
   const testToolName = originalToolName || toolName;
-  const annotations = getAnnotations(testToolName, viewport.element) || [];
-  const modifiedAnnotations = getAnnotations(
-    DEFAULT_CONTOUR_SEG_TOOLNAME,
-    viewport.element
+  // Get a copy of the annotations list by filtering it for only
+  // items which are originally the right tool name
+  const annotations = (
+    (getAnnotations(
+      testToolName,
+      viewport.element
+    ) as ContourSegmentationAnnotation[]) || []
+  ).filter(
+    (annotation) =>
+      !annotation.metadata.originalToolName ||
+      annotation.metadata.originalToolName === testToolName
   );
-  if (modifiedAnnotations?.length) {
-    modifiedAnnotations.forEach((annotation) => {
-      const { metadata } = annotation as ContourSegmentationAnnotation;
-      if (
-        metadata.originalToolName === testToolName &&
-        !annotations.find((it) => it === annotation)
-      ) {
-        annotations.push(annotation);
-      }
-    });
+
+  // Then add the default contour seg tool name which has the testTool name
+  // to the segmentations list.
+  if (testToolName !== DEFAULT_CONTOUR_SEG_TOOLNAME) {
+    const modifiedAnnotations = getAnnotations(
+      DEFAULT_CONTOUR_SEG_TOOLNAME,
+      viewport.element
+    ) as ContourSegmentationAnnotation[];
+    if (modifiedAnnotations?.length) {
+      modifiedAnnotations.forEach((annotation) => {
+        const { metadata } = annotation;
+        if (
+          metadata.originalToolName === testToolName &&
+          metadata.originalToolName !== metadata.toolName
+        ) {
+          annotations.push(annotation);
+        }
+      });
+    }
   }
 
   if (!annotations?.length) {

package/src/utilities/segmentation/InterpolationManager/InterpolationManager.ts

@@ -122,7 +122,6 @@ export default class InterpolationManager {
     ) {
       return;
     }
-    console.log('Interpolation annotation', annotation.annotationUID);
 
     const viewport = getViewportForAnnotation(annotation);
     if (!viewport) {