@kitware/vtk.js 24.8.0 → 24.9.0

package/Common/DataModel/ITKHelper.d.ts

@@ -0,0 +1,54 @@
+import vtkPolyData from './PolyData';
+import vtkImageData from './ImageData';
+
+export interface IOptions {
+	pointDataName: string;
+	scalarArrayName: string;
+	cellDataName: string;
+}
+
+/**
+ * Converts an itk-wasm Image to a vtk.js vtkImageData.
+ * Requires an itk-wasm Image as input.
+ * @param itkImage 
+ * @param {IOptions} [options] 
+ */
+export function convertItkToVtkImage(itkImage: any, options?: IOptions): vtkImageData;
+
+/**
+ * Converts a vtk.js vtkImageData to an itk-wasm Image.
+ * Requires a vtk.js vtkImageData as input.
+ * @param {vtkImageData} vtkImage 
+ * @param {IOptions} [options] 
+ */
+export function convertVtkToItkImage(vtkImage: vtkImageData, options?: IOptions): any;
+
+/**
+ * Converts an itk-wasm PolyData to a vtk.js vtkPolyData.
+ * Requires an itk-wasm PolyData as input.
+ * @param itkPolyData 
+ * @param {IOptions} [options] 
+ */
+export function convertItkToVtkPolyData(itkPolyData: any, options?: IOptions): vtkPolyData;
+
+/**
+ * Converts a vtk.js vtkPolyData to an itk-wasm PolyData.
+ * Requires a vtk.js vtkPolyData as input.
+ * 
+ * @param {vtkPolyData} polyData 
+ * @param {IOptions} [options] 
+ */
+export function convertVtkToItkPolyData(polyData: vtkPolyData, options?: IOptions): any;
+
+
+/** 
+ * vtkITKHelper is a helper which provides a set of functions to work with
+ * itk-wasm module.
+ */
+export declare const vtkITKHelper: {
+	convertItkToVtkImage: typeof convertItkToVtkImage,
+	convertVtkToItkImage: typeof convertVtkToItkImage,
+	convertItkToVtkPolyData: typeof convertItkToVtkPolyData,
+	convertVtkToItkPolyData: typeof convertVtkToItkPolyData,
+};
+export default vtkITKHelper;

package/Interaction/Manipulators/MouseRangeManipulator.js

@@ -18,9 +18,13 @@ function vtkMouseRangeManipulator(publicAPI, model) {
 
 
   function processDelta(listener, delta) {
-    var oldValue = listener.getValue(); // Apply scale and cached delta to current delta
+    var oldValue = listener.getValue(); // if exponential scroll is enabled, we raise our scale to the
+    //  exponent of the net delta of the interaction. The further away
+    // the user's cursor is from the start of the interaction, the more
+    // their movements will effect the value.
 
-    var newDelta = delta * listener.scale + incrementalDelta.get(listener);
+    var scalingFactor = listener.exponentialScroll ? Math.pow(listener.scale, Math.log2(Math.abs(model.interactionNetDelta) + 2)) : listener.scale;
+    var newDelta = delta * scalingFactor + incrementalDelta.get(listener);
     var value = oldValue + newDelta; // Compute new value based on step
 
     var difference = value - listener.min;
@@ -52,6 +56,7 @@ function vtkMouseRangeManipulator(publicAPI, model) {
 
   publicAPI.setHorizontalListener = function (min, max, step, getValue, setValue) {
     var scale = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+    var exponentialScroll = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var getFn = Number.isFinite(getValue) ? function () {
       return getValue;
     } : getValue;
@@ -61,7 +66,8 @@ function vtkMouseRangeManipulator(publicAPI, model) {
       step: step,
       getValue: getFn,
       setValue: setValue,
-      scale: scale
+      scale: scale,
+      exponentialScroll: exponentialScroll
     };
     incrementalDelta.set(model.horizontalListener, 0);
     publicAPI.modified();
@@ -70,6 +76,7 @@ function vtkMouseRangeManipulator(publicAPI, model) {
 
   publicAPI.setVerticalListener = function (min, max, step, getValue, setValue) {
     var scale = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+    var exponentialScroll = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var getFn = Number.isFinite(getValue) ? function () {
       return getValue;
     } : getValue;
@@ -79,7 +86,8 @@ function vtkMouseRangeManipulator(publicAPI, model) {
       step: step,
       getValue: getFn,
       setValue: setValue,
-      scale: scale
+      scale: scale,
+      exponentialScroll: exponentialScroll
     };
     incrementalDelta.set(model.verticalListener, 0);
     publicAPI.modified();
@@ -88,6 +96,7 @@ function vtkMouseRangeManipulator(publicAPI, model) {
 
   publicAPI.setScrollListener = function (min, max, step, getValue, setValue) {
     var scale = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+    var exponentialScroll = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var getFn = Number.isFinite(getValue) ? function () {
       return getValue;
     } : getValue;
@@ -97,7 +106,8 @@ function vtkMouseRangeManipulator(publicAPI, model) {
       step: step,
       getValue: getFn,
       setValue: setValue,
-      scale: scale
+      scale: scale,
+      exponentialScroll: exponentialScroll
     };
     incrementalDelta.set(model.scrollListener, 0);
     publicAPI.modified();
@@ -140,6 +150,7 @@ function vtkMouseRangeManipulator(publicAPI, model) {
 
   publicAPI.onButtonDown = function (interactor, renderer, position) {
     model.previousPosition = position;
+    model.interactionNetDelta = 0;
     var glRenderWindow = interactor.getView(); // Ratio is the dom size vs renderwindow size
 
     var ratio = glRenderWindow.getContainerSize()[0] / glRenderWindow.getSize()[0]; // Get proper pixel range used by viewport in rw size space
@@ -216,12 +227,14 @@ function vtkMouseRangeManipulator(publicAPI, model) {
     if (model.horizontalListener) {
       var dxNorm = (position.x - model.previousPosition.x) / model.containerSize[0];
       var dx = scaleDeltaToRange(model.horizontalListener, dxNorm);
+      model.interactionNetDelta += dx;
       processDelta(model.horizontalListener, dx);
     }
 
     if (model.verticalListener) {
       var dyNorm = (position.y - model.previousPosition.y) / model.containerSize[1];
       var dy = scaleDeltaToRange(model.verticalListener, dyNorm);
+      model.interactionNetDelta += dy;
       processDelta(model.verticalListener, dy);
     }
 
@@ -234,10 +247,14 @@ function vtkMouseRangeManipulator(publicAPI, model) {
       return;
     }
 
+    model.interactionNetDelta += delta * model.scrollListener.step;
     processDelta(model.scrollListener, delta * model.scrollListener.step);
   };
 
-  publicAPI.onStartScroll = publicAPI.onScroll;
+  publicAPI.onStartScroll = function (payload) {
+    model.interactionNetDelta = 0;
+    publicAPI.onScroll(payload);
+  };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------

package/index.d.ts

@@ -26,6 +26,7 @@
 /// <reference path="./Common/DataModel/DataSetAttributes/FieldData.d.ts" />
 /// <reference path="./Common/DataModel/DataSetAttributes.d.ts" />
 /// <reference path="./Common/DataModel/ImageData.d.ts" />
+/// <reference path="./Common/DataModel/ITKHelper.d.ts" />
 /// <reference path="./Common/DataModel/KochanekSpline1D.d.ts" />
 /// <reference path="./Common/DataModel/Line.d.ts" />
 /// <reference path="./Common/DataModel/PiecewiseFunction.d.ts" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "24.8.0",
+  "version": "24.9.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",