@cornerstonejs/core 1.4.1 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -44,5 +44,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "13e9e13e8445e84ac0ef70e4214c0c74b324cce3"
+  "gitHead": "41a6ff5abf9944db507ba2641b972fc5dd3e7a39"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -1,6 +1,7 @@
 import vtkVolume from '@kitware/vtk.js/Rendering/Core/Volume';
 import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
 import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps';
+import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction';
 
 import cache from '../cache';
 import {
@@ -50,7 +51,7 @@ import volumeNewImageEventDispatcher, {
 import Viewport from './Viewport';
 import type { vtkSlabCamera as vtkSlabCameraType } from './vtkClasses/vtkSlabCamera';
 import vtkSlabCamera from './vtkClasses/vtkSlabCamera';
-import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction';
+import transformWorldToIndex from '../utilities/transformWorldToIndex';
 
 /**
  * Abstract base class for volume viewports. VolumeViewports are used to render
@@ -1031,45 +1032,64 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       );
     }
   }
-
   /**
-   * Reset the camera for the volume viewport
+   * Gets the largest slab thickness from all actors in the viewport.
+   *
+   * @returns slabThickness - The slab thickness.
    */
-  resetCamera(
-    resetPan?: boolean,
-    resetZoom?: boolean,
-    resetToCenter?: boolean
-  ): boolean {
-    return super.resetCamera(resetPan, resetZoom, resetToCenter);
+  public getSlabThickness(): number {
+    const actors = this.getActors();
+    let slabThickness = RENDERING_DEFAULTS.MINIMUM_SLAB_THICKNESS;
+    actors.forEach((actor) => {
+      if (actor.slabThickness > slabThickness) {
+        slabThickness = actor.slabThickness;
+      }
+    });
+
+    return slabThickness;
   }
+  /**
+   * Given a point in world coordinates, return the intensity at that point
+   * @param point - The point in world coordinates to get the intensity
+   * from.
+   * @returns The intensity value of the voxel at the given point.
+   */
+  public getIntensityFromWorld(point: Point3): number {
+    const actorEntry = this.getDefaultActor();
+    if (!actorIsA(actorEntry, 'vtkVolume')) {
+      return;
+    }
 
-  getCurrentImageIdIndex = (): number => {
-    throw new Error('Method not implemented.');
-  };
+    const { actor, uid } = actorEntry;
+    const imageData = actor.getMapper().getInputData();
 
-  getCurrentImageId = (): string => {
-    throw new Error('Method not implemented.');
-  };
+    const volume = cache.getVolume(uid);
+    const { dimensions } = volume;
+
+    const index = transformWorldToIndex(imageData, point);
 
-  getIntensityFromWorld(point: Point3): number {
-    throw new Error('Method not implemented.');
+    const voxelIndex =
+      index[2] * dimensions[0] * dimensions[1] +
+      index[1] * dimensions[0] +
+      index[0];
+
+    return volume.getScalarData()[voxelIndex];
   }
 
-  setBlendMode(
+  abstract getCurrentImageIdIndex(): number;
+
+  abstract getCurrentImageId(): string;
+
+  abstract setBlendMode(
     blendMode: BlendModes,
-    filterActorUIDs?: string[],
+    filterActorUIDs?: Array<string>,
     immediate?: boolean
-  ): void {
-    throw new Error('Method not implemented.');
-  }
+  ): void;
 
-  setSlabThickness(slabThickness: number, filterActorUIDs?: string[]): void {
-    throw new Error('Method not implemented.');
-  }
-
-  getSlabThickness(): number {
-    throw new Error('Method not implemented.');
-  }
+  abstract setSlabThickness(
+    slabThickness: number,
+    filterActorUIDs?: Array<string>
+  ): void;
 }
 
 export default BaseVolumeViewport;

package/src/RenderingEngine/Viewport.ts

@@ -621,7 +621,7 @@ class Viewport implements IViewport {
    *   be detected for pan/zoom values)
    * @returns boolean
    */
-  protected resetCamera(
+  public resetCamera(
     resetPan = true,
     resetZoom = true,
     resetToCenter = true,

package/src/RenderingEngine/VolumeViewport.ts

@@ -13,7 +13,6 @@ import type {
 } from '../types';
 import type { ViewportInput } from '../types/IViewport';
 import { actorIsA, getClosestImageId } from '../utilities';
-import transformWorldToIndex from '../utilities/transformWorldToIndex';
 import BaseVolumeViewport from './BaseVolumeViewport';
 
 /**
@@ -182,34 +181,6 @@ class VolumeViewport extends BaseVolumeViewport {
     this.resetCamera();
   }
 
-  /**
-   * Given a point in world coordinates, return the intensity at that point
-   * @param point - The point in world coordinates to get the intensity
-   * from.
-   * @returns The intensity value of the voxel at the given point.
-   */
-  public getIntensityFromWorld(point: Point3): number {
-    const actorEntry = this.getDefaultActor();
-    if (!actorIsA(actorEntry, 'vtkVolume')) {
-      return;
-    }
-
-    const { actor, uid } = actorEntry;
-    const imageData = actor.getMapper().getInputData();
-
-    const volume = cache.getVolume(uid);
-    const { dimensions } = volume;
-
-    const index = transformWorldToIndex(imageData, point);
-
-    const voxelIndex =
-      index[2] * dimensions[0] * dimensions[1] +
-      index[1] * dimensions[0] +
-      index[0];
-
-    return volume.getScalarData()[voxelIndex];
-  }
-
   public setBlendMode(
     blendMode: BlendModes,
     filterActorUIDs = [],
@@ -294,7 +265,6 @@ class VolumeViewport extends BaseVolumeViewport {
    * filterActorUIDs are provided, all actors will be affected.
    *
    * @param slabThickness - The slab thickness to set.
-   * @param blendMode - The blend mode to use when rendering the actors.
    * @param filterActorUIDs - Optional argument to filter the actors to apply
    * the slab thickness to (if not provided, all actors will be affected).
    */
@@ -318,23 +288,6 @@ class VolumeViewport extends BaseVolumeViewport {
     this.triggerCameraModifiedEventIfNecessary(currentCamera, currentCamera);
   }
 
-  /**
-   * Gets the largest slab thickness from all actors in the viewport.
-   *
-   * @returns slabThickness - The slab thickness.
-   */
-  public getSlabThickness(): number {
-    const actors = this.getActors();
-    let slabThickness = RENDERING_DEFAULTS.MINIMUM_SLAB_THICKNESS;
-    actors.forEach((actor) => {
-      if (actor.slabThickness > slabThickness) {
-        slabThickness = actor.slabThickness;
-      }
-    });
-
-    return slabThickness;
-  }
-
   /**
    * Uses the origin and focalPoint to calculate the slice index.
    * Todo: This only works if the imageIds are properly sorted

package/src/RenderingEngine/VolumeViewport3D.ts

@@ -1,4 +1,4 @@
-import { OrientationAxis } from '../enums';
+import { BlendModes, OrientationAxis } from '../enums';
 import type { ViewportInput } from '../types/IViewport';
 import BaseVolumeViewport from './BaseVolumeViewport';
 
@@ -38,13 +38,28 @@ class VolumeViewport3D extends BaseVolumeViewport {
 
   getRotation = (): number => 0;
 
-  public getCurrentImageIdIndex = (): number | undefined => {
+  getCurrentImageIdIndex = (): number | undefined => {
     return undefined;
   };
 
-  public getCurrentImageId = (): string => {
+  getCurrentImageId = (): string => {
     return null;
   };
+
+  setSlabThickness(
+    slabThickness: number,
+    filterActorUIDs?: Array<string>
+  ): void {
+    return null;
+  }
+
+  setBlendMode(
+    blendMode: BlendModes,
+    filterActorUIDs?: string[],
+    immediate?: boolean
+  ): void {
+    return null;
+  }
 }
 
 export default VolumeViewport3D;

package/src/RenderingEngine/helpers/createVolumeActor.ts

@@ -57,6 +57,15 @@ async function createVolumeActor(
   const volumeActor = vtkVolume.newInstance();
   volumeActor.setMapper(volumeMapper);
 
+  const numberOfComponents = imageData
+    .getPointData()
+    .getScalars()
+    .getNumberOfComponents();
+
+  if (numberOfComponents === 3) {
+    volumeActor.getProperty().setIndependentComponents(false);
+  }
+
   // If the volume is composed of imageIds, we can apply a default VOI based
   // on either the metadata or the min/max of the middle slice. Example of other
   // types of volumes which might not be composed of imageIds would be e.g., nrrd, nifti

package/src/loaders/volumeLoader.ts

@@ -93,7 +93,7 @@ function createInternalVTKRepresentation(
   imageData.setDirection(direction);
   imageData.setOrigin(origin);
 
-  // Add scalar datas to 3D or 4D volume
+  // Add scalar data to 3D or 4D volume
   if (volume.isDynamicVolume()) {
     const scalarDataArrays = (<Types.IDynamicImageVolume>(
       volume