@cornerstonejs/core 4.21.5 → 4.21.6

package/dist/esm/RenderingEngine/BaseVolumeViewport.d.ts

@@ -1,7 +1,7 @@
 import type { mat4 } from 'gl-matrix';
 import type { BlendModes, InterpolationType } from '../enums';
 import { OrientationAxis } from '../enums';
-import type { FlipDirection, IImageData, IVolumeInput, OrientationVectors, Point2, Point3, VolumeViewportProperties, ViewReferenceSpecifier, ReferenceCompatibleOptions, ViewReference, ICamera } from '../types';
+import type { ActorEntry, FlipDirection, IImageData, IVolumeInput, OrientationVectors, Point2, Point3, VolumeViewportProperties, ViewReferenceSpecifier, ReferenceCompatibleOptions, ViewReference, ICamera } from '../types';
 import type { VoiModifiedEventDetail } from '../types/EventTypes';
 import type { PlaneRestriction, ViewportInput } from '../types/IViewport';
 import type { TransferFunctionNodes } from '../types/ITransferFunctionNode';
@@ -56,6 +56,7 @@ declare abstract class BaseVolumeViewport extends Viewport {
     private setSmoothing;
     protected shouldUseCustomRenderPass(): boolean;
     getRenderPasses: () => any[];
+    protected _restoreVolumeRenderingDefaults(volumeActor: ActorEntry, volumeId: string): void;
     resetToDefaultProperties(volumeId: string): void;
     private setPreset;
     setSampleDistanceMultiplier(multiplier: number): void;

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -14,13 +14,13 @@ import invertRgbTransferFunction from '../utilities/invertRgbTransferFunction';
 import createSigmoidRGBTransferFunction from '../utilities/createSigmoidRGBTransferFunction';
 import transformWorldToIndex from '../utilities/transformWorldToIndex';
 import { findMatchingColormap, updateOpacity as colormapUpdateOpacity, updateThreshold as colormapUpdateThreshold, getThresholdValue, getMaxOpacity, } from '../utilities/colormap';
-import { getTransferFunctionNodes } from '../utilities/transferFunctionUtils';
+import { getTransferFunctionNodes, setTransferFunctionNodes, } from '../utilities/transferFunctionUtils';
 import createVolumeActor from './helpers/createVolumeActor';
 import volumeNewImageEventDispatcher, { resetVolumeNewImageState, } from './helpers/volumeNewImageEventDispatcher';
 import Viewport from './Viewport';
 import vtkSlabCamera from './vtkClasses/vtkSlabCamera';
 import getVolumeViewportScrollInfo from '../utilities/getVolumeViewportScrollInfo';
-import { actorIsA } from '../utilities/actorCheck';
+import { actorIsA, isImageActor } from '../utilities/actorCheck';
 import snapFocalPointToSlice from '../utilities/snapFocalPointToSlice';
 import getVoiFromSigmoidRGBTransferFunction from '../utilities/getVoiFromSigmoidRGBTransferFunction';
 import isEqual, { isEqualAbs, isEqualNegative } from '../utilities/isEqual';
@@ -837,6 +837,21 @@ class BaseVolumeViewport extends Viewport {
     shouldUseCustomRenderPass() {
         return !this.useCPURendering;
     }
+    _restoreVolumeRenderingDefaults(volumeActor, volumeId) {
+        if (!isImageActor(volumeActor)) {
+            return;
+        }
+        const properties = this.getDefaultProperties(volumeId);
+        if (properties?.preset || properties?.colormap) {
+            this.setProperties(properties, volumeId, true);
+        }
+        else {
+            const transferFunction = volumeActor.actor
+                .getProperty()
+                .getRGBTransferFunction(0);
+            setTransferFunctionNodes(transferFunction, this.initialTransferFunctionNodes);
+        }
+    }
     resetToDefaultProperties(volumeId) {
         const properties = this.globalDefaultProperties;
         if (properties.colormap?.name) {

package/dist/esm/RenderingEngine/VolumeViewport.js

@@ -3,7 +3,7 @@ import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
 import cache from '../cache/cache';
 import { EPSILON, MPR_CAMERA_VALUES, RENDERING_DEFAULTS } from '../constants';
 import { OrientationAxis, Events } from '../enums';
-import { actorIsA, isImageActor } from '../utilities/actorCheck';
+import { actorIsA } from '../utilities/actorCheck';
 import getClosestImageId from '../utilities/getClosestImageId';
 import getSliceRange from '../utilities/getSliceRange';
 import getSpacingInNormalDirection from '../utilities/getSpacingInNormalDirection';
@@ -11,7 +11,6 @@ import snapFocalPointToSlice from '../utilities/snapFocalPointToSlice';
 import triggerEvent from '../utilities/triggerEvent';
 import BaseVolumeViewport from './BaseVolumeViewport';
 import setDefaultVolumeVOI from './helpers/setDefaultVolumeVOI';
-import { setTransferFunctionNodes } from '../utilities/transferFunctionUtils';
 import getImageSliceDataForVolumeViewport from '../utilities/getImageSliceDataForVolumeViewport';
 import { transformCanvasToIJK } from '../utilities/transformCanvasToIJK';
 import { transformIJKToCanvas } from '../utilities/transformIJKToCanvas';
@@ -466,12 +465,7 @@ class VolumeViewport extends BaseVolumeViewport {
             throw new Error(`imageVolume with id: ${volumeId} does not exist in cache`);
         }
         setDefaultVolumeVOI(volumeActor.actor, imageVolume);
-        if (isImageActor(volumeActor)) {
-            const transferFunction = volumeActor.actor
-                .getProperty()
-                .getRGBTransferFunction(0);
-            setTransferFunctionNodes(transferFunction, this.initialTransferFunctionNodes);
-        }
+        this._restoreVolumeRenderingDefaults(volumeActor, volumeId);
         const eventDetails = {
             ...super.getVOIModifiedEventDetail(volumeId),
         };

package/dist/esm/RenderingEngine/VolumeViewport3D.js

@@ -3,8 +3,7 @@ import { OrientationAxis, Events } from '../enums';
 import cache from '../cache/cache';
 import setDefaultVolumeVOI from './helpers/setDefaultVolumeVOI';
 import triggerEvent from '../utilities/triggerEvent';
-import { actorIsA, isImageActor } from '../utilities/actorCheck';
-import { setTransferFunctionNodes } from '../utilities/transferFunctionUtils';
+import { actorIsA } from '../utilities/actorCheck';
 import BaseVolumeViewport from './BaseVolumeViewport';
 class VolumeViewport3D extends BaseVolumeViewport {
     constructor(props) {
@@ -98,12 +97,7 @@ class VolumeViewport3D extends BaseVolumeViewport {
             throw new Error(`imageVolume with id: ${volumeId} does not exist in cache`);
         }
         setDefaultVolumeVOI(volumeActor.actor, imageVolume);
-        if (isImageActor(volumeActor)) {
-            const transferFunction = volumeActor.actor
-                .getProperty()
-                .getRGBTransferFunction(0);
-            setTransferFunctionNodes(transferFunction, this.initialTransferFunctionNodes);
-        }
+        this._restoreVolumeRenderingDefaults(volumeActor, volumeId);
         this.setCamera(this.initialCamera);
         triggerEvent(this.element, Events.VOI_MODIFIED, super.getVOIModifiedEventDetail(volumeId));
     }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.21.5";
+export declare const version = "4.21.6";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.21.5';
+export const version = '4.21.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.21.5",
+  "version": "4.21.6",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "dd0d71c5bfd944607a629f7087d6b04fd4347e65"
+  "gitHead": "f353e5f47d7535dd369b6a7e65ef12ef3f797153"
 }