@cornerstonejs/core 5.7.1 → 5.7.3

package/dist/esm/RenderingEngine/StackViewport.js

@@ -34,6 +34,7 @@ import calculateTransform from './helpers/cpuFallback/rendering/calculateTransfo
 import canvasToPixel from './helpers/cpuFallback/rendering/canvasToPixel.js';
 import getDefaultViewport from './helpers/cpuFallback/rendering/getDefaultViewport.js';
 import pixelToCanvas from './helpers/cpuFallback/rendering/pixelToCanvas.js';
+import { cssToDevicePixels, deviceToCssPixels, } from './helpers/cpuFallback/rendering/cssPixelConversion.js';
 import resize from './helpers/cpuFallback/rendering/resize.js';
 import cache from '../cache/cache.js';
 import { getShouldUseCPURendering } from '../init.js';
@@ -206,7 +207,7 @@ class StackViewport extends Viewport {
             if (!this._cpuFallbackEnabledElement.image) {
                 return;
             }
-            const [px, py] = canvasToPixel(this._cpuFallbackEnabledElement, canvasPos);
+            const [px, py] = canvasToPixel(this._cpuFallbackEnabledElement, cssToDevicePixels(canvasPos));
             const { origin, spacing, direction } = this.getImageData();
             const iVector = direction.slice(0, 3);
             const jVector = direction.slice(3, 6);
@@ -224,7 +225,7 @@ class StackViewport extends Viewport {
                 vec3.dot(diff, jVector) / spacing[1],
             ];
             const canvasPoint = pixelToCanvas(this._cpuFallbackEnabledElement, indexPoint);
-            return canvasPoint;
+            return deviceToCssPixels(canvasPoint);
         };
         this.canvasToWorldGPUContextPool = (canvasPos) => {
             const renderer = this.getRenderer();
@@ -626,7 +627,7 @@ class StackViewport extends Viewport {
                 getSpacing: () => spacing,
                 worldToIndex: (point) => {
                     const canvasPoint = this.worldToCanvasCPU(point);
-                    const pixelCoord = canvasToPixel(this._cpuFallbackEnabledElement, canvasPoint);
+                    const pixelCoord = canvasToPixel(this._cpuFallbackEnabledElement, cssToDevicePixels(canvasPoint));
                     return [pixelCoord[0], pixelCoord[1], 0];
                 },
                 indexToWorld: (point, destPoint) => {
@@ -634,7 +635,7 @@ class StackViewport extends Viewport {
                         point[0],
                         point[1],
                     ]);
-                    return this.canvasToWorldCPU(canvasPoint, destPoint);
+                    return this.canvasToWorldCPU(deviceToCssPixels(canvasPoint), destPoint);
                 },
             },
             scalarData: this.cpuImagePixelData,
@@ -890,9 +891,9 @@ class StackViewport extends Viewport {
         const { clientHeight } = this.element;
         if (focalPoint) {
             const focalPointCanvas = this.worldToCanvasCPU(focalPoint);
-            const focalPointPixel = canvasToPixel(this._cpuFallbackEnabledElement, focalPointCanvas);
+            const focalPointPixel = canvasToPixel(this._cpuFallbackEnabledElement, cssToDevicePixels(focalPointCanvas));
             const prevFocalPointCanvas = this.worldToCanvasCPU(previousCamera.focalPoint);
-            const prevFocalPointPixel = canvasToPixel(this._cpuFallbackEnabledElement, prevFocalPointCanvas);
+            const prevFocalPointPixel = canvasToPixel(this._cpuFallbackEnabledElement, cssToDevicePixels(prevFocalPointCanvas));
             const deltaPixel = vec2.create();
             vec2.subtract(deltaPixel, vec2.fromValues(focalPointPixel[0], focalPointPixel[1]), vec2.fromValues(prevFocalPointPixel[0], prevFocalPointPixel[1]));
             const shift = correctShift({ x: deltaPixel[0], y: deltaPixel[1] }, viewport);

package/dist/esm/RenderingEngine/helpers/cpuFallback/rendering/cssPixelConversion.d.ts

@@ -0,0 +1,3 @@
+import type { Point2 } from '../../../../types/index.js';
+export declare function deviceToCssPixels(point: Point2): Point2;
+export declare function cssToDevicePixels(point: Point2): Point2;

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

@@ -0,0 +1,11 @@
+function getDevicePixelRatio() {
+    return (typeof window !== 'undefined' && window.devicePixelRatio) || 1;
+}
+export function deviceToCssPixels(point) {
+    const devicePixelRatio = getDevicePixelRatio();
+    return [point[0] / devicePixelRatio, point[1] / devicePixelRatio];
+}
+export function cssToDevicePixels(point) {
+    const devicePixelRatio = getDevicePixelRatio();
+    return [point[0] * devicePixelRatio, point[1] * devicePixelRatio];
+}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.7.1";
+export declare const version = "5.7.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.7.1';
+export const version = '5.7.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "5.7.1",
+  "version": "5.7.3",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -85,18 +85,18 @@
     "prepublishOnly": "pnpm run build"
   },
   "dependencies": {
-    "@cornerstonejs/utils": "5.7.1",
+    "@cornerstonejs/utils": "5.7.3",
     "@kitware/vtk.js": "36.4.1",
     "comlink": "4.4.2",
     "gl-matrix": "3.4.3",
     "loglevel": "1.9.2"
   },
   "devDependencies": {
-    "@cornerstonejs/metadata": "5.7.1"
+    "@cornerstonejs/metadata": "5.7.3"
   },
   "peerDependencies": {
-    "@cornerstonejs/metadata": "5.7.1",
-    "@cornerstonejs/utils": "5.7.1"
+    "@cornerstonejs/metadata": "5.7.3",
+    "@cornerstonejs/utils": "5.7.3"
   },
   "contributors": [
     {
@@ -109,5 +109,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "14841bb671002953b4d98da0333c65dc8e8156ef"
+  "gitHead": "32815247b0972b0cd0074a60b58f0103274659ea"
 }