@cornerstonejs/core 1.77.13 → 1.78.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.77.13",
+  "version": "1.78.1",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "829144d11850aa0d3f9ea1f7068bbf0e24a19e8f"
+  "gitHead": "a3f12ef5eecb12158a9067945c7dc779f6feb3ea"
 }

package/src/RenderingEngine/RenderingEngine.ts

@@ -11,11 +11,9 @@ import viewportTypeUsesCustomRenderingPipeline from './helpers/viewportTypeUsesC
 import getOrCreateCanvas from './helpers/getOrCreateCanvas';
 import { getShouldUseCPURendering, isCornerstoneInitialized } from '../init';
 import type IStackViewport from '../types/IStackViewport';
-import type IVideoViewport from '../types/IVideoViewport';
 import type IRenderingEngine from '../types/IRenderingEngine';
 import type IVolumeViewport from '../types/IVolumeViewport';
 import type { IViewport } from '../types/IViewport';
-import VideoViewport from './VideoViewport';
 import viewportTypeToViewportClass from './helpers/viewportTypeToViewportClass';
 
 import type * as EventTypes from '../types/EventTypes';
@@ -389,24 +387,6 @@ class RenderingEngine implements IRenderingEngine {
     return viewports.filter(isStackViewport) as Array<IStackViewport>;
   }
 
-  /**
-   * Filters all the available viewports and return the stack viewports
-   * @returns stack viewports registered on the rendering Engine
-   */
-  public getVideoViewports(): Array<IVideoViewport> {
-    this._throwIfDestroyed();
-
-    const viewports = this.getViewports();
-
-    const isVideoViewport = (
-      viewport: IViewport
-    ): viewport is VideoViewport => {
-      return viewport instanceof VideoViewport;
-    };
-
-    return viewports.filter(isVideoViewport) as Array<IVideoViewport>;
-  }
-
   /**
    * Return all the viewports that are volume viewports
    * @returns An array of VolumeViewport objects.

package/src/RenderingEngine/StackViewport.ts

@@ -2760,7 +2760,7 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
 
     const diff = vec3.subtract(vec3.create(), worldPos, origin);
 
-    const worldPoint: Point2 = [
+    const indexPoint: Point2 = [
       vec3.dot(diff, iVector) / spacing[0],
       vec3.dot(diff, jVector) / spacing[1],
     ];
@@ -2768,7 +2768,7 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
     // pixel to canvas
     const canvasPoint = pixelToCanvas(
       this._cpuFallbackEnabledElement,
-      worldPoint
+      indexPoint
     );
     return canvasPoint;
   };

package/src/RenderingEngine/VideoViewport.ts

@@ -18,6 +18,7 @@ import type {
   ViewReferenceSpecifier,
   ViewReference,
   ReferenceCompatibleOptions,
+  ImageSetOptions,
 } from '../types';
 import * as metaData from '../metaData';
 import { Transform } from './helpers/cpuFallback/rendering/transform';
@@ -81,7 +82,7 @@ class VideoViewport extends Viewport implements IVideoViewport {
   private fps = 30;
 
   /** The number of frames in the video */
-  private numberOfFrames = 0;
+  private numberOfFrames: number;
 
   private videoCamera: InternalVideoCamera = {
     panWorld: [0, 0],
@@ -214,6 +215,19 @@ class VideoViewport extends Viewport implements IVideoViewport {
     };
   }
 
+  /**
+   * This is a wrapper for setVideo to allow generic behaviour
+   *
+   * @param _groupId - the id for the overall set of image ids.  Unused for video viewport.
+   * @param imageIds - a singleton list containing the imageId of a video.
+   */
+  public setDataIds(imageIds: string[], options?: ImageSetOptions) {
+    this.setVideo(
+      imageIds[0],
+      (options?.viewReference?.sliceIndex as number) || 1
+    );
+  }
+
   /**
    * Sets the video image id to show and hte frame number.
    * Requirements are to have the imageUrlModule in the metadata
@@ -221,17 +235,24 @@ class VideoViewport extends Viewport implements IVideoViewport {
    */
   public setVideo(imageId: string, frameNumber?: number): Promise<unknown> {
     this.imageId = Array.isArray(imageId) ? imageId[0] : imageId;
-    const { rendered } = metaData.get(MetadataModules.IMAGE_URL, imageId);
+    const imageUrlModule = metaData.get(MetadataModules.IMAGE_URL, imageId);
+    if (!imageUrlModule?.rendered) {
+      throw new Error(
+        `Video Image ID ${imageId} does not have a rendered video view`
+      );
+    }
+    const { rendered } = imageUrlModule;
     const generalSeries = metaData.get(MetadataModules.GENERAL_SERIES, imageId);
     this.modality = generalSeries?.Modality;
     this.metadata = this.getImageDataMetadata(imageId);
+    let { cineRate, numberOfFrames } = metaData.get(
+      MetadataModules.CINE,
+      imageId
+    );
+    this.numberOfFrames = numberOfFrames;
 
     return this.setVideoURL(rendered).then(() => {
-      let { cineRate, numberOfFrames } = metaData.get(
-        MetadataModules.CINE,
-        imageId
-      );
-      if (!numberOfFrames) {
+      if (!numberOfFrames || numberOfFrames === 1) {
         numberOfFrames = Math.round(
           this.videoElement.duration * (cineRate || 30)
         );
@@ -578,7 +599,7 @@ class VideoViewport extends Viewport implements IVideoViewport {
    * @param imageURI - containing frame number or range.
    * @returns
    */
-  public hasImageURI(imageURI: string) {
+  public hasImageURI(imageURI: string): boolean {
     // TODO - move annotationFrameRange into core so it can be used here.
     const framesMatch = imageURI.match(VideoViewport.frameRangeExtractor);
     const testURI = framesMatch
@@ -826,9 +847,10 @@ class VideoViewport extends Viewport implements IVideoViewport {
   };
 
   public getNumberOfSlices = (): number => {
-    return Math.round(
+    const computedSlices = Math.round(
       (this.videoElement.duration * this.fps) / this.scrollSpeed
     );
+    return isNaN(computedSlices) ? this.numberOfFrames : computedSlices;
   };
 
   public getFrameOfReferenceUID = (): string => {
@@ -1062,7 +1084,13 @@ class VideoViewport extends Viewport implements IVideoViewport {
       transformationMatrix[5]
     );
 
-    ctx.drawImage(this.videoElement, 0, 0, this.videoWidth, this.videoHeight);
+    ctx.drawImage(
+      this.videoElement,
+      0,
+      0,
+      this.videoWidth || 1024,
+      this.videoHeight || 1024
+    );
 
     for (const actor of this.getActors()) {
       (actor.actor as ICanvasActor).render(this, this.canvasContext);

package/src/RenderingEngine/Viewport.ts

@@ -39,6 +39,7 @@ import type {
   ViewReferenceSpecifier,
   ReferenceCompatibleOptions,
   ViewPresentationSelector,
+  DataSetOptions,
 } from '../types/IViewport';
 import type { vtkSlabCamera } from './vtkClasses/vtkSlabCamera';
 import { getConfiguration } from '../init';
@@ -1869,6 +1870,13 @@ class Viewport implements IViewport {
     const radius = Math.sqrt(w1 + w2 + w3 || 1) * 0.5;
     return radius;
   }
+
+  /**
+   * This is a wrapper for setStack/setVideo/etc
+   */
+  public setDataIds(_imageIds: string[], _options?: DataSetOptions) {
+    throw new Error('Unsupported operatoin setDataIds');
+  }
 }
 
 export default Viewport;