fix(segmentation): fix segmentation for video viewports

common/reviews/api/ai.api.md

@@ -9,7 +9,6 @@ import { Corners } from '@kitware/vtk.js/Interaction/Widgets/OrientationMarkerWi
 import type { IColorMapPreset } from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps';
 import type { mat3 } from 'gl-matrix';
 import { mat4 } from 'gl-matrix';
-import { PixelDataTypedArray as PixelDataTypedArray_2 } from 'packages/core/dist/esm/types';
 import type { Range as Range_2 } from '@kitware/vtk.js/types';
 import { vec3 } from 'gl-matrix';
 import type vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';

packages/core/src/RenderingEngine/VideoViewport.ts

@@ -172,9 +172,10 @@ class VideoViewport extends Viewport {
 
     let rowCosines = imagePlaneModule.rowCosines as Point3;
     let columnCosines = imagePlaneModule.columnCosines as Point3;
+    const usingDefaultValues = imagePlaneModule.usingDefaultValues;
 
     // if null or undefined
-    if (rowCosines == null || columnCosines == null) {
+    if (usingDefaultValues || rowCosines == null || columnCosines == null) {
       rowCosines = [1, 0, 0] as Point3;
       columnCosines = [0, 1, 0] as Point3;
     }
@@ -836,6 +837,9 @@ class VideoViewport extends Viewport {
       return false;
     }
     const match = referencedImageId.match(VideoViewport.frameRangeExtractor);
+    if (!match) {
+      return true;
+    }
     if (!match[2]) {
       return true;
     }
@@ -1130,16 +1134,17 @@ class VideoViewport extends Viewport {
   public addImages(stackInputs: IStackInput[]) {
     const actors = this.getActors();
     stackInputs.forEach((stackInput) => {
-      const image = cache.getImage(stackInput.imageId);
+      const { imageId, ...rest } = stackInput;
+      const image = cache.getImage(imageId);
 
       const imageActor = this.createActorMapper(image);
       const uid = stackInput.actorUID ?? uuidv4();
       if (imageActor) {
-        actors.push({ uid, actor: imageActor });
+        actors.push({ uid, actor: imageActor, referencedId: imageId, ...rest });
         if (stackInput.callback) {
           stackInput.callback({
             imageActor: imageActor as unknown as ImageActor,
-            imageId: stackInput.imageId,
+            imageId,
           });
         }
       }

packages/core/src/RenderingEngine/helpers/addImageSlicesToViewports.ts

@@ -2,6 +2,7 @@ import type {
   IStackViewport,
   IStackInput,
   IRenderingEngine,
+  IVideoViewport,
 } from '../../types';
 
 /**
@@ -21,15 +22,14 @@ function addImageSlicesToViewports(
   stackInputs: IStackInput[],
   viewportIds: string[]
 ): Promise<void> {
-  // Check if all viewports are volumeViewports
   for (const viewportId of viewportIds) {
-    const viewport = renderingEngine.getStackViewport(viewportId);
+    const viewport = renderingEngine.getViewport(viewportId) as IStackViewport;
 
     if (!viewport) {
       throw new Error(`Viewport with Id ${viewportId} does not exist`);
     }
 
-    // if not instance of BaseVolumeViewport, throw
+    // if the viewport does not support addImages, log a warning and skip
     if (!viewport.addImages) {
       console.warn(
         `Viewport with Id ${viewportId} does not have addImages. Cannot add image segmentation to this viewport.`
@@ -40,7 +40,9 @@ function addImageSlicesToViewports(
   }
 
   viewportIds.forEach((viewportId) => {
-    const viewport = renderingEngine.getStackViewport(viewportId);
+    const viewport = renderingEngine.getViewport(viewportId) as
+      | IStackViewport
+      | IVideoViewport;
     viewport.addImages(stackInputs);
   });
 }

packages/core/src/RenderingEngine/helpers/cpuFallback/rendering/storedRGBAPixelDataToCanvasImageData.ts

@@ -17,7 +17,7 @@ export default function (
   canvasImageDataData: Uint8ClampedArray
 ): void {
   let start = now();
-  const pixelData = image.voxelManager.getScalarData();
+  const pixelData = image.getPixelData();
 
   image.stats.lastGetPixelDataTime = now() - start;
 

packages/tools/examples/videoSegmentation/index.ts

@@ -30,7 +30,6 @@ const {
   Enums: csToolsEnums,
   BrushTool,
   segmentation,
-  utilities: cstUtils,
 } = cornerstoneTools;
 
 const { MouseBindings } = csToolsEnums;
@@ -223,10 +222,14 @@ async function run() {
   addVideoTime(viewportGrid, viewport);
   // We need the map on all image ids
   const allImageIds = viewport.getImageIds();
-  const segImages = await imageLoader.createAndCacheDerivedImages(allImageIds, {
-    skipCreateBuffer: true,
-    onCacheAdd: csUtils.VoxelManager.addInstanceToImage,
-  });
+  const firstImage = allImageIds[0];
+  const segImages = await imageLoader.createAndCacheDerivedImages(
+    [firstImage],
+    {
+      skipCreateBuffer: true,
+      onCacheAdd: csUtils.VoxelManager.addInstanceToImage,
+    }
+  );
 
   const segmentationImageIds = segImages.map((it) => it.imageId);
 

packages/tools/src/tools/displayTools/Labelmap/labelmapDisplay.ts

@@ -284,7 +284,7 @@ function _setLabelmapColorAndOpacity(
   const labelmapActor = labelmapActorEntry.actor as vtkVolume;
 
   // @ts-ignore - fix type in vtk
-  const { preLoad } = labelmapActor.get('preLoad') || { preLoad: null };
+  const { preLoad } = labelmapActor.get?.('preLoad') || { preLoad: null };
 
   if (preLoad) {
     preLoad({ cfun, ofun, actor: labelmapActor });