Merge pull request #458 from Kitware/update-vtkjs

feat(vtk.js): upgrade to v28
Kitware · Oct 19, 2023 · 6b6d170 · 6b6d170
2 parents 1c33fae + 8ee8969
commit 6b6d170
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@itk-wasm/dicom": "^3.2.1",
-    "@kitware/vtk.js": "^27.4.6",
+    "@kitware/vtk.js": "^28.13.0",
     "@netlify/edge-functions": "^2.0.0",
     "@sentry/vue": "^7.54.0",
     "@vueuse/core": "^8.5.0",
@@ -81,7 +81,7 @@
     "chai-almost": "^1.0.1",
     "chai-as-promised": "7.1.1",
     "chai-subset": "^1.6.0",
-    "chromedriver": "^116.0.0",
+    "chromedriver": "117.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "6.15.0",
@@ -124,4 +124,4 @@
       "eslint"
     ]
   }
-}
+}
diff --git a/src/vtk/CrosshairsWidget/behavior.ts b/src/vtk/CrosshairsWidget/behavior.ts
@@ -57,10 +57,8 @@ export default function widgetBehavior(publicAPI: any, model: any) {
       model.manipulator &&
       !ignoreKey(callData)
     ) {
-      const worldCoordsOfPointer = model.manipulator.handleEvent(
-        callData,
-        model._apiSpecificRenderWindow
-      );
+      const { worldCoords: worldCoordsOfPointer } =
+        model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       const handle = model.widgetState.getHandle();
       const worldToIndex = model.widgetState.getWorldToIndex();

diff --git a/src/vtk/PaintWidget/behavior.ts b/src/vtk/PaintWidget/behavior.ts
@@ -20,7 +20,7 @@ export default function widgetBehavior(publicAPI: any, model: any) {
       return macro.VOID;
     }
 
-    const worldCoords = model.manipulator.handleEvent(
+    const { worldCoords } = model.manipulator.handleEvent(
       eventData,
       model._apiSpecificRenderWindow
     );
@@ -45,7 +45,7 @@ export default function widgetBehavior(publicAPI: any, model: any) {
       return macro.VOID;
     }
 
-    const worldCoords = model.manipulator.handleEvent(
+    const { worldCoords } = model.manipulator.handleEvent(
       eventData,
       model._apiSpecificRenderWindow
     );

diff --git a/src/vtk/PolygonWidget/behavior.ts b/src/vtk/PolygonWidget/behavior.ts
@@ -117,7 +117,8 @@ export default function widgetBehavior(publicAPI: any, model: any) {
       return undefined;
     }
 
-    return manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    return manipulator.handleEvent(callData, model._apiSpecificRenderWindow)
+      .worldCoords;
   }
 
   function updateActiveStateHandle(callData: any) {

diff --git a/src/vtk/RulerWidget/behavior.ts b/src/vtk/RulerWidget/behavior.ts
@@ -86,7 +86,7 @@ export default function widgetBehavior(publicAPI: any, model: any) {
       return macro.VOID;
     }
 
-    const worldCoords = model.manipulator.handleEvent(
+    const { worldCoords } = model.manipulator.handleEvent(
       eventData,
       model._apiSpecificRenderWindow
     );
@@ -141,7 +141,7 @@ export default function widgetBehavior(publicAPI: any, model: any) {
    * Moves a point around.
    */
   publicAPI.handleMouseMove = (eventData: any) => {
-    const worldCoords = model.manipulator.handleEvent(
+    const { worldCoords } = model.manipulator.handleEvent(
       eventData,
       model._apiSpecificRenderWindow
     );
@@ -181,7 +181,7 @@ export default function widgetBehavior(publicAPI: any, model: any) {
    */
   publicAPI.handleLeftButtonRelease = (eventData: any) => {
     if (draggingState) {
-      const worldCoords = model.manipulator.handleEvent(
+      const { worldCoords } = model.manipulator.handleEvent(
         eventData,
         model._apiSpecificRenderWindow
       );