@cornerstonejs/tools 0.63.2 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.63.2",
+  "version": "0.64.0",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,7 +26,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^0.43.0",
+    "@cornerstonejs/core": "^0.43.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "6f402cfcdd8b50aff42c7499e3fcfcbfc7200669"
+  "gitHead": "e632cdd1b824e9e65a6af1af69797a446629378f"
 }

package/src/tools/ZoomTool.ts

@@ -16,7 +16,6 @@ class ZoomTool extends BaseTool {
   initialMousePosWorld: Types.Point3;
   dirVec: Types.Point3;
 
-  // Apparently TS says super _must_ be the first call? This seems a bit opinionated.
   constructor(
     toolProps: PublicToolProps = {},
     defaultToolProps: ToolProps = {
@@ -28,6 +27,7 @@ class ZoomTool extends BaseTool {
         maxZoomScale: 30,
         pinchToZoom: true,
         pan: true,
+        invert: false,
       },
     }
   ) {
@@ -146,7 +146,7 @@ class ZoomTool extends BaseTool {
     const { parallelScale, focalPoint, position } = camera;
 
     const zoomScale = 1.5 / size[1];
-    const k = deltaY * zoomScale;
+    const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
 
     let parallelScaleToSet = (1.0 - k) * parallelScale;
 
@@ -169,7 +169,7 @@ class ZoomTool extends BaseTool {
       // and the initial mouse position by some amount until ultimately we
       // reach the mouse position at the focal point
       const zoomScale = 5 / size[1];
-      const k = deltaY * zoomScale;
+      const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
       parallelScaleToSet = (1.0 - k) * parallelScale;
 
       positionToSet = vec3.scaleAndAdd(
@@ -244,7 +244,9 @@ class ZoomTool extends BaseTool {
       -viewPlaneNormal[2],
     ];
 
-    const k = deltaY * zoomScale;
+    const k = this.configuration.invert
+      ? deltaY / zoomScale
+      : deltaY * zoomScale;
 
     let tmp = k * directionOfProjection[0];
     position[0] += tmp;

package/src/tools/base/AnnotationDisplayTool.ts

@@ -89,7 +89,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
       columnScale,
       imageId,
       imageData: calibratedImageData,
-      worldToIndex: noneCalibratedWorldToIndex,
+      worldToIndex: nonCalibratedWorldToIndex,
     } = evt.detail;
 
     const { viewport } = getEnabledElement(element);
@@ -141,7 +141,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
               vec4.transformMat4(
                 nonCalibratedIndexVec4,
                 p,
-                noneCalibratedWorldToIndex
+                nonCalibratedWorldToIndex
               );
               const calibratedIndex = [
                 columnScale * nonCalibratedIndexVec4[0],

package/src/utilities/calibrateImageSpacing.ts

@@ -24,10 +24,10 @@ export default function calibrateImageSpacing(
     columnPixelSpacing = rowPixelSpacing;
   }
 
-  calibratedPixelSpacingMetadataProvider.add(imageId, [
+  calibratedPixelSpacingMetadataProvider.add(imageId, {
     rowPixelSpacing,
     columnPixelSpacing,
-  ]);
+  });
 
   // 2. Update the actor for stackViewports
   const viewports = renderingEngine.getStackViewports();