@cornerstonejs/core 2.14.4 → 2.14.5

package/dist/esm/RenderingEngine/Viewport.js

@@ -379,8 +379,8 @@ class Viewport {
         const dimensions = imageData.getDimensions();
         const canvasZero = this.worldToCanvas(imageData.indexToWorld([0, 0, 0]));
         const canvasEdge = this.worldToCanvas(imageData.indexToWorld([
-            dimensions[0] - 1,
-            dimensions[1] - 1,
+            dimensions[0],
+            dimensions[1],
             dimensions[2],
         ]));
         const canvasImage = [
@@ -388,28 +388,33 @@ class Viewport {
             Math.abs(canvasEdge[1] - canvasZero[1]),
         ];
         const [imgWidth, imgHeight] = canvasImage;
+        let zoom = this.getZoom() / this.insetImageMultiplier;
         if (imageArea) {
             const [areaX, areaY] = imageArea;
+            const currentScale = Math.max(Math.abs(imgWidth / canvasWidth), Math.abs(imgHeight / canvasHeight));
             const requireX = Math.abs((areaX * imgWidth) / canvasWidth);
             const requireY = Math.abs((areaY * imgHeight) / canvasHeight);
             const initZoom = this.getZoom();
             const fitZoom = this.getZoom(this.fitToCanvasCamera);
-            const absZoom = Math.min(1 / requireX, 1 / requireY);
+            const absZoom = requireX > requireY ? currentScale / requireX : currentScale / requireY;
             const applyZoom = (absZoom * initZoom) / fitZoom;
-            this.setZoom(applyZoom, false);
+            zoom = applyZoom;
+            this.setZoom(this.insetImageMultiplier * zoom, false);
         }
         if (imageCanvasPoint) {
+            console.log('Starting pan update zoom=', zoom);
             const { imagePoint, canvasPoint = imagePoint || [0.5, 0.5] } = imageCanvasPoint;
             const [canvasX, canvasY] = canvasPoint;
             const canvasPanX = canvasWidth * (canvasX - 0.5);
             const canvasPanY = canvasHeight * (canvasY - 0.5);
             const [imageX, imageY] = imagePoint || canvasPoint;
-            const useZoom = 1;
-            const imagePanX = useZoom * imgWidth * (0.5 - imageX);
-            const imagePanY = useZoom * imgHeight * (0.5 - imageY);
+            const useZoom = zoom;
+            const imagePanX = this.insetImageMultiplier * useZoom * imgWidth * (0.5 - imageX);
+            const imagePanY = this.insetImageMultiplier * useZoom * imgHeight * (0.5 - imageY);
             const newPositionX = imagePanX + canvasPanX;
             const newPositionY = imagePanY + canvasPanY;
             const deltaPoint2 = [newPositionX, newPositionY];
+            console.log('delta point', newPositionX, this.getPan()[0], imagePanX, canvasPanX);
             vec2.add(deltaPoint2, deltaPoint2, this.getPan());
             this.setPan(deltaPoint2, false);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.14.4",
+  "version": "2.14.5",
   "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": "bb97f62b9f8df413ed2c07a9ea37616dd6a90c00"
+  "gitHead": "3da8ef5ac135dea541f8842ccde62bdd8d180f86"
 }