@cornerstonejs/core 1.61.3 → 1.61.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.61.3",
+  "version": "1.61.5",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "fb8ba8ba19974d073bb1bdf8b9e6efa2a63d9f94"
+  "gitHead": "781483751c49ea99866976c6a1a938d96e0ef2c1"
 }

package/src/RenderingEngine/RenderingEngine.ts

@@ -627,10 +627,28 @@ class RenderingEngine implements IRenderingEngine {
       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();
+
+      // TODO - make this use get/set Presentation or in some way preserve the
+      // basic presentation info on this viewport, rather than preserving camera
       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);
+        }
       }
     });
 

package/src/RenderingEngine/Viewport.ts

@@ -604,8 +604,10 @@ class Viewport implements IViewport {
   ): void {
     const { storeAsInitialCamera } = displayArea;
 
-    // make calculations relative to the fitToCanvasCamera view
-    this.setCamera(this.fitToCanvasCamera, storeAsInitialCamera);
+    // Setup the current camera as the fit to canvas camera as the one that is
+    // used as the base for calculations, but it isn't final, so don't fire
+    // events because the camera is still changing.
+    this.setCameraNoEvent(this.fitToCanvasCamera);
 
     const { imageArea, imageCanvasPoint } = displayArea;
 
@@ -613,7 +615,10 @@ class Viewport implements IViewport {
     if (imageArea) {
       const [areaX, areaY] = imageArea;
       zoom = Math.min(this.getZoom() / areaX, this.getZoom() / areaY);
-      this.setZoom(this.insetImageMultiplier * zoom, storeAsInitialCamera);
+      // Don't set as initial camera because then the zoom interactions don't
+      // work consistently.
+      // TODO: Add a better method to handle initial camera
+      this.setZoom(this.insetImageMultiplier * zoom);
     }
 
     // getting the image info
@@ -627,12 +632,14 @@ class Viewport implements IViewport {
       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],
@@ -647,9 +654,13 @@ class Viewport implements IViewport {
       const newPositionY = imagePanY + canvasPanY;
 
       const deltaPoint2: Point2 = [newPositionX, newPositionY];
-      this.setPan(deltaPoint2, storeAsInitialCamera);
+      // The pan is part of the display area settings, not the initial camera, so
+      // don't store as initial camera here - that breaks rotation and other changes.
+      this.setPan(deltaPoint2);
     }
 
+    // Instead of storing the camera itself, if initial camera is set,
+    // then store the display area as the baseline display area.
     if (storeAsInitialCamera) {
       this.options.displayArea = displayArea;
     }