@cornerstonejs/core 0.40.0 → 0.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -51,5 +51,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "b21acf448f3b24c4ff109da5208bc313c0289b81"
+  "gitHead": "91c274e60d136f3470eace8c04bf2216df0a06ed"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -309,27 +309,26 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
    * @returns viewport properties including voi, interpolation type: TODO: slabThickness, invert, rotation, flip
    */
   public getProperties = (): VolumeViewportProperties => {
-    const actorEntries = this.getActors();
-    const voiRanges = actorEntries.map((actorEntry) => {
-      const volumeActor = actorEntry.actor as vtkVolume;
-      const volumeId = actorEntry.uid;
-      const cfun = volumeActor.getProperty().getRGBTransferFunction(0);
-      let lower, upper;
-      if (this.VOILUTFunction === 'SIGMOID') {
-        [lower, upper] = getVoiFromSigmoidRGBTransferFunction(cfun);
-      } else {
-        // @ts-ignore: vtk d ts problem
-        [lower, upper] = cfun.getRange();
-      }
-      return {
-        volumeId,
-        voiRange: { lower, upper },
-      };
-    });
-    return {
-      voiRange: voiRanges[0].voiRange, // TODO: handle multiple actors instead of just first.
-      VOILUTFunction: this.VOILUTFunction,
-    };
+    const voiRanges = this.getActors()
+      .map((actorEntry) => {
+        const volumeActor = actorEntry.actor as vtkVolume;
+        const volumeId = actorEntry.uid;
+        const volume = cache.getVolume(volumeId);
+        if (!volume) return null;
+        const cfun = volumeActor.getProperty().getRGBTransferFunction(0);
+        const [lower, upper] =
+          this.VOILUTFunction === 'SIGMOID'
+            ? getVoiFromSigmoidRGBTransferFunction(cfun)
+            : // @ts-ignore
+              cfun.getRange();
+        return { volumeId, voiRange: { lower, upper } };
+      })
+      .filter(Boolean);
+
+    const voiRange = voiRanges.length ? voiRanges[0].voiRange : null;
+    const VOILUTFunction = this.VOILUTFunction;
+
+    return { voiRange, VOILUTFunction };
   };
 
   /**
@@ -599,7 +598,9 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       spacing: vtkImageData.getSpacing(),
       origin: vtkImageData.getOrigin(),
       direction: vtkImageData.getDirection(),
-      scalarData: vtkImageData.getPointData().getScalars().getData(),
+      scalarData: vtkImageData.getPointData().getScalars().isDeleted()
+        ? null
+        : vtkImageData.getPointData().getScalars().getData(),
       imageData: actor.getMapper().getInputData(),
       metadata: {
         Modality: volume?.metadata?.Modality,

package/src/RenderingEngine/vtkClasses/vtkStreamingOpenGLVolumeMapper.js

@@ -285,6 +285,18 @@ function vtkStreamingOpenGLVolumeMapper(publicAPI, model) {
 
     return [lowerLeftU, lowerLeftV];
   };
+
+  // TODO: it seems like this may be needed to reset the GPU memory associated
+  // with a volume
+  // publicAPI.hardReset = () => {
+  //   model.opacityTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.colorTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.scalarTexture.setOglNorm16Ext(
+  //     model.context.getExtension('EXT_texture_norm16')
+  //   );
+  //   model.scalarTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.scalarTexture.resetFormatAndType();
+  // };
 }
 
 // ----------------------------------------------------------------------------

package/src/cache/cache.ts

@@ -133,7 +133,7 @@ class Cache implements ICache {
     }
 
     if (volume.imageData) {
-      volume.imageData = null;
+      volume.imageData.delete();
     }
 
     if (volumeLoadObject.cancelFn) {

package/src/cache/classes/ContourSet.ts

@@ -1,3 +1,4 @@
+import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
 import { Point3, IContourSet, IContour, ContourData } from '../../types';
 import Contour from './Contour';
 
@@ -19,6 +20,8 @@ export class ContourSet implements IContourSet {
   readonly frameOfReferenceUID: string;
   private color: Point3 = [200, 0, 0]; // default color
   private segmentIndex: number;
+  private polyData: vtkPolyData;
+  private centroid: Point3;
   contours: IContour[];
 
   constructor(props: ContourSetProps) {
@@ -27,7 +30,6 @@ export class ContourSet implements IContourSet {
     this.color = props.color ?? this.color;
     this.frameOfReferenceUID = props.frameOfReferenceUID;
     this.segmentIndex = props.segmentIndex;
-
     this._createEachContour(props.data);
     this.sizeInBytes = this._getSizeInBytes();
   }
@@ -50,6 +52,47 @@ export class ContourSet implements IContourSet {
 
       this.contours.push(contour);
     });
+
+    this._updateContourSetCentroid();
+  }
+
+  // Todo: this centroid calculation has limitation in which
+  // it will not work for MPR, the reason is that we are finding
+  // the centroid of all points but at the end we are picking the
+  // closest point to the centroid, which will not work for MPR
+  // The reason for picking the closest is a rendering issue since
+  // the centroid can be not exactly in the middle of the slice
+  // and it might cause the contour to be rendered in the wrong slice
+  // or not rendered at all
+  _updateContourSetCentroid(): void {
+    const numberOfPoints = this.getTotalNumberOfPoints();
+    const flatPointsArray = this.getFlatPointsArray();
+
+    const sumOfPoints = flatPointsArray.reduce(
+      (acc, point) => {
+        return [acc[0] + point[0], acc[1] + point[1], acc[2] + point[2]];
+      },
+      [0, 0, 0]
+    );
+
+    const centroid = [
+      sumOfPoints[0] / numberOfPoints,
+      sumOfPoints[1] / numberOfPoints,
+      sumOfPoints[2] / numberOfPoints,
+    ];
+
+    const closestPoint = flatPointsArray.reduce((closestPoint, point) => {
+      const distanceToPoint = this._getDistance(centroid, point);
+      const distanceToClosestPoint = this._getDistance(centroid, closestPoint);
+
+      if (distanceToPoint < distanceToClosestPoint) {
+        return point;
+      } else {
+        return closestPoint;
+      }
+    }, flatPointsArray[0]);
+
+    this.centroid = closestPoint;
   }
 
   _getSizeInBytes(): number {
@@ -58,6 +101,10 @@ export class ContourSet implements IContourSet {
     }, 0);
   }
 
+  public getCentroid(): Point3 {
+    return this.centroid;
+  }
+
   public getSegmentIndex(): number {
     return this.segmentIndex;
   }
@@ -138,6 +185,13 @@ export class ContourSet implements IContourSet {
     return this.getPointsInContour(contourIndex).length;
   }
 
+  private _getDistance(pointA, pointB) {
+    return Math.sqrt(
+      (pointA[0] - pointB[0]) ** 2 +
+        (pointA[1] - pointB[1]) ** 2 +
+        (pointA[2] - pointB[2]) ** 2
+    );
+  }
   /**
   public convertToClosedSurface(): ClosedSurface {
     const flatPointsArray = this.getFlatPointsArray();

package/src/cache/classes/ImageVolume.ts

@@ -1,6 +1,7 @@
 import isTypedArray from '../../utilities/isTypedArray';
 import { imageIdToURI } from '../../utilities';
 import { vtkStreamingOpenGLTexture } from '../../RenderingEngine/vtkClasses';
+import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
 import {
   IVolume,
   VolumeScalarData,
@@ -50,7 +51,7 @@ export class ImageVolume implements IImageVolume {
   /** volume number of voxels */
   numVoxels: number;
   /** volume image data */
-  imageData?: any;
+  imageData?: vtkImageData;
   /** open gl texture for the volume */
   vtkOpenGLTexture: any; // No good way of referencing vtk classes as they aren't classes.
   /** load status object for the volume */
@@ -147,7 +148,12 @@ export class ImageVolume implements IImageVolume {
    * destroy the volume and make it unusable
    */
   destroy(): void {
+    // TODO: GPU memory associated with volume is not cleared.
+    this.vtkOpenGLTexture.releaseGraphicsResources();
+    this.vtkOpenGLTexture.destroyTexture();
     this.vtkOpenGLTexture.delete();
+    this.imageData.delete();
+    this.imageData = null;
     this.scalarData = null;
   }
 }

package/src/types/IContourSet.ts

@@ -1,3 +1,4 @@
+import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
 import { ContourData, IContour, Point3 } from './';
 
 /**
@@ -12,6 +13,7 @@ export interface IContourSet {
   _createEachContour(data: ContourData[]): void;
   getSizeInBytes(): number;
   getSegmentIndex(): number;
+  getCentroid(): Point3;
   getColor(): any;
   /**
    * This function returns the contours of the image