@cornerstonejs/core 4.6.3 → 4.7.0

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

@@ -10,6 +10,7 @@ declare abstract class BaseVolumeViewport extends Viewport {
     useCPURendering: boolean;
     private _FrameOfReferenceUID;
     private sharpening;
+    private smoothing;
     protected initialTransferFunctionNodes: TransferFunctionNodes;
     private globalDefaultProperties;
     private perVolumeIdDefaultProperties;
@@ -48,8 +49,9 @@ declare abstract class BaseVolumeViewport extends Viewport {
     setViewPlane(planeRestriction: PlaneRestriction): void;
     setViewReference(viewRef: ViewReference): void;
     private setThreshold;
-    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, }?: VolumeViewportProperties, volumeId?: string, suppressEvents?: boolean): void;
+    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, smoothing, }?: VolumeViewportProperties, volumeId?: string, suppressEvents?: boolean): void;
     private setSharpening;
+    private setSmoothing;
     protected shouldUseCustomRenderPass(): boolean;
     getRenderPasses: () => any[];
     resetToDefaultProperties(volumeId: string): void;

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -31,12 +31,13 @@ import { getCameraVectors } from './helpers/getCameraVectors';
 import { isContextPoolRenderingEngine } from './helpers/isContextPoolRenderingEngine';
 import mprCameraValues from '../constants/mprCameraValues';
 import { isInvalidNumber } from './helpers/isInvalidNumber';
-import { createSharpeningRenderPass } from './renderPasses';
+import { createSharpeningRenderPass, createSmoothingRenderPass, } from './renderPasses';
 class BaseVolumeViewport extends Viewport {
     constructor(props) {
         super(props);
         this.useCPURendering = false;
         this.sharpening = 0;
+        this.smoothing = 0;
         this.perVolumeIdDefaultProperties = new Map();
         this.viewportProperties = {};
         this.volumeIds = new Set();
@@ -76,15 +77,26 @@ class BaseVolumeViewport extends Viewport {
             this.sharpening = sharpening;
             this.render();
         };
+        this.setSmoothing = (smoothing) => {
+            this.smoothing = smoothing;
+            this.render();
+        };
         this.getRenderPasses = () => {
             if (!this.shouldUseCustomRenderPass()) {
                 return null;
             }
+            const renderPasses = [];
             try {
-                return [createSharpeningRenderPass(this.sharpening)];
+                if (this.smoothing > 0) {
+                    renderPasses.push(createSmoothingRenderPass(this.smoothing));
+                }
+                if (this.sharpening > 0) {
+                    renderPasses.push(createSharpeningRenderPass(this.sharpening));
+                }
+                return renderPasses.length ? renderPasses : null;
             }
             catch (e) {
-                console.warn('Failed to create sharpening render passes:', e);
+                console.warn('Failed to create custom render passes:', e);
                 return null;
             }
         };
@@ -134,6 +146,7 @@ class BaseVolumeViewport extends Viewport {
                 slabThickness: slabThickness,
                 preset,
                 sharpening: this.sharpening,
+                smoothing: this.smoothing,
             };
         };
         this.getColormap = (volumeId) => {
@@ -721,7 +734,7 @@ class BaseVolumeViewport extends Viewport {
                 const newPosition = vec3.add(vec3.create(), position, focalShift);
                 this.setCamera({
                     focalPoint: newImagePositionPatient,
-                    position: newPosition
+                    position: newPosition,
                 });
                 this.render();
                 return;
@@ -761,7 +774,7 @@ class BaseVolumeViewport extends Viewport {
         };
         triggerEvent(this.element, Events.COLORMAP_MODIFIED, eventDetail);
     }
-    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, } = {}, volumeId, suppressEvents = false) {
+    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, smoothing, } = {}, volumeId, suppressEvents = false) {
         if (this.globalDefaultProperties == null) {
             this.setDefaultProperties({
                 voiRange,
@@ -805,9 +818,12 @@ class BaseVolumeViewport extends Viewport {
         if (typeof sharpening !== 'undefined') {
             this.setSharpening(sharpening);
         }
+        if (typeof smoothing !== 'undefined') {
+            this.setSmoothing(smoothing);
+        }
     }
     shouldUseCustomRenderPass() {
-        return this.sharpening > 0 && !this.useCPURendering;
+        return !this.useCPURendering;
     }
     resetToDefaultProperties(volumeId) {
         const properties = this.globalDefaultProperties;

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

@@ -28,6 +28,7 @@ declare class StackViewport extends Viewport {
     private voiRange;
     private voiUpdatedWithSetProperties;
     private sharpening;
+    private smoothing;
     private VOILUTFunction;
     private invert;
     private initialInvert;
@@ -78,6 +79,7 @@ declare class StackViewport extends Viewport {
     private setInvertColor;
     private setColormap;
     private setSharpening;
+    private setSmoothing;
     protected shouldUseCustomRenderPass(): boolean;
     getRenderPasses: () => any[];
     private initializeElementDisabledHandler;
@@ -92,7 +94,7 @@ declare class StackViewport extends Viewport {
     private calibrateIfNecessary;
     setDefaultProperties(ViewportProperties: StackViewportProperties, imageId?: string): void;
     clearDefaultProperties(imageId?: string): void;
-    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, }?: StackViewportProperties, suppressEvents?: boolean): void;
+    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, smoothing, }?: StackViewportProperties, suppressEvents?: boolean): void;
     getDefaultProperties: (imageId?: string) => StackViewportProperties;
     getProperties: () => StackViewportProperties;
     resetCameraForResize: () => boolean;

package/dist/esm/RenderingEngine/StackViewport.js

@@ -44,7 +44,7 @@ import getSpacingInNormalDirection from '../utilities/getSpacingInNormalDirectio
 import getClosestImageId from '../utilities/getClosestImageId';
 import { adjustInitialViewUp } from '../utilities/adjustInitialViewUp';
 import { isContextPoolRenderingEngine } from './helpers/isContextPoolRenderingEngine';
-import { createSharpeningRenderPass } from './renderPasses';
+import { createSharpeningRenderPass, createSmoothingRenderPass, } from './renderPasses';
 const log = coreLog.getLogger('RenderingEngine', 'StackViewport');
 class StackViewport extends Viewport {
     constructor(props) {
@@ -58,6 +58,7 @@ class StackViewport extends Viewport {
         this.perImageIdDefaultProperties = new Map();
         this.voiUpdatedWithSetProperties = false;
         this.sharpening = 0;
+        this.smoothing = 0;
         this.invert = false;
         this.initialInvert = false;
         this.initialTransferFunctionNodes = null;
@@ -70,15 +71,26 @@ class StackViewport extends Viewport {
             this.sharpening = sharpening;
             this.render();
         };
+        this.setSmoothing = (smoothing) => {
+            this.smoothing = smoothing;
+            this.render();
+        };
         this.getRenderPasses = () => {
             if (!this.shouldUseCustomRenderPass()) {
                 return null;
             }
+            const renderPasses = [];
             try {
-                return [createSharpeningRenderPass(this.sharpening)];
+                if (this.smoothing > 0) {
+                    renderPasses.push(createSmoothingRenderPass(this.smoothing));
+                }
+                if (this.sharpening > 0) {
+                    renderPasses.push(createSharpeningRenderPass(this.sharpening));
+                }
+                return renderPasses.length ? renderPasses : null;
             }
             catch (e) {
-                console.warn('Failed to create sharpening render passes:', e);
+                console.warn('Failed to create custom render passes:', e);
                 return null;
             }
         };
@@ -133,6 +145,7 @@ class StackViewport extends Viewport {
                 invert,
                 isComputedVOI: !voiUpdatedWithSetProperties,
                 sharpening: this.sharpening,
+                smoothing: this.smoothing,
             };
         };
         this.resetCameraForResize = () => {
@@ -535,7 +548,7 @@ class StackViewport extends Viewport {
         camera.setFreezeFocalPoint(true);
     }
     shouldUseCustomRenderPass() {
-        return this.sharpening > 0 && !this.useCPURendering;
+        return !this.useCPURendering;
     }
     initializeElementDisabledHandler() {
         eventTarget.addEventListener(Events.ELEMENT_DISABLED, function elementDisabledHandler() {
@@ -658,7 +671,7 @@ class StackViewport extends Viewport {
             this.resetToDefaultProperties();
         }
     }
-    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, } = {}, suppressEvents = false) {
+    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, smoothing, } = {}, suppressEvents = false) {
         this.viewportStatus = this.csImage
             ? ViewportStatus.PRE_RENDER
             : ViewportStatus.LOADING;
@@ -669,6 +682,7 @@ class StackViewport extends Viewport {
             invert: this.globalDefaultProperties.invert ?? invert,
             interpolationType: this.globalDefaultProperties.interpolationType ?? interpolationType,
             sharpening: this.globalDefaultProperties.sharpening ?? sharpening,
+            smoothing: this.globalDefaultProperties.smoothing ?? smoothing,
         };
         if (typeof colormap !== 'undefined') {
             this.setColormap(colormap);
@@ -689,6 +703,9 @@ class StackViewport extends Viewport {
         if (typeof sharpening !== 'undefined') {
             this.setSharpening(sharpening);
         }
+        if (typeof smoothing !== 'undefined') {
+            this.setSmoothing(smoothing);
+        }
     }
     resetProperties() {
         this.cpuRenderingInvalidated = true;

package/dist/esm/RenderingEngine/renderPasses/index.d.ts

@@ -1,2 +1,3 @@
 import { createSharpeningRenderPass } from './sharpeningRenderPass';
-export { createSharpeningRenderPass };
+import { createSmoothingRenderPass } from './smoothingRenderPass';
+export { createSharpeningRenderPass, createSmoothingRenderPass };

package/dist/esm/RenderingEngine/renderPasses/index.js

@@ -1,2 +1,3 @@
 import { createSharpeningRenderPass } from './sharpeningRenderPass';
-export { createSharpeningRenderPass };
+import { createSmoothingRenderPass } from './smoothingRenderPass';
+export { createSharpeningRenderPass, createSmoothingRenderPass };

package/dist/esm/RenderingEngine/renderPasses/smoothingRenderPass.d.ts

@@ -0,0 +1,2 @@
+declare function createSmoothingRenderPass(intensity: number): any;
+export { createSmoothingRenderPass };

package/dist/esm/RenderingEngine/renderPasses/smoothingRenderPass.js

@@ -0,0 +1,39 @@
+import vtkConvolution2DPass from '@kitware/vtk.js/Rendering/OpenGL/Convolution2DPass';
+import vtkForwardPass from '@kitware/vtk.js/Rendering/OpenGL/ForwardPass';
+function createSmoothingRenderPass(intensity) {
+    let renderPass = vtkForwardPass.newInstance();
+    if (intensity > 0) {
+        const convolutionPass = vtkConvolution2DPass.newInstance();
+        convolutionPass.setDelegates([renderPass]);
+        const smoothStrength = Math.min(intensity, 1000);
+        const kernelSize = 15;
+        const sigma = 5.0;
+        const gaussianKernel = createGaussianKernel(kernelSize, sigma);
+        const totalElements = kernelSize * kernelSize;
+        const centerIndex = Math.floor(totalElements / 2);
+        const identityKernel = Array(totalElements).fill(0);
+        identityKernel[centerIndex] = 1;
+        const alpha = Math.min(smoothStrength / 10, 1.0);
+        const kernel = gaussianKernel.map((g, i) => (1 - alpha) * identityKernel[i] + alpha * g);
+        convolutionPass.setKernelDimension(15);
+        convolutionPass.setKernel(kernel);
+        renderPass = convolutionPass;
+    }
+    return renderPass;
+}
+function createGaussianKernel(size, sigma) {
+    const kernel = [];
+    const mean = (size - 1) / 2;
+    let sum = 0;
+    for (let y = 0; y < size; y++) {
+        for (let x = 0; x < size; x++) {
+            const dx = x - mean;
+            const dy = y - mean;
+            const value = Math.exp(-(dx * dx + dy * dy) / (2 * Math.pow(sigma, 2)));
+            kernel.push(value);
+            sum += value;
+        }
+    }
+    return kernel.map((v) => v / sum);
+}
+export { createSmoothingRenderPass };

package/dist/esm/types/ViewportProperties.d.ts

@@ -10,4 +10,5 @@ export interface ViewportProperties {
     preset?: string;
     sampleDistanceMultiplier?: number;
     sharpening?: number;
+    smoothing?: number;
 }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.6.3";
+export declare const version = "4.7.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.6.3';
+export const version = '4.7.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.6.3",
+  "version": "4.7.0",
   "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": "70ff2626164aa31aae20c7dc792c52ac053d74b1"
+  "gitHead": "ed855a5de3ae8111017b8498c4c829d6597c2af7"
 }