@kitware/vtk.js 24.7.1 → 24.10.0

package/Widgets/Manipulators/PlaneManipulator.d.ts

@@ -1,81 +1,15 @@
-import { vtkObject } from './../../interfaces';
+import { IAbstractManipulatorInitialValues, vtkAbstractManipulator } from './AbstractManipulator';
+import { Vector3 } from './../../types';
 
 /**
  *
  */
-export interface IPlaneManipulatorInitialValues {
-	origin?: number[];
-	normal?: number[];
-}
-
-export interface vtkPlaneManipulator extends vtkObject {
-
-	/**
-	 * Get the normal of the plane
-	 */
-	getNormal(): number[];
-
-	/**
-	 * Get the normal of the plane
-	 */
-	getNormalByReference(): number[];
-
-	/**
-	 * Get the origin of the plane
-	 */
-	getOrigin(): number[];
-
-	/**
-	 * Get the origin of the plane
-	 */
-	getOriginByReference(): number[];
+export interface IPlaneManipulatorInitialValues extends IAbstractManipulatorInitialValues {
 
-	/**
-	 * 
-	 * @param callData 
-	 * @param glRenderWindow 
-	 */
-	handleEvent(callData: any, glRenderWindow: any): number[];
-
-	/**
-	 * Set the normal of the plane
-	 * @param {Number[]} normal The normal coordinate.
-	 */
-	setNormal(normal: number[]): boolean;
-
-	/**
-	 * Set the normal of the plane
-	 * @param {Number} x The x coordinate.
-	 * @param {Number} y The y coordinate.
-	 * @param {Number} z The z coordinate.
-	 */
-	setNormal(x: number, y: number, z: number): boolean;
-
-	/**
-	 * Set the normal of the plane
-	 * @param {Number[]} normal The normal coordinate.
-	 */
-	setNormalFrom(normal: number[]): boolean;
-
-	/**
-	 * Set the origin of the plane.
-	 * @param {Number[]} origin The coordinate of the origin point.
-	 */
-	setOrigin(origin: number[]): boolean;
+}
 
-	/**
-	 * Set the origin of the plane.
-	 * @param {Number} x The x coordinate of the origin point.
-	 * @param {Number} y The y coordinate of the origin point.
-	 * @param {Number} z The z coordinate of the origin point.
-	 */
-	setOrigin(x: number, y: number, z: number): boolean;
+export interface vtkPlaneManipulator extends vtkAbstractManipulator {
 
-	/**
-	 * Set the origin of the plane.
-	 * @param {Number[]} origin The coordinate of the origin point.
-	 */
-	setOriginFrom(origin: number[]): boolean;
 }
 
 
@@ -97,12 +31,12 @@ export function newInstance(initialValues?: IPlaneManipulatorInitialValues): vtk
  * 
  * @param {Number} x 
  * @param {Number} y 
- * @param {Number[]} planeOrigin 
- * @param {Number[]} planeNormal 
+ * @param {Vector3} planeOrigin 
+ * @param {Vector3} planeNormal 
  * @param renderer 
  * @param glRenderWindow 
  */
-export function intersectDisplayWithPlane(x: number, y: number, planeOrigin: number[], planeNormal: number[], renderer: any, glRenderWindow: any): number[];
+export function intersectDisplayWithPlane(x: number, y: number, planeOrigin: Vector3, planeNormal: Vector3, renderer: any, glRenderWindow: any): Vector3;
 
 
 /**

package/Widgets/Manipulators/PlaneManipulator.js

@@ -1,6 +1,11 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkPlane from '../../Common/DataModel/Plane.js';
+import vtkAbstractManipulator from './AbstractManipulator.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function intersectDisplayWithPlane(x, y, planeOrigin, planeNormal, renderer, glRenderWindow) {
   var near = glRenderWindow.displayToWorld(x, y, 0, renderer);
   var far = glRenderWindow.displayToWorld(x, y, 1, renderer);
@@ -11,26 +16,24 @@ function intersectDisplayWithPlane(x, y, planeOrigin, planeNormal, renderer, glR
 
 function vtkPlaneManipulator(publicAPI, model) {
   // Set our className
-  model.classHierarchy.push('vtkPlaneManipulator'); // --------------------------------------------------------------------------
+  model.classHierarchy.push('vtkPlaneManipulator');
 
   publicAPI.handleEvent = function (callData, glRenderWindow) {
-    return intersectDisplayWithPlane(callData.position.x, callData.position.y, model.origin, model.normal, callData.pokedRenderer, glRenderWindow);
+    return intersectDisplayWithPlane(callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer, glRenderWindow);
   };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  normal: [0, 0, 1],
-  origin: [0, 0, 0]
-}; // ----------------------------------------------------------------------------
+function defaultValues(initialValues) {
+  return _objectSpread({}, initialValues);
+} // ----------------------------------------------------------------------------
+
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues);
-  macro.obj(publicAPI, model);
-  macro.setGetArray(publicAPI, model, ['normal', 'origin'], 3);
+  vtkAbstractManipulator.extend(publicAPI, model, defaultValues(initialValues));
   vtkPlaneManipulator(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Manipulators/TrackballManipulator.d.ts

@@ -1,50 +1,14 @@
-import { vtkObject } from './../../interfaces';
+import { IAbstractManipulatorInitialValues, vtkAbstractManipulator } from './AbstractManipulator';
+import { Vector3 } from './../../types';
 
 /**
  *
  */
-export interface ITrackballManipulatorInitialValues {
-	normal?: number[];
-}
-
-export interface vtkTrackballManipulator extends vtkObject {
-
-	/**
-	 * Get normal
-	 */
-	getNormal(): number[];
-
-	/**
-	 * Get normal
-	 */
-	getNormalByReference(): number[];
-
-	/**
-	 * 
-	 * @param callData 
-	 * @param glRenderWindow 
-	 */
-	handleEvent(callData: any, glRenderWindow: any): void;
-
-	/**
-	 * Set the normal of the line.
-	 * @param {Number[]} normal The normal coordinate.
-	 */
-	setNormal(normal: number[]): boolean;
+export interface ITrackballManipulatorInitialValues extends IAbstractManipulatorInitialValues {
 
-	/**
-	 * Set the normal of the line.
-	 * @param {Number} x The x coordinate.
-	 * @param {Number} y The y coordinate.
-	 * @param {Number} z The z coordinate.
-	 */
-	setNormal(x: number, y: number, z: number): boolean;
+}
 
-	/**
-	 * Set the normal of the line.
-	 * @param {Number[]} normal The normal coordinate.
-	 */
-	setNormalFrom(normal: number[]): boolean;
+export interface vtkTrackballManipulator extends vtkAbstractManipulator {
 
 	/**
 	 * 
@@ -73,12 +37,12 @@ export function newInstance(initialValues?: ITrackballManipulatorInitialValues):
  * @param {Number} prevY 
  * @param {Number} curX 
  * @param {Number} curY 
- * @param {Number[]} origin 
- * @param {Number[]} direction 
+ * @param {Vector3} origin 
+ * @param {Vector3} direction 
  * @param renderer 
  * @param glRenderWindow 
  */
-export function trackballRotate(prevX: number, prevY: number, curX: number, curY: number, origin: number[], direction: number[], renderer: any, glRenderWindow: any): void;
+export function trackballRotate(prevX: number, prevY: number, curX: number, curY: number, origin: Vector3, direction: Vector3, renderer: any, glRenderWindow: any): void;
 
 
 /**

package/Widgets/Manipulators/TrackballManipulator.js

@@ -1,7 +1,12 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { mat4, vec3 } from 'gl-matrix';
 import macro from '../../macros.js';
 import { j as cross, r as radiansFromDegrees } from '../../Common/Core/Math/index.js';
+import vtkAbstractManipulator from './AbstractManipulator.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function trackballRotate(prevX, prevY, curX, curY, origin, direction, renderer, glRenderWindow) {
   var dx = curX - prevX;
   var dy = curY - prevY;
@@ -28,15 +33,14 @@ function vtkTrackballManipulator(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkTrackballManipulator');
   var prevX = 0;
-  var prevY = 0; // --------------------------------------------------------------------------
+  var prevY = 0;
 
   publicAPI.handleEvent = function (callData, glRenderWindow) {
-    var newDirection = trackballRotate(prevX, prevY, callData.position.x, callData.position.y, model.origin, model.normal, callData.pokedRenderer);
+    var newDirection = trackballRotate(prevX, prevY, callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer);
     prevX = callData.position.x;
     prevY = callData.position.y;
     return newDirection;
-  }; // --------------------------------------------------------------------------
-
+  };
 
   publicAPI.reset = function (callData) {
     prevX = callData.position.x;
@@ -47,15 +51,14 @@ function vtkTrackballManipulator(publicAPI, model) {
 // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  normal: [0, 0, 1]
-}; // ----------------------------------------------------------------------------
+function defaultValues(initialValues) {
+  return _objectSpread({}, initialValues);
+} // ----------------------------------------------------------------------------
+
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues);
-  macro.obj(publicAPI, model);
-  macro.setGetArray(publicAPI, model, ['normal'], 3);
+  vtkAbstractManipulator.extend(publicAPI, model, defaultValues(initialValues));
   vtkTrackballManipulator(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Representations/ResliceCursorContextRepresentation.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
-import { g as subtract, m as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
+import { s as subtract, m as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkCylinderSource from '../../Filters/Sources/CylinderSource.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';

package/Widgets/Representations/SplineContextRepresentation.js

@@ -70,19 +70,23 @@ function vtkSplineContextRepresentation(publicAPI, model) {
 
     var numVertices = inPoints.length;
 
-    if (model.close) {
+    if (!model.close) {
+      --numVertices;
+    } else {
       inPoints.push(inPoints[0]);
     }
 
     var spline = vtkSpline3D.newInstance({
-      close: model.close,
+      close: widgetState.getSplineClose(),
       kind: widgetState.getSplineKind(),
       tension: widgetState.getSplineTension(),
       bias: widgetState.getSplineBias(),
-      continuity: widgetState.getSplineContinuity()
+      continuity: widgetState.getSplineContinuity(),
+      boundaryCondition: widgetState.getSplineBoundaryCondition(),
+      boundaryConditionValues: widgetState.getSplineBoundaryConditionValues()
     });
     spline.computeCoefficients(inPoints);
-    var outPoints = new Float32Array(3 * numVertices * model.resolution);
+    var outPoints = new Float32Array(3 * ((numVertices + !model.close) * model.resolution));
     var outCells = new Uint32Array(numVertices * model.resolution + 2);
     outCells[0] = numVertices * model.resolution + 1;
     outCells[numVertices * model.resolution + 1] = 0;
@@ -98,9 +102,20 @@ function vtkSplineContextRepresentation(publicAPI, model) {
       }
     }
 
+    if (model.close) {
+      outCells[numVertices * model.resolution + 1] = 0;
+    } else {
+      var lastPointIndex = numVertices * model.resolution + 1;
+      var lastPoint = spline.getPoint(numVertices, 0);
+      outPoints[3 * lastPointIndex + 0] = lastPoint[0];
+      outPoints[3 * lastPointIndex + 1] = lastPoint[1];
+      outPoints[3 * lastPointIndex + 2] = lastPoint[2];
+      outCells[numVertices * model.resolution + 1] = lastPointIndex;
+    }
+
     polydata.getPoints().setData(outPoints);
 
-    if (model.fill) {
+    if (model.fill && model.close) {
       polydata.getPolys().setData(outCells);
     }
 
@@ -115,9 +130,12 @@ function vtkSplineContextRepresentation(publicAPI, model) {
     return model.state;
   };
 
-  publicAPI.setFill = macro.chain(publicAPI.setFill, function (v) {
-    return model.pipelines.area.actor.setVisibility(v);
-  });
+  function updateAreaVisibility() {
+    model.pipelines.area.actor.setVisibility(model.fill && model.close);
+  }
+
+  publicAPI.setFill = macro.chain(publicAPI.setFill, updateAreaVisibility);
+  publicAPI.setClose = macro.chain(publicAPI.setClose, updateAreaVisibility);
   publicAPI.setOutputBorder = macro.chain(publicAPI.setOutputBorder, function (v) {
     return model.pipelines.border.actor.setVisibility(v);
   });
@@ -130,6 +148,7 @@ var DEFAULT_VALUES = {
   resolution: 16,
   close: true,
   fill: true,
+  // boundaryCondition : BoundaryCondition.DEFAULT
   outputBorder: false,
   borderColor: [0.1, 1, 0.1],
   errorBorderColor: [1, 0, 0]
@@ -140,7 +159,7 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues);
   vtkContextRepresentation.extend(publicAPI, model, initialValues);
   macro.get(publicAPI, model, ['mapper']);
-  macro.setGet(publicAPI, model, ['resolution', 'close', 'fill', 'outputBorder']);
+  macro.setGet(publicAPI, model, ['resolution', 'close', 'boundaryCondition', 'fill', 'outputBorder']);
   macro.setGetArray(publicAPI, model, ['borderColor', 'errorBorderColor'], 3); // Object specific methods
 
   vtkSplineContextRepresentation(publicAPI, model);

package/Widgets/Representations/WidgetRepresentation.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
 import vtkProp from '../../Rendering/Core/Prop.js';
-import { g as subtract, d as dot } from '../../Common/Core/Math/index.js';
+import { s as subtract, d as dot } from '../../Common/Core/Math/index.js';
 import { Behavior } from './WidgetRepresentation/Constants.js';
 import { RenderingTypes } from '../Core/WidgetManager/Constants.js';
 import { CATEGORIES } from '../../Rendering/Core/Mapper/CoincidentTopologyHelper.js';

package/Widgets/Widgets3D/AngleWidget/behavior.js

@@ -40,6 +40,7 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setOrigin.apply(newHandle, _toConsumableArray(moveHandle.getOrigin()));
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
+      newHandle.setManipulator(model.manipulator);
     } else {
       isDragging = true;
 
@@ -56,10 +57,12 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      model.manipulator.setOrigin(model.activeState.getOrigin());
-      model.manipulator.setNormal(model._camera.getDirectionOfProjection());
-      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
+      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);

package/Widgets/Widgets3D/AngleWidget/state.js

@@ -3,7 +3,7 @@ import vtkStateBuilder from '../../Core/StateBuilder.js';
 function generateState() {
   return vtkStateBuilder.createBuilder().addStateFromMixin({
     labels: ['moveHandle'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'moveHandle',
     initialValues: {
       scale1: 0.1,
@@ -11,7 +11,7 @@ function generateState() {
     }
   }).addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'handle',
     initialValues: {
       scale1: 0.1

package/Widgets/Widgets3D/AngleWidget.js

@@ -1,18 +1,25 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkPolyLineRepresentation from '../Representations/PolyLineRepresentation.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import { g as subtract, R as angleBetweenVectors } from '../../Common/Core/Math/index.js';
+import { s as subtract, R as angleBetweenVectors } from '../../Common/Core/Math/index.js';
 import widgetBehavior from './AngleWidget/behavior.js';
 import generateState from './AngleWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkAngleWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkAngleWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkAngleWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.methodsToLink = ['activeScaleFactor', 'activeColor', 'useActiveColor', 'glyphResolution', 'defaultScale'];
   model.behavior = widgetBehavior;
@@ -56,6 +63,14 @@ function vtkAngleWidget(publicAPI, model) {
     subtract(handles[0].getOrigin(), handles[1].getOrigin(), vec1);
     subtract(handles[2].getOrigin(), handles[1].getOrigin(), vec2);
     return angleBetweenVectors(vec1, vec2);
+  };
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(manipulator);
+    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
@@ -66,7 +81,9 @@ function vtkAngleWidget(publicAPI, model) {
     model.widgetState.getMoveHandle().setOrigin(center);
   }); // Default manipulator
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 

package/Widgets/Widgets3D/DistanceWidget/behavior.js

@@ -34,6 +34,7 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setOrigin.apply(newHandle, _toConsumableArray(moveHandle.getOrigin()));
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
+      newHandle.setManipulator(model.manipulator);
     } else {
       isDragging = true;
 
@@ -50,13 +51,17 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
     if (model.hasFocus && model.widgetState.getHandleList().length === MAX_POINTS) {
       publicAPI.loseFocus();
       return macro.VOID;
     }
 
-    if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
+      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);

package/Widgets/Widgets3D/DistanceWidget/state.js

@@ -3,7 +3,7 @@ import vtkStateBuilder from '../../Core/StateBuilder.js';
 function generateState() {
   return vtkStateBuilder.createBuilder().addStateFromMixin({
     labels: ['moveHandle'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'moveHandle',
     initialValues: {
       scale1: 0.1,
@@ -11,7 +11,7 @@ function generateState() {
     }
   }).addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'handle',
     initialValues: {
       scale1: 0.1

package/Widgets/Widgets3D/DistanceWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -8,11 +9,17 @@ import widgetBehavior from './DistanceWidget/behavior.js';
 import generateState from './DistanceWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkDistanceWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkDistanceWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkDistanceWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.methodsToLink = ['activeScaleFactor', 'activeColor', 'useActiveColor', 'glyphResolution', 'defaultScale'];
   model.behavior = widgetBehavior;
@@ -51,6 +58,14 @@ function vtkDistanceWidget(publicAPI, model) {
     }
 
     return Math.sqrt(distance2BetweenPoints(handles[0].getOrigin(), handles[1].getOrigin()));
+  };
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(manipulator);
+    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
@@ -61,7 +76,9 @@ function vtkDistanceWidget(publicAPI, model) {
     model.widgetState.getMoveHandle().setOrigin(center);
   }); // Default manipulator
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 

package/Widgets/Widgets3D/EllipseWidget.js

@@ -50,11 +50,12 @@ function vtkEllipseWidget(publicAPI, model) {
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
-  // Default manipulator
 
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
   model.widgetState = generateState();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 
@@ -74,7 +75,7 @@ function defaultValues(initialValues) {
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   vtkShapeWidget.extend(publicAPI, model, defaultValues(initialValues));
-  macro.setGet(publicAPI, model, ['manipulator', 'widgetState']);
+  macro.setGet(publicAPI, model, ['widgetState']);
   vtkEllipseWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -55,7 +55,6 @@ function widgetBehavior(publicAPI, model) {
 
         if (type === 'corners') {
           // manipulator should be a plane manipulator
-          manipulator.setNormal(model._camera.getDirectionOfProjection());
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
@@ -67,8 +66,8 @@ function widgetBehavior(publicAPI, model) {
 
           var center = [(planes[0] + planes[1]) / 2, (planes[2] + planes[3]) / 2, (planes[4] + planes[5]) / 2]; // manipulator should be a line manipulator
 
-          manipulator.setOrigin(transformVec3(center, indexToWorldT));
-          manipulator.setNormal(rotateVec3(constraintAxis, indexToWorldT));
+          manipulator.setHandleOrigin(transformVec3(center, indexToWorldT));
+          manipulator.setHandleNormal(rotateVec3(constraintAxis, indexToWorldT));
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
@@ -77,7 +76,7 @@ function widgetBehavior(publicAPI, model) {
           var edgeAxis = index.map(function (a) {
             return a === 1 ? a : 0;
           });
-          manipulator.setNormal(rotateVec3(edgeAxis, indexToWorldT));
+          manipulator.setHandleNormal(rotateVec3(edgeAxis, indexToWorldT));
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }