@cornerstonejs/core 3.17.1 → 3.19.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;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.17.1";
+export declare const version = "3.19.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.17.1';
+export const version = '3.19.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.17.1",
+  "version": "3.19.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": "6d5e8d3352bc78d14d058149efe7324de61ea41b"
+  "gitHead": "fe1658758c774bc78e81a8a0e5933111ee2665b4"
 }