@cornerstonejs/core 3.17.0 → 3.18.0

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

@@ -87,7 +87,6 @@ declare class VideoViewport extends Viewport {
     setVOI(voiRange: VOIRange): void;
     setWindowLevel(windowWidth?: number, windowCenter?: number): void;
     setAverageWhite(averageWhite: [number, number, number]): void;
-    protected setColorTransform(): void;
     setCamera(camera: ICamera): void;
     getCurrentImageId(index?: number): string;
     getViewReferenceId(specifier?: ViewReferenceSpecifier): string;

package/dist/esm/RenderingEngine/VideoViewport.js

@@ -438,6 +438,10 @@ class VideoViewport extends Viewport {
         this.setProperties({
             loop: false,
             muted: true,
+            voiRange: {
+                lower: 0,
+                upper: 255,
+            },
         });
     }
     getScalarData() {
@@ -527,41 +531,18 @@ class VideoViewport extends Viewport {
     }
     setVOI(voiRange) {
         this.voiRange = voiRange;
-        this.setColorTransform();
+        const feFilter = this.setColorTransform(voiRange, this.averageWhite);
+        this.canvas.style.filter = feFilter;
     }
     setWindowLevel(windowWidth = 256, windowCenter = 128) {
         const lower = windowCenter - windowWidth / 2;
         const upper = windowCenter + windowWidth / 2 - 1;
         this.setVOI({ lower, upper });
-        this.setColorTransform();
+        this.setColorTransform({ lower, upper }, this.averageWhite);
     }
     setAverageWhite(averageWhite) {
         this.averageWhite = averageWhite;
-        this.setColorTransform();
-    }
-    setColorTransform() {
-        if (!this.voiRange && !this.averageWhite) {
-            this.feFilter = null;
-            return;
-        }
-        const white = this.averageWhite || [255, 255, 255];
-        const maxWhite = Math.max(...white);
-        const scaleWhite = white.map((c) => maxWhite / c);
-        const { lower = 0, upper = 255 } = this.voiRange || {};
-        const wlScale = (upper - lower + 1) / 255;
-        const wlDelta = lower / 255;
-        this.feFilter = `url('data:image/svg+xml,\
-      <svg xmlns="http://www.w3.org/2000/svg">\
-        <filter id="colour" color-interpolation-filters="linearRGB">\
-        <feColorMatrix type="matrix" \
-        values="\
-          ${scaleWhite[0] * wlScale} 0 0 0 ${wlDelta} \
-          0 ${scaleWhite[1] * wlScale} 0 0 ${wlDelta} \
-          0 0 ${scaleWhite[2] * wlScale} 0 ${wlDelta} \
-          0 0 0 1 0" />\
-        </filter>\
-      </svg>#colour')`;
-        this.canvas.style.filter = this.feFilter;
+        this.setColorTransform(this.voiRange, averageWhite);
     }
     setCamera(camera) {
         const { parallelScale, focalPoint } = camera;

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

@@ -53,6 +53,7 @@ declare class Viewport {
     getWidgets: () => any[];
     removeWidgets: () => void;
     setRendered(): void;
+    protected setColorTransform(voiRange: any, averageWhite: any): any;
     getRenderingEngine(): IRenderingEngine;
     getRenderer(): vtkRenderer;
     render(): void;

package/dist/esm/RenderingEngine/Viewport.js

@@ -89,6 +89,30 @@ class Viewport {
         }
         this.viewportStatus = ViewportStatus.RENDERED;
     }
+    setColorTransform(voiRange, averageWhite) {
+        let feFilter = null;
+        if (!voiRange && !averageWhite) {
+            return;
+        }
+        const white = averageWhite || [255, 255, 255];
+        const maxWhite = Math.max(...white);
+        const scaleWhite = white.map((c) => maxWhite / c);
+        const { lower = 0, upper = 255 } = voiRange || {};
+        const wlScale = (upper - lower + 1) / 255;
+        const wlDelta = lower / 255;
+        feFilter = `url('data:image/svg+xml,\
+      <svg xmlns="http://www.w3.org/2000/svg">\
+        <filter id="colour" color-interpolation-filters="linearRGB">\
+        <feColorMatrix type="matrix" \
+        values="\
+          ${scaleWhite[0] * wlScale} 0 0 0 ${wlDelta} \
+          0 ${scaleWhite[1] * wlScale} 0 0 ${wlDelta} \
+          0 0 ${scaleWhite[2] * wlScale} 0 ${wlDelta} \
+          0 0 0 1 0" />\
+        </filter>\
+      </svg>#colour')`;
+        return feFilter;
+    }
     getRenderingEngine() {
         return renderingEngineCache.get(this.renderingEngineId);
     }

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

@@ -1,5 +1,5 @@
 import { mat4 } from 'gl-matrix';
-import type { WSIViewportProperties, Point3, Point2, ICamera, CPUIImageData, ViewportInput } from '../types';
+import type { WSIViewportProperties, Point3, Point2, ICamera, VOIRange, CPUIImageData, ViewportInput } from '../types';
 import { Transform } from './helpers/cpuFallback/rendering/transform';
 import Viewport from './Viewport';
 import type { DataSetOptions } from '../types/IViewport';
@@ -16,6 +16,8 @@ declare class WSIViewport extends Viewport {
     private internalCamera;
     private viewer;
     private voiRange;
+    private feFilter;
+    private averageWhite;
     constructor(props: ViewportInput);
     static get useCustomRenderingPipeline(): boolean;
     private addEventListeners;
@@ -26,6 +28,8 @@ declare class WSIViewport extends Viewport {
     setProperties(props: WSIViewportProperties): void;
     getProperties: () => WSIViewportProperties;
     resetProperties(): void;
+    setVOI(voiRange: VOIRange): void;
+    setAverageWhite(averageWhite: [number, number, number]): void;
     protected getScalarData(): any;
     computeTransforms(): {
         indexToWorld: mat4;

package/dist/esm/RenderingEngine/WSIViewport.js

@@ -34,7 +34,9 @@ class WSIViewport extends Viewport {
             upper: 255,
         };
         this.getProperties = () => {
-            return {};
+            return {
+                voiRange: { ...this.voiRange },
+            };
         };
         this.resetCamera = () => {
             return true;
@@ -184,9 +186,31 @@ class WSIViewport extends Viewport {
     async setFrameNumber(frame) {
     }
     setProperties(props) {
+        if (props.voiRange) {
+            this.setVOI(props.voiRange);
+        }
     }
     resetProperties() {
-        this.setProperties({});
+        this.setProperties({
+            voiRange: {
+                lower: 0,
+                upper: 255,
+            },
+        });
+    }
+    setVOI(voiRange) {
+        this.voiRange = voiRange;
+        const feFilter = this.setColorTransform(voiRange, this.averageWhite);
+        const olCanvases = this.map
+            .getViewport()
+            .querySelectorAll('.ol-layers canvas');
+        olCanvases.forEach((canvas) => {
+            canvas.style.filter = feFilter;
+        });
+    }
+    setAverageWhite(averageWhite) {
+        this.averageWhite = averageWhite;
+        this.setColorTransform(this.voiRange, averageWhite);
     }
     getScalarData() {
         return null;
@@ -244,16 +268,6 @@ class WSIViewport extends Viewport {
             },
             scalarData: this.getScalarData(),
             imageData,
-            voxelManager: {
-                forEach: (callback, options) => {
-                    return pointInShapeCallback(options.imageData, {
-                        pointInShapeFn: options.isInObject ?? (() => true),
-                        callback: callback,
-                        boundsIJK: options.boundsIJK,
-                        returnPoints: options.returnPoints ?? false,
-                    });
-                },
-            },
         };
         return imageDataReturn;
     }

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

@@ -11,7 +11,6 @@ import getRuntimeId from './getRuntimeId';
 import imageIdToURI from './imageIdToURI';
 import calibratedPixelSpacingMetadataProvider from './calibratedPixelSpacingMetadataProvider';
 import clamp from './clamp';
-import { isEqual, isEqualAbs, isEqualNegative } from './isEqual';
 import isOpposite from './isOpposite';
 import getClosestImageId from './getClosestImageId';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
@@ -95,4 +94,5 @@ export * as logger from './logger';
 import { calculateNeighborhoodStats } from './calculateNeighborhoodStats';
 import getPixelSpacingInformation from './getPixelSpacingInformation';
 declare const getViewportModality: (viewport: IViewport, volumeId?: string) => string;
-export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };
+export * from './isEqual';
+export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };

package/dist/esm/utilities/index.js

@@ -11,7 +11,6 @@ import getRuntimeId from './getRuntimeId';
 import imageIdToURI from './imageIdToURI';
 import calibratedPixelSpacingMetadataProvider from './calibratedPixelSpacingMetadataProvider';
 import clamp from './clamp';
-import { isEqual, isEqualAbs, isEqualNegative } from './isEqual';
 import isOpposite from './isOpposite';
 import getClosestImageId from './getClosestImageId';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
@@ -96,4 +95,5 @@ export * as logger from './logger';
 import { calculateNeighborhoodStats } from './calculateNeighborhoodStats';
 import getPixelSpacingInformation from './getPixelSpacingInformation';
 const getViewportModality = (viewport, volumeId) => _getViewportModality(viewport, volumeId, cache.getVolume);
-export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };
+export * from './isEqual';
+export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };

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

@@ -1,4 +1,5 @@
 export default function isEqual<ValueType>(v1: ValueType, v2: ValueType, tolerance?: number): boolean;
 declare const isEqualNegative: <ValueType>(v1: ValueType, v2: ValueType, tolerance?: any) => boolean;
 declare const isEqualAbs: <ValueType>(v1: ValueType, v2: ValueType, tolerance?: any) => boolean;
-export { isEqualNegative, isEqual, isEqualAbs };
+declare function isNumber(n: number[] | number): boolean;
+export { isEqualNegative, isEqual, isEqualAbs, isNumber };

package/dist/esm/utilities/isEqual.js

@@ -39,4 +39,10 @@ const negative = (v) => typeof v === 'number' ? -v : v?.map ? v.map(negative) :
 const abs = (v) => typeof v === 'number' ? Math.abs(v) : v?.map ? v.map(abs) : v;
 const isEqualNegative = (v1, v2, tolerance = undefined) => isEqual(v1, negative(v2), tolerance);
 const isEqualAbs = (v1, v2, tolerance = undefined) => isEqual(abs(v1), abs(v2), tolerance);
-export { isEqualNegative, isEqual, isEqualAbs };
+function isNumber(n) {
+    if (Array.isArray(n)) {
+        return isNumber(n[0]);
+    }
+    return isFinite(n) && !isNaN(n);
+}
+export { isEqualNegative, isEqual, isEqualAbs, isNumber };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.17.0";
+export declare const version = "3.18.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.17.0';
+export const version = '3.18.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.17.0",
+  "version": "3.18.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": "2aaea4759f5efd508a96551cc4d5ed53cde138d3"
+  "gitHead": "409f2bb8fe3755f4451f884c85ddf29c7a03749c"
 }