@cornerstonejs/tools 0.63.3 → 0.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.63.3",
+  "version": "0.65.0",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,12 +26,12 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^0.43.1",
+    "@cornerstonejs/core": "^0.44.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
   "peerDependencies": {
-    "@kitware/vtk.js": "26.5.6",
+    "@kitware/vtk.js": "27.3.1",
     "@types/d3-array": "^3.0.3",
     "@types/d3-interpolate": "^3.0.1",
     "d3-array": "^3.0.3",
@@ -39,7 +39,7 @@
     "gl-matrix": "^3.4.3"
   },
   "devDependencies": {
-    "@kitware/vtk.js": "26.5.6"
+    "@kitware/vtk.js": "27.3.1"
   },
   "contributors": [
     {
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "f64bb238239adaf0cf80ecdc2dca68341207bdd8"
+  "gitHead": "06ba42597fb76be663ec565463e8ef4b2ac968c8"
 }

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/BaseTool.ts

@@ -1,4 +1,8 @@
-import { StackViewport, VolumeViewport, utilities } from '@cornerstonejs/core';
+import {
+  StackViewport,
+  utilities,
+  BaseVolumeViewport,
+} from '@cornerstonejs/core';
 import { Types } from '@cornerstonejs/core';
 import { ToolModes } from '../../enums';
 import { InteractionTypes, ToolProps, PublicToolProps } from '../../types';
@@ -199,7 +203,7 @@ abstract class BaseTool implements IBaseTool {
   protected getTargetId(viewport: Types.IViewport): string | undefined {
     if (viewport instanceof StackViewport) {
       return `imageId:${viewport.getCurrentImageId()}`;
-    } else if (viewport instanceof VolumeViewport) {
+    } else if (viewport instanceof BaseVolumeViewport) {
       return `volumeId:${this.getTargetVolumeId(viewport)}`;
     } else {
       throw new Error(

package/src/tools/displayTools/Contour/addContourSetsToElement.ts

@@ -104,7 +104,10 @@ export function addContourSetsToElement(
 
   actor.setForceOpaque(true);
 
-  viewport.addActor({ uid: contourActorUID, actor });
+  viewport.addActor({
+    uid: contourActorUID,
+    actor: actor as unknown as Types.Actor,
+  });
   viewport.resetCamera();
   viewport.render();
 }

package/src/tools/displayTools/Contour/updateContourSets.ts

@@ -34,7 +34,9 @@ export function updateContourSets(
   const newOutlineWithActive = newContourConfig.outlineWidthActive;
 
   if (cachedConfig?.outlineWidthActive !== newOutlineWithActive) {
-    (actor as vtkActor).getProperty().setLineWidth(newOutlineWithActive);
+    (actor as unknown as vtkActor)
+      .getProperty()
+      .setLineWidth(newOutlineWithActive);
 
     setConfigCache(
       segmentationRepresentationUID,
@@ -44,7 +46,7 @@ export function updateContourSets(
     );
   }
 
-  const mapper = (actor as vtkActor).getMapper();
+  const mapper = (actor as unknown as vtkActor).getMapper();
   const lut = mapper.getLookupTable();
 
   const segmentsToSetToInvisible = [];