@cornerstonejs/adapters 1.61.3 → 1.61.5

package/dist/adapters.es.js

@@ -40803,7 +40803,7 @@ class Viewport {
     const {
       storeAsInitialCamera
     } = displayArea;
-    this.setCamera(this.fitToCanvasCamera, storeAsInitialCamera);
+    this.setCameraNoEvent(this.fitToCanvasCamera);
     const {
       imageArea,
       imageCanvasPoint
@@ -40812,7 +40812,7 @@ class Viewport {
     if (imageArea) {
       const [areaX, areaY] = imageArea;
       zoom = Math.min(this.getZoom() / areaX, this.getZoom() / areaY);
-      this.setZoom(this.insetImageMultiplier * zoom, storeAsInitialCamera);
+      this.setZoom(this.insetImageMultiplier * zoom);
     }
     const imageData = this.getDefaultImageData();
     if (imageCanvasPoint && imageData) {
@@ -40827,8 +40827,8 @@ class Viewport {
       const canvasPanX = validateCanvasPanX * (canvasX - 0.5);
       const canvasPanY = validateCanvasPanY * (canvasY - 0.5);
       const dimensions = imageData.getDimensions();
-      const canvasZero = this.worldToCanvas([0, 0, 0]);
-      const canvasEdge = this.worldToCanvas([dimensions[0] - 1, dimensions[1] - 1, dimensions[2]]);
+      const canvasZero = this.worldToCanvas(imageData.indexToWorld([0, 0, 0]));
+      const canvasEdge = this.worldToCanvas(imageData.indexToWorld([dimensions[0] - 1, dimensions[1] - 1, dimensions[2]]));
       const canvasImage = [canvasEdge[0] - canvasZero[0], canvasEdge[1] - canvasZero[1]];
       const [imgWidth, imgHeight] = canvasImage;
       const [imageX, imageY] = imagePoint;
@@ -40837,7 +40837,7 @@ class Viewport {
       const newPositionX = imagePanX + canvasPanX;
       const newPositionY = imagePanY + canvasPanY;
       const deltaPoint2 = [newPositionX, newPositionY];
-      this.setPan(deltaPoint2, storeAsInitialCamera);
+      this.setPan(deltaPoint2);
     }
     if (storeAsInitialCamera) {
       this.options.displayArea = displayArea;
@@ -47602,9 +47602,30 @@ class RenderingEngine {
       canvas.width = rect.width * devicePixelRatio;
       canvas.height = rect.height * devicePixelRatio;
       const prevCamera = vp.getCamera();
+      const rotation = vp.getRotation();
+      const pan = vp.getPan();
+      const zoom = vp.getZoom();
+      const {
+        flipHorizontal
+      } = prevCamera;
       vp.resetCamera();
+      const displayArea = vp.getDisplayArea();
       if (keepCamera) {
-        vp.setCamera(prevCamera);
+        if (displayArea) {
+          if (flipHorizontal) {
+            vp.setCamera({
+              flipHorizontal
+            });
+          }
+          if (rotation) {
+            vp.setProperties({
+              rotation
+            });
+          }
+          console.log('What to do with pan and zoom', pan[0], pan[1], zoom);
+        } else {
+          vp.setCamera(prevCamera);
+        }
       }
     });
     if (immediate === true) {