@cornerstonejs/core 4.2.2 → 4.2.4

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -172,13 +172,16 @@ class BaseVolumeViewport extends Viewport {
             const devicePixelRatio = window.devicePixelRatio || 1;
             const { width, height } = this.canvas;
             const aspectRatio = width / height;
+            const [xMin, yMin, xMax, yMax] = renderer.getViewport();
+            const viewportWidth = xMax - xMin;
+            const viewportHeight = yMax - yMin;
             const canvasPosWithDPR = [
                 canvasPos[0] * devicePixelRatio,
                 canvasPos[1] * devicePixelRatio,
             ];
             const normalizedDisplay = [
-                canvasPosWithDPR[0] / width,
-                1 - canvasPosWithDPR[1] / height,
+                xMin + (canvasPosWithDPR[0] / width) * viewportWidth,
+                yMin + (1 - canvasPosWithDPR[1] / height) * viewportHeight,
                 0,
             ];
             const projCoords = renderer.normalizedDisplayToProjection(normalizedDisplay[0], normalizedDisplay[1], normalizedDisplay[2]);
@@ -209,8 +212,14 @@ class BaseVolumeViewport extends Viewport {
                 canvasPos[0] * devicePixelRatio,
                 canvasPos[1] * devicePixelRatio,
             ];
-            const { height } = this.canvas;
-            const displayCoord = [canvasPosWithDPR[0], height - canvasPosWithDPR[1]];
+            const renderer = this.getRenderer();
+            const { width, height } = this.canvas;
+            const [xMin, yMin, xMax, yMax] = renderer.getViewport();
+            const viewportWidth = xMax - xMin;
+            const viewportHeight = yMax - yMin;
+            const scaledX = (canvasPosWithDPR[0] / width) * viewportWidth * width;
+            const scaledY = (canvasPosWithDPR[1] / height) * viewportHeight * height;
+            const displayCoord = [scaledX, viewportHeight * height - scaledY];
             return [displayCoord[0], displayCoord[1], 0];
         };
         this.worldToCanvasTiled = (worldPos) => {
@@ -240,11 +249,16 @@ class BaseVolumeViewport extends Viewport {
             const renderer = this.getRenderer();
             const { width, height } = this.canvas;
             const aspectRatio = width / height;
+            const [xMin, yMin, xMax, yMax] = renderer.getViewport();
+            const viewportWidth = xMax - xMin;
+            const viewportHeight = yMax - yMin;
             const viewCoords = renderer.worldToView(worldPos[0], worldPos[1], worldPos[2]);
             const projCoords = renderer.viewToProjection(viewCoords[0], viewCoords[1], viewCoords[2], aspectRatio);
             const normalizedDisplay = renderer.projectionToNormalizedDisplay(projCoords[0], projCoords[1], projCoords[2]);
-            const canvasX = normalizedDisplay[0] * width;
-            const canvasY = (1 - normalizedDisplay[1]) * height;
+            const canvasNormalizedX = (normalizedDisplay[0] - xMin) / viewportWidth;
+            const canvasNormalizedY = (normalizedDisplay[1] - yMin) / viewportHeight;
+            const canvasX = canvasNormalizedX * width;
+            const canvasY = (1 - canvasNormalizedY) * height;
             const devicePixelRatio = window.devicePixelRatio || 1;
             const canvasCoordWithDPR = [
                 canvasX / devicePixelRatio,

package/dist/esm/RenderingEngine/StackViewport.js

@@ -209,9 +209,13 @@ class StackViewport extends Viewport {
                 canvasPos[0] * devicePixelRatio,
                 canvasPos[1] * devicePixelRatio,
             ];
+            const viewport = renderer.getViewport();
+            const [xStart, yStart, xEnd, yEnd] = viewport;
+            const viewportWidth = xEnd - xStart;
+            const viewportHeight = yEnd - yStart;
             const normalizedDisplay = [
-                canvasPosWithDPR[0] / width,
-                1 - canvasPosWithDPR[1] / height,
+                xStart + (canvasPosWithDPR[0] / width) * viewportWidth,
+                yStart + (1 - canvasPosWithDPR[1] / height) * viewportHeight,
                 0,
             ];
             const projCoords = renderer.normalizedDisplayToProjection(normalizedDisplay[0], normalizedDisplay[1], normalizedDisplay[2]);
@@ -255,8 +259,12 @@ class StackViewport extends Viewport {
             const viewCoords = renderer.worldToView(worldPos[0], worldPos[1], worldPos[2]);
             const projCoords = renderer.viewToProjection(viewCoords[0], viewCoords[1], viewCoords[2], aspectRatio);
             const normalizedDisplay = renderer.projectionToNormalizedDisplay(projCoords[0], projCoords[1], projCoords[2]);
-            const canvasX = normalizedDisplay[0] * width;
-            const canvasY = (1 - normalizedDisplay[1]) * height;
+            const viewport = renderer.getViewport();
+            const [xStart, yStart, xEnd, yEnd] = viewport;
+            const viewportWidth = xEnd - xStart;
+            const viewportHeight = yEnd - yStart;
+            const canvasX = ((normalizedDisplay[0] - xStart) / viewportWidth) * width;
+            const canvasY = (1 - (normalizedDisplay[1] - yStart) / viewportHeight) * height;
             vtkCamera.setClippingRange(crange[0], crange[1]);
             const canvasCoordWithDPR = [
                 canvasX / devicePixelRatio,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.2.2";
+export declare const version = "4.2.4";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.2.2';
+export const version = '4.2.4';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "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": "4f72463ab07c045e223800f5db9b1373f9e53b07"
+  "gitHead": "6c47c1ba0dc3307bde44ea13b6adaedaec001825"
 }