@cornerstonejs/core 1.26.0 → 1.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/esm/index.d.ts",
@@ -46,5 +46,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "df9b69e21ab5dd9ccb33eaca7508abcb9f031e00"
+  "gitHead": "545dab67a657488ffe90b7490b31976d953005fc"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -31,7 +31,6 @@ import type {
   Point2,
   Point3,
   VOIRange,
-  ViewportProperties,
   VolumeViewportProperties,
 } from '../types';
 import { VoiModifiedEventDetail } from '../types/EventTypes';
@@ -79,7 +78,7 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
     VolumeViewportProperties
   >();
 
-  private viewportProperties: VolumeViewportProperties = {};
+  protected viewportProperties: VolumeViewportProperties = {};
 
   constructor(props: ViewportInput) {
     super(props);
@@ -606,9 +605,7 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
 
     if (properties.slabThickness !== undefined) {
       this.setSlabThickness(properties.slabThickness);
-      //We need to set the current slabthickness here since setSlabThickness is define in VolumeViewport
-      // this.currentViewportProperties.get(volumeId).slabThickness =
-      //   properties.slabThickness;
+      //We need to set the current slabThickness here since setSlabThickness is define in VolumeViewport
       this.viewportProperties.slabThickness = properties.slabThickness;
     }
 

package/src/RenderingEngine/VolumeViewport.ts

@@ -302,6 +302,7 @@ class VolumeViewport extends BaseVolumeViewport {
     const currentCamera = this.getCamera();
     this.updateClippingPlanesForActors(currentCamera);
     this.triggerCameraModifiedEventIfNecessary(currentCamera, currentCamera);
+    this.viewportProperties.slabThickness = slabThickness;
   }
 
   /**
@@ -387,6 +388,13 @@ class VolumeViewport extends BaseVolumeViewport {
       throw new Error(`No actor found for the given volumeId: ${volumeId}`);
     }
 
+    // if a custom slabThickness was set, we need to reset it
+    if (volumeActor.slabThickness) {
+      volumeActor.slabThickness = RENDERING_DEFAULTS.MINIMUM_SLAB_THICKNESS;
+      this.viewportProperties.slabThickness = undefined;
+      this.updateClippingPlanesForActors(this.getCamera());
+    }
+
     const imageVolume = cache.getVolume(volumeActor.uid);
     if (!imageVolume) {
       throw new Error(

package/src/utilities/getTargetVolumeAndSpacingInNormalDir.ts

@@ -1,7 +1,7 @@
 import cache from '../cache/cache';
 import { EPSILON } from '../constants';
 // import type { VolumeViewport } from '../RenderingEngine'
-import { ICamera, IImageVolume, IVolumeViewport } from '../types';
+import { ICamera, IImageVolume, IVolumeViewport, Point3 } from '../types';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
 import { getVolumeLoaderSchemes } from '../loaders/volumeLoader';
 
@@ -71,9 +71,11 @@ export default function getTargetVolumeAndSpacingInNormalDir(
 
     const imageVolume = imageVolumes[imageVolumeIndex];
     const { uid: actorUID } = volumeActors[imageVolumeIndex];
-    const spacingInNormalDirection = getSpacingInNormalDirection(
+
+    const spacingInNormalDirection = getSpacingInNormal(
       imageVolume,
-      viewPlaneNormal
+      viewPlaneNormal,
+      viewport
     );
 
     return { imageVolume, spacingInNormalDirection, actorUID };
@@ -104,9 +106,10 @@ export default function getTargetVolumeAndSpacingInNormalDir(
       continue;
     }
 
-    const spacingInNormalDirection = getSpacingInNormalDirection(
+    const spacingInNormalDirection = getSpacingInNormal(
       imageVolume,
-      viewPlaneNormal
+      viewPlaneNormal,
+      viewport
     );
 
     // Allow for EPSILON part larger requirement to prefer earlier volumes
@@ -124,3 +127,20 @@ export default function getTargetVolumeAndSpacingInNormalDir(
 
   return smallest;
 }
+
+function getSpacingInNormal(
+  imageVolume: IImageVolume,
+  viewPlaneNormal: Point3,
+  viewport: IVolumeViewport
+): number {
+  const { slabThickness } = viewport.getProperties();
+  let spacingInNormalDirection = slabThickness;
+  if (!slabThickness) {
+    spacingInNormalDirection = getSpacingInNormalDirection(
+      imageVolume,
+      viewPlaneNormal
+    );
+  }
+
+  return spacingInNormalDirection;
+}