@cornerstonejs/adapters 1.61.6 → 1.62.0

package/dist/adapters.es.js

@@ -41368,7 +41368,7 @@ class BaseVolumeViewport extends Viewport$1 {
         return;
       }
       const {
-        colormap,
+        colormap: latestColormap,
         VOILUTFunction,
         interpolationType,
         invert,
@@ -41393,6 +41393,13 @@ class BaseVolumeViewport extends Viewport$1 {
         };
       }).filter(Boolean);
       const voiRange = voiRanges.length ? voiRanges[0].voiRange : null;
+      const volumeColormap = this.getColormap(applicableVolumeActorInfo);
+      let colormap;
+      if (volumeId && volumeColormap) {
+        colormap = volumeColormap;
+      } else {
+        colormap = latestColormap;
+      }
       return {
         colormap: colormap,
         voiRange: voiRange,
@@ -41403,6 +41410,50 @@ class BaseVolumeViewport extends Viewport$1 {
         rotation: rotation
       };
     };
+    this.getColormap = applicableVolumeActorInfo => {
+      const {
+        volumeActor
+      } = applicableVolumeActorInfo;
+      const cfun = volumeActor.getProperty().getRGBTransferFunction(0);
+      const {
+        nodes
+      } = cfun.getState();
+      const RGBPoints = nodes.reduce((acc, node) => {
+        acc.push(node.x, node.r, node.g, node.b);
+        return acc;
+      }, []);
+      const colormaps = vtkColorMaps.rgbPresetNames.map(presetName => vtkColorMaps.getPresetByName(presetName));
+      const matchedColormap = colormaps.find(colormap => {
+        const {
+          RGBPoints: presetRGBPoints
+        } = colormap;
+        if (presetRGBPoints.length !== RGBPoints.length) {
+          return false;
+        }
+        for (let i = 0; i < presetRGBPoints.length; i += 4) {
+          if (!isEqual$2(presetRGBPoints.slice(i + 1, i + 4), RGBPoints.slice(i + 1, i + 4))) {
+            return false;
+          }
+        }
+        return true;
+      });
+      if (!matchedColormap) {
+        return null;
+      }
+      const opacityPoints = volumeActor.getProperty().getScalarOpacity(0).getDataPointer();
+      const opacity = [];
+      for (let i = 0; i < opacityPoints.length; i += 2) {
+        opacity.push({
+          value: opacityPoints[i],
+          opacity: opacityPoints[i + 1]
+        });
+      }
+      const colormap = {
+        name: matchedColormap.Name,
+        opacity: opacity
+      };
+      return colormap;
+    };
     this.getRotation = () => {
       const {
         viewUp: currentViewUp,
@@ -49690,17 +49741,19 @@ function getInterpolationData(viewportData, filterParams = []) {
     originalToolName
   } = annotation.metadata;
   const testToolName = originalToolName || toolName;
-  const annotations = getAnnotations(testToolName, viewport.element) || [];
-  const modifiedAnnotations = getAnnotations(DEFAULT_CONTOUR_SEG_TOOLNAME, viewport.element);
-  if (modifiedAnnotations?.length) {
-    modifiedAnnotations.forEach(annotation => {
-      const {
-        metadata
-      } = annotation;
-      if (metadata.originalToolName === testToolName && !annotations.find(it => it === annotation)) {
-        annotations.push(annotation);
-      }
-    });
+  const annotations = (getAnnotations(testToolName, viewport.element) || []).filter(annotation => !annotation.metadata.originalToolName || annotation.metadata.originalToolName === testToolName);
+  if (testToolName !== DEFAULT_CONTOUR_SEG_TOOLNAME) {
+    const modifiedAnnotations = getAnnotations(DEFAULT_CONTOUR_SEG_TOOLNAME, viewport.element);
+    if (modifiedAnnotations?.length) {
+      modifiedAnnotations.forEach(annotation => {
+        const {
+          metadata
+        } = annotation;
+        if (metadata.originalToolName === testToolName && metadata.originalToolName !== metadata.toolName) {
+          annotations.push(annotation);
+        }
+      });
+    }
   }
   if (!annotations?.length) {
     return interpolationDatas;
@@ -49751,7 +49804,8 @@ function createPolylineToolData(polyline, handlePoints, referencedToolData) {
     invalidated: true,
     autoGenerated: true,
     annotationUID: undefined,
-    cachedStats: {}
+    cachedStats: {},
+    childAnnotationUIDs: []
   });
   Object.assign(annotation.data, {
     handles: {
@@ -50527,7 +50581,6 @@ class InterpolationManager {
       if (!this.toolNames.includes(toolName) && !this.toolNames.includes(originalToolName)) {
         return;
       }
-      console.log('Interpolation annotation', annotation.annotationUID);
       const viewport = getViewportForAnnotation(annotation);
       if (!viewport) {
         console.warn('Unable to find viewport for', annotation);