@cornerstonejs/core 1.63.2 → 1.63.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.63.2",
+  "version": "1.63.4",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "315d09daf27cd6dd46d33b62a59b6cf2050116c9"
+  "gitHead": "752f9beba007fcbd70718545199246df03061ca2"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -62,6 +62,7 @@ import type { vtkSlabCamera as vtkSlabCameraType } from './vtkClasses/vtkSlabCam
 import vtkSlabCamera from './vtkClasses/vtkSlabCamera';
 import transformWorldToIndex from '../utilities/transformWorldToIndex';
 import { getTransferFunctionNodes } from '../utilities/transferFunctionUtils';
+import { getColormap, getColormapNames } from '../utilities/colormap';
 /**
  * Abstract base class for volume viewports. VolumeViewports are used to render
  * 3D volumes from which various orientations can be viewed. Since VolumeViewports
@@ -859,9 +860,11 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       acc.push(node.x, node.r, node.g, node.b);
       return acc;
     }, []);
-    const colormaps = vtkColorMaps.rgbPresetNames.map((presetName) =>
+    const colormapsVTK = vtkColorMaps.rgbPresetNames.map((presetName) =>
       vtkColorMaps.getPresetByName(presetName)
     );
+    const colormapsCS3D = getColormapNames().map((colormapName) => getColormap(colormapName));
+    const colormaps = colormapsVTK.concat(colormapsCS3D);
     const matchedColormap = colormaps.find((colormap) => {
       const { RGBPoints: presetRGBPoints } = colormap;
       if (presetRGBPoints.length !== RGBPoints.length) {

package/src/RenderingEngine/CanvasActor/index.ts

@@ -54,7 +54,7 @@ export default class CanvasActor implements ICanvasActor {
       const baseOffset = (y * width) << 2;
       let indicesToDelete;
       for (const run of row) {
-        const { start: start, end, value: segmentIndex } = run;
+        const { start, end, value: segmentIndex } = run;
         if (segmentIndex === 0) {
           indicesToDelete ||= [];
           indicesToDelete.push(row.indexOf(run));
@@ -85,10 +85,10 @@ export default class CanvasActor implements ICanvasActor {
       imageData,
       0,
       0,
-      dirtyX,
-      dirtyY,
-      dirtyWidth,
-      dirtyHeight
+      dirtyX - 1,
+      dirtyY - 1,
+      dirtyWidth + 2,
+      dirtyHeight + 2
     );
     context.drawImage(
       canvas,

package/src/RenderingEngine/VideoViewport.ts

@@ -59,6 +59,13 @@ class VideoViewport extends Viewport implements IVideoViewport {
   private playbackRate = 1;
   private scalarData: CanvasScalarData;
 
+  /**
+   * This is used to pause initially so that we get at least one render to allow
+   * navigating frames.  Otherwise the viewport is blank initially until the user
+   * hits play manually.
+   */
+  private initialRender: () => void;
+
   /**
    * The range is the set of frames to play
    */
@@ -119,6 +126,7 @@ class VideoViewport extends Viewport implements IVideoViewport {
     this.videoElement = document.createElement('video');
     this.videoElement.muted = this.mute;
     this.videoElement.loop = this.loop;
+    this.videoElement.autoplay = true;
     this.videoElement.crossOrigin = 'anonymous';
 
     this.addEventListeners();
@@ -235,16 +243,22 @@ class VideoViewport extends Viewport implements IVideoViewport {
       this.numberOfFrames = numberOfFrames;
       // 1 based range setting
       this.setFrameRange([1, numberOfFrames]);
-      this.play();
+      // The initial render allows us to set the frame position - rendering needs
+      // to start already playing
+      this.initialRender = () => {
+        this.initialRender = null;
+        this.pause();
+        this.setFrameNumber(frameNumber || 1);
+      };
+
       // This is ugly, but without it, the video often fails to render initially
       // so having a play, followed by a pause fixes things.
-      // 100 ms is a tested value that seems to work to prevent exceptions
+      // 25 ms is a tested value that seems to work to prevent exceptions
       return new Promise((resolve) => {
         window.setTimeout(() => {
-          this.pause();
           this.setFrameNumber(frameNumber || 1);
           resolve(this);
-        }, 100);
+        }, 25);
       });
     });
   }
@@ -646,6 +660,7 @@ class VideoViewport extends Viewport implements IVideoViewport {
       ];
     }
 
+    this.canvasContext.fillStyle = 'rgba(0,0,0,1)';
     this.canvasContext.fillRect(0, 0, this.canvas.width, this.canvas.height);
 
     if (this.isPlaying === false) {
@@ -1045,6 +1060,8 @@ class VideoViewport extends Viewport implements IVideoViewport {
       duration: this.videoElement.duration,
     });
 
+    this.initialRender?.();
+
     const frame = this.getFrameNumber();
     if (this.isPlaying) {
       if (frame < this.frameRange[0]) {