@cornerstonejs/core 2.12.3 → 2.14.0

package/dist/esm/RenderingEngine/StackViewport.js

@@ -905,8 +905,9 @@ class StackViewport extends Viewport {
             viewport.voi = {
                 windowWidth: wwToUse,
                 windowCenter: wcToUse,
+                voiLUTFunction: image.voiLUTFunction,
             };
-            const { lower, upper } = windowLevelUtil.toLowHighRange(wwToUse, wcToUse);
+            const { lower, upper } = windowLevelUtil.toLowHighRange(wwToUse, wcToUse, image.voiLUTFunction);
             voiRange = { lower, upper };
         }
         else {
@@ -916,6 +917,7 @@ class StackViewport extends Viewport {
                 viewport.voi = {
                     windowWidth: 0,
                     windowCenter: 0,
+                    voiLUTFunction: image.voiLUTFunction,
                 };
             }
             viewport.voi.windowWidth = windowWidth;
@@ -1416,8 +1418,8 @@ class StackViewport extends Viewport {
     _updateToDisplayImageCPU(image) {
         const metadata = this.getImageDataMetadata(image);
         const viewport = getDefaultViewport(this.canvas, image, this.modality, this._cpuFallbackEnabledElement.viewport.colormap);
-        const { windowCenter, windowWidth } = viewport.voi;
-        this.voiRange = windowLevelUtil.toLowHighRange(windowWidth, windowCenter);
+        const { windowCenter, windowWidth, voiLUTFunction } = viewport.voi;
+        this.voiRange = windowLevelUtil.toLowHighRange(windowWidth, windowCenter, voiLUTFunction);
         this._cpuFallbackEnabledElement.image = image;
         this._cpuFallbackEnabledElement.metadata = {
             ...metadata,
@@ -1519,8 +1521,8 @@ class StackViewport extends Viewport {
         if (this.voiRange && this.voiUpdatedWithSetProperties) {
             return this.globalDefaultProperties.voiRange;
         }
-        const { windowCenter, windowWidth } = image;
-        let voiRange = this._getVOIRangeFromWindowLevel(windowWidth, windowCenter);
+        const { windowCenter, windowWidth, voiLUTFunction } = image;
+        let voiRange = this._getVOIRangeFromWindowLevel(windowWidth, windowCenter, voiLUTFunction);
         voiRange = this._getPTPreScaledRange() || voiRange;
         return voiRange;
     }
@@ -1542,7 +1544,7 @@ class StackViewport extends Viewport {
     _getDefaultPTPrescaledVOIRange() {
         return { lower: 0, upper: 5 };
     }
-    _getVOIRangeFromWindowLevel(windowWidth, windowCenter) {
+    _getVOIRangeFromWindowLevel(windowWidth, windowCenter, voiLUTFunction = VOILUTFunctionType.LINEAR) {
         let center, width;
         if (typeof windowCenter === 'number' && typeof windowWidth === 'number') {
             center = windowCenter;
@@ -1553,7 +1555,7 @@ class StackViewport extends Viewport {
             width = windowWidth[0];
         }
         if (center !== undefined && width !== undefined) {
-            return windowLevelUtil.toLowHighRange(width, center);
+            return windowLevelUtil.toLowHighRange(width, center, voiLUTFunction);
         }
     }
     async _setImageIdIndex(imageIdIndex) {
@@ -1687,8 +1689,8 @@ class StackViewport extends Viewport {
         return true;
     }
     _getVOIRangeForCurrentImage() {
-        const { windowCenter, windowWidth } = this.csImage;
-        return this._getVOIRangeFromWindowLevel(windowWidth, windowCenter);
+        const { windowCenter, windowWidth, voiLUTFunction } = this.csImage;
+        return this._getVOIRangeFromWindowLevel(windowWidth, windowCenter, voiLUTFunction);
     }
     _getValidVOILUTFunction(voiLUTFunction) {
         if (!Object.values(VOILUTFunctionType).includes(voiLUTFunction)) {

package/dist/esm/RenderingEngine/helpers/cpuFallback/rendering/computeAutoVoi.js

@@ -10,6 +10,7 @@ export default function computeAutoVoi(viewport, image) {
         viewport.voi = {
             windowWidth: ww,
             windowCenter: wc,
+            voiLUTFunction: image.voiLUTFunction,
         };
     }
     else {

package/dist/esm/RenderingEngine/helpers/cpuFallback/rendering/createViewport.js

@@ -1,4 +1,5 @@
 import { state } from './setDefaultViewport';
+import { VOILUTFunctionType } from '../../../../enums';
 function createDefaultDisplayedArea() {
     return {
         tlhc: {
@@ -25,6 +26,7 @@ export default function createViewport() {
         voi: {
             windowWidth: undefined,
             windowCenter: undefined,
+            voiLUTFunction: VOILUTFunctionType.LINEAR,
         },
         invert: false,
         pixelReplication: false,

package/dist/esm/RenderingEngine/helpers/setDefaultVolumeVOI.js

@@ -37,11 +37,12 @@ function handlePreScaledVolume(imageVolume, voi) {
 function getVOIFromMetadata(imageVolume) {
     const { imageIds, metadata } = imageVolume;
     let voi;
-    if (imageIds.length) {
+    if (imageIds?.length) {
         const imageIdIndex = Math.floor(imageIds.length / 2);
         const imageId = imageIds[imageIdIndex];
         const voiLutModule = metaData.get('voiLutModule', imageId);
-        if (voiLutModule?.windowWidth && voiLutModule.windowCenter) {
+        if (voiLutModule && voiLutModule.windowWidth && voiLutModule.windowCenter) {
+            voi.voiLUTFunction = voiLutModule.voiLUTFunction;
             const { windowWidth, windowCenter } = voiLutModule;
             const width = Array.isArray(windowWidth) ? windowWidth[0] : windowWidth;
             const center = Array.isArray(windowCenter)
@@ -56,7 +57,7 @@ function getVOIFromMetadata(imageVolume) {
         voi = metadata.voiLut[0];
     }
     if (voi && (voi.windowWidth !== 0 || voi.windowCenter !== 0)) {
-        const { lower, upper } = windowLevel.toLowHighRange(Number(voi.windowWidth), Number(voi.windowCenter));
+        const { lower, upper } = windowLevel.toLowHighRange(Number(voi.windowWidth), Number(voi.windowCenter), voi.voiLUTFunction);
         return { lower, upper };
     }
     return undefined;

package/dist/esm/enums/VOILUTFunctionType.d.ts

@@ -1,5 +1,6 @@
 declare enum VOILUTFunctionType {
     LINEAR = "LINEAR",
-    SAMPLED_SIGMOID = "SIGMOID"
+    SAMPLED_SIGMOID = "SIGMOID",
+    LINEAR_EXACT = "LINEAR_EXACT"
 }
 export default VOILUTFunctionType;

package/dist/esm/enums/VOILUTFunctionType.js

@@ -2,5 +2,6 @@ var VOILUTFunctionType;
 (function (VOILUTFunctionType) {
     VOILUTFunctionType["LINEAR"] = "LINEAR";
     VOILUTFunctionType["SAMPLED_SIGMOID"] = "SIGMOID";
+    VOILUTFunctionType["LINEAR_EXACT"] = "LINEAR_EXACT";
 })(VOILUTFunctionType || (VOILUTFunctionType = {}));
 export default VOILUTFunctionType;

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

@@ -1,6 +1,7 @@
 import type CPUFallbackViewportDisplayedArea from './CPUFallbackViewportDisplayedArea';
 import type CPUFallbackColormap from './CPUFallbackColormap';
 import type CPUFallbackLUT from './CPUFallbackLUT';
+import type VOILUTFunctionType from '../enums/VOILUTFunctionType';
 interface CPUFallbackViewport {
     scale?: number;
     parallelScale?: number;
@@ -12,6 +13,7 @@ interface CPUFallbackViewport {
     voi?: {
         windowWidth: number;
         windowCenter: number;
+        voiLUTFunction: VOILUTFunctionType;
     };
     invert?: boolean;
     pixelReplication?: boolean;

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

@@ -1,6 +1,6 @@
 import type CPUFallbackLUT from './CPUFallbackLUT';
 import type { PixelDataTypedArray, PixelDataTypedArrayString } from './PixelDataTypedArray';
-import type { ImageQualityStatus } from '../enums';
+import type { ImageQualityStatus, VOILUTFunctionType } from '../enums';
 import type IImageCalibration from './IImageCalibration';
 import type RGB from './RGB';
 import type IImageFrame from './IImageFrame';
@@ -35,7 +35,7 @@ interface IImage {
     intercept: number;
     windowCenter: number[] | number;
     windowWidth: number[] | number;
-    voiLUTFunction: string;
+    voiLUTFunction: VOILUTFunctionType;
     getPixelData: () => PixelDataTypedArray;
     getCanvas: () => HTMLCanvasElement;
     rows: number;

package/dist/esm/utilities/createSigmoidRGBTransferFunction.js

@@ -1,14 +1,9 @@
 import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
 import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
 import * as windowLevelUtil from './windowLevel';
+import { logit } from './logit';
 export default function createSigmoidRGBTransferFunction(voiRange, approximationNodes = 1024) {
     const { windowWidth, windowCenter } = windowLevelUtil.toWindowLevel(voiRange.lower, voiRange.upper);
-    const sigmoid = (x, wc, ww) => {
-        return 1 / (1 + Math.exp((-4 * (x - wc)) / ww));
-    };
-    const logit = (y, wc, ww) => {
-        return wc - (ww / 4) * Math.log((1 - y) / y);
-    };
     const range = Array.from({ length: approximationNodes }, (_, i) => (i + 1) / (approximationNodes + 2));
     const table = range.flatMap((y) => {
         const x = logit(y, windowCenter, windowWidth);

package/dist/esm/utilities/logit.d.ts

@@ -0,0 +1 @@
+export declare const logit: (y: number, wc: number, ww: number) => number;

package/dist/esm/utilities/logit.js

@@ -0,0 +1,3 @@
+export const logit = (y, wc, ww) => {
+    return wc - (ww / 4) * Math.log((1 - y) / y);
+};

package/dist/esm/utilities/windowLevel.d.ts

@@ -1,8 +1,9 @@
+import VOILUTFunctionType from '../enums/VOILUTFunctionType';
 declare function toWindowLevel(low: number, high: number): {
     windowWidth: number;
     windowCenter: number;
 };
-declare function toLowHighRange(windowWidth: number, windowCenter: number): {
+declare function toLowHighRange(windowWidth: number, windowCenter: number, voiLUTFunction?: VOILUTFunctionType): {
     lower: number;
     upper: number;
 };

package/dist/esm/utilities/windowLevel.js

@@ -1,11 +1,33 @@
+import VOILUTFunctionType from '../enums/VOILUTFunctionType';
+import { logit } from './logit';
 function toWindowLevel(low, high) {
     const windowWidth = Math.abs(high - low) + 1;
     const windowCenter = (low + high + 1) / 2;
     return { windowWidth, windowCenter };
 }
-function toLowHighRange(windowWidth, windowCenter) {
-    const lower = windowCenter - 0.5 - (windowWidth - 1) / 2;
-    const upper = windowCenter - 0.5 + (windowWidth - 1) / 2;
-    return { lower, upper };
+function toLowHighRange(windowWidth, windowCenter, voiLUTFunction = VOILUTFunctionType.LINEAR) {
+    if (voiLUTFunction === VOILUTFunctionType.LINEAR) {
+        return {
+            lower: windowCenter - 0.5 - (windowWidth - 1) / 2,
+            upper: windowCenter - 0.5 + (windowWidth - 1) / 2,
+        };
+    }
+    else if (voiLUTFunction === VOILUTFunctionType.LINEAR_EXACT) {
+        return {
+            lower: windowCenter - windowWidth / 2,
+            upper: windowCenter + windowWidth / 2,
+        };
+    }
+    else if (voiLUTFunction === VOILUTFunctionType.SAMPLED_SIGMOID) {
+        const xLower = logit(0.01, windowCenter, windowWidth);
+        const xUpper = logit(0.99, windowCenter, windowWidth);
+        return {
+            lower: xLower,
+            upper: xUpper,
+        };
+    }
+    else {
+        throw new Error('Invalid VOI LUT function');
+    }
 }
 export { toWindowLevel, toLowHighRange };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.12.3",
+  "version": "2.14.0",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -82,5 +82,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "dcb9f773764b5937faa31932b84d18ec023587f7"
+  "gitHead": "df90c42c63dc8392c9ebc2cdd953ee0dd1a974de"
 }