@kitware/vtk.js 27.5.0 → 28.0.0

package/Rendering/OpenGL/Profiles/All.js

@@ -11,6 +11,7 @@ import '../Texture.js';
 import '../Glyph3DMapper.js';
 import '../ImageResliceMapper.js';
 import '../ImageMapper.js';
+import '../ImageCPRMapper.js';
 import '../ImageSlice.js';
 import '../Volume.js';
 import '../VolumeMapper.js';

package/Rendering/OpenGL/Profiles/Volume.js

@@ -2,6 +2,7 @@ import '../Camera.js';
 import '../Renderer.js';
 import '../ImageResliceMapper.js';
 import '../ImageMapper.js';
+import '../ImageCPRMapper.js';
 import '../ImageSlice.js';
 import '../Volume.js';
 import '../VolumeMapper.js';

package/Rendering/Profiles/All.js

@@ -11,6 +11,7 @@ import '../OpenGL/Texture.js';
 import '../OpenGL/Glyph3DMapper.js';
 import '../OpenGL/ImageResliceMapper.js';
 import '../OpenGL/ImageMapper.js';
+import '../OpenGL/ImageCPRMapper.js';
 import '../OpenGL/ImageSlice.js';
 import '../OpenGL/Volume.js';
 import '../OpenGL/VolumeMapper.js';

package/Rendering/Profiles/Volume.js

@@ -2,6 +2,7 @@ import '../OpenGL/Camera.js';
 import '../OpenGL/Renderer.js';
 import '../OpenGL/ImageResliceMapper.js';
 import '../OpenGL/ImageMapper.js';
+import '../OpenGL/ImageCPRMapper.js';
 import '../OpenGL/ImageSlice.js';
 import '../OpenGL/Volume.js';
 import '../OpenGL/VolumeMapper.js';

package/Widgets/Core/WidgetManager.js

@@ -237,7 +237,7 @@ function vtkWidgetManager(publicAPI, model) {
             case 0:
               fromTouchEvent = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
 
-              if (!(!model.isAnimating && model.pickingEnabled)) {
+              if (!(!model.isAnimating && model.pickingEnabled && callData.pokedRenderer === model._renderer)) {
                 _context.next = 6;
                 break;
               }

package/Widgets/Manipulators/AbstractManipulator.d.ts

@@ -1,6 +1,6 @@
 import { vtkObject } from './../../interfaces';
 import { vtkOpenGLRenderWindow } from './../../Rendering/OpenGL/RenderWindow'
-import { Vector3 } from './../../types';
+import { Matrix3x3, Nullable, Vector3 } from './../../types';
 
 /**
  *
@@ -53,7 +53,7 @@ export interface vtkAbstractManipulator extends vtkObject {
      * @param callData 
      * @param glRenderWindow 
      */
-    handleEvent(callData: any, glRenderWindow: vtkOpenGLRenderWindow): Vector3;
+    handleEvent(callData: any, glRenderWindow: vtkOpenGLRenderWindow): { worldCoords: Nullable<Vector3>, worldDirection?: Matrix3x3 };
 
     /* ------------------------------------------------------------------- */
 

package/Widgets/Manipulators/CPRManipulator.js

@@ -0,0 +1,138 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import macro from '../../macros.js';
+import vtkPlane from '../../Common/DataModel/Plane.js';
+import vtkAbstractManipulator from './AbstractManipulator.js';
+import { mat4, vec3, mat3 } from 'gl-matrix';
+
+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);
+  return vtkPlane.intersectWithLine(near, far, planeOrigin, planeNormal).x;
+} // ----------------------------------------------------------------------------
+// vtkCPRManipulator methods
+// ----------------------------------------------------------------------------
+
+function vtkCPRManipulator(publicAPI, model) {
+  // Set our className
+  model.classHierarchy.push('vtkCPRManipulator');
+
+  publicAPI.handleEvent = function (callData, glRenderWindow) {
+    var _model$cprActor;
+
+    var mapper = (_model$cprActor = model.cprActor) === null || _model$cprActor === void 0 ? void 0 : _model$cprActor.getMapper();
+
+    if (!mapper) {
+      return {
+        worldCoords: null
+      };
+    } // Get normal and origin of the picking plane from the actor matrix
+
+
+    var cprActorMatrix = [];
+    mat4.transpose(cprActorMatrix, model.cprActor.getMatrix());
+    var worldPlaneNormal = cprActorMatrix.slice(8, 11); // 3rd column
+
+    var worldPlaneOrigin = cprActorMatrix.slice(12, 15); // 4th column
+    // Convert world plane position to 2D position in the plane
+
+    var inversecprActorMatrix = [];
+    mat4.invert(inversecprActorMatrix, cprActorMatrix);
+    var worldPlanePicking = intersectDisplayWithPlane(callData.position.x, callData.position.y, worldPlaneOrigin, worldPlaneNormal, callData.pokedRenderer, glRenderWindow);
+    var modelPlanePicking = []; // (x, height - distance, 0)
+
+    vec3.transformMat4(modelPlanePicking, worldPlanePicking, inversecprActorMatrix);
+    var height = mapper.getHeight();
+    var distance = height - modelPlanePicking[1];
+    return publicAPI.distanceEvent(distance);
+  };
+
+  publicAPI.distanceEvent = function (distance) {
+    var _model$cprActor2;
+
+    var mapper = (_model$cprActor2 = model.cprActor) === null || _model$cprActor2 === void 0 ? void 0 : _model$cprActor2.getMapper();
+
+    if (!mapper) {
+      return {
+        worldCoords: null
+      };
+    }
+
+    var height = mapper.getHeight();
+    var clampedDistance = Math.max(0, Math.min(height, distance));
+
+    var _mapper$getCenterline = mapper.getCenterlinePositionAndOrientation(clampedDistance),
+        position = _mapper$getCenterline.position,
+        orientation = _mapper$getCenterline.orientation;
+
+    var worldDirection;
+
+    if (orientation) {
+      var modelDirections = mat3.fromQuat([], orientation);
+      var baseDirections = mapper.getDirectionMatrix();
+      worldDirection = mat3.mul([], modelDirections, baseDirections);
+    }
+
+    model.currentDistance = clampedDistance;
+    return {
+      worldCoords: position,
+      worldDirection: worldDirection
+    };
+  };
+
+  publicAPI.handleScroll = function (nbSteps) {
+    var distance = model.currentDistance + publicAPI.getDistanceStep() * nbSteps;
+    return publicAPI.distanceEvent(distance);
+  };
+
+  publicAPI.getDistanceStep = function () {
+    // Find default distanceStep from image spacing
+    // This only works if the mapper in the actor already has an ImageData
+    if (!model.distanceStep) {
+      var _model$cprActor3, _model$cprActor3$getM, _model$cprActor3$getM2, _model$cprActor3$getM3;
+
+      var imageSpacing = (_model$cprActor3 = model.cprActor) === null || _model$cprActor3 === void 0 ? void 0 : (_model$cprActor3$getM = _model$cprActor3.getMapper()) === null || _model$cprActor3$getM === void 0 ? void 0 : (_model$cprActor3$getM2 = _model$cprActor3$getM.getInputData(0)) === null || _model$cprActor3$getM2 === void 0 ? void 0 : (_model$cprActor3$getM3 = _model$cprActor3$getM2.getSpacing) === null || _model$cprActor3$getM3 === void 0 ? void 0 : _model$cprActor3$getM3.call(_model$cprActor3$getM2);
+
+      if (imageSpacing) {
+        return Math.min.apply(Math, _toConsumableArray(imageSpacing));
+      }
+    }
+
+    return model.distanceStep;
+  };
+} // ----------------------------------------------------------------------------
+// Object factory
+// ----------------------------------------------------------------------------
+// currentDistance is the distance from the first point of the centerline
+// cprActor.getMapper() should be a vtkImageCPRMapper
+
+
+function defaultValues(initialValues) {
+  return _objectSpread({
+    distanceStep: 0,
+    currentDistance: 0,
+    cprActor: null
+  }, initialValues);
+} // ----------------------------------------------------------------------------
+
+
+function extend(publicAPI, model) {
+  var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  vtkAbstractManipulator.extend(publicAPI, model, defaultValues(initialValues));
+  macro.setGet(publicAPI, model, ['distance', 'currentDistance', 'cprActor']);
+  macro.set(publicAPI, model, ['distanceStep']);
+  vtkCPRManipulator(publicAPI, model);
+} // ----------------------------------------------------------------------------
+
+var newInstance = macro.newInstance(extend, 'vtkCPRManipulator'); // ----------------------------------------------------------------------------
+
+var index = {
+  intersectDisplayWithPlane: intersectDisplayWithPlane,
+  extend: extend,
+  newInstance: newInstance
+};
+
+export { index as default, extend, intersectDisplayWithPlane, newInstance };

package/Widgets/Manipulators/LineManipulator.js

@@ -29,7 +29,9 @@ function vtkLineManipulator(publicAPI, model) {
   model.classHierarchy.push('vtkLineManipulator');
 
   publicAPI.handleEvent = function (callData, glRenderWindow) {
-    return projectDisplayToLine(callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer, glRenderWindow);
+    return {
+      worldCoords: projectDisplayToLine(callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer, glRenderWindow)
+    };
   };
 } // ----------------------------------------------------------------------------
 // Object factory

package/Widgets/Manipulators/PlaneManipulator.js

@@ -19,7 +19,9 @@ function vtkPlaneManipulator(publicAPI, model) {
   model.classHierarchy.push('vtkPlaneManipulator');
 
   publicAPI.handleEvent = function (callData, glRenderWindow) {
-    return intersectDisplayWithPlane(callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer, glRenderWindow);
+    return {
+      worldCoords: intersectDisplayWithPlane(callData.position.x, callData.position.y, publicAPI.getOrigin(callData), publicAPI.getNormal(callData), callData.pokedRenderer, glRenderWindow)
+    };
   };
 } // ----------------------------------------------------------------------------
 // Object factory

package/Widgets/Manipulators/TrackballManipulator.js

@@ -39,7 +39,9 @@ function vtkTrackballManipulator(publicAPI, model) {
     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;
+    return {
+      worldCoords: newDirection
+    };
   };
 
   publicAPI.reset = function (callData) {

package/Widgets/Widgets3D/AngleWidget/behavior.js

@@ -37,7 +37,9 @@ function widgetBehavior(publicAPI, model) {
     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 (model.activeState === model.widgetState.getMoveHandle() && model.widgetState.getHandleList().length < MAX_POINTS && manipulator) {
-      var worldCoords = manipulator.handleEvent(e, model._apiSpecificRenderWindow); // Commit handle to location
+      var _manipulator$handleEv = manipulator.handleEvent(e, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords; // Commit handle to location
+
 
       var moveHandle = model.widgetState.getMoveHandle();
       moveHandle.setOrigin.apply(moveHandle, _toConsumableArray(worldCoords));
@@ -67,7 +69,8 @@ function widgetBehavior(publicAPI, model) {
     var manipulator = (_model$activeState$ge3 = (_model$activeState2 = model.activeState) === null || _model$activeState2 === void 0 ? void 0 : (_model$activeState2$g = _model$activeState2.getManipulator) === null || _model$activeState2$g === void 0 ? void 0 : _model$activeState2$g.call(_model$activeState2)) !== null && _model$activeState$ge3 !== void 0 ? _model$activeState$ge3 : model.manipulator;
 
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv2 = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv2.worldCoords;
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
       ) {

package/Widgets/Widgets3D/DistanceWidget/behavior.js

@@ -32,7 +32,9 @@ function widgetBehavior(publicAPI, model) {
     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 (model.activeState === model.widgetState.getMoveHandle() && model.widgetState.getHandleList().length < MAX_POINTS && manipulator) {
-      var worldCoords = manipulator.handleEvent(e, model._apiSpecificRenderWindow); // Commit handle to location
+      var _manipulator$handleEv = manipulator.handleEvent(e, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords; // Commit handle to location
+
 
       var moveHandle = model.widgetState.getMoveHandle();
       moveHandle.setOrigin.apply(moveHandle, _toConsumableArray(worldCoords));
@@ -62,7 +64,8 @@ function widgetBehavior(publicAPI, model) {
     var manipulator = (_model$activeState$ge3 = (_model$activeState2 = model.activeState) === null || _model$activeState2 === void 0 ? void 0 : (_model$activeState2$g = _model$activeState2.getManipulator) === null || _model$activeState2$g === void 0 ? void 0 : _model$activeState2$g.call(_model$activeState2)) !== null && _model$activeState$ge3 !== void 0 ? _model$activeState$ge3 : model.manipulator;
 
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv2 = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv2.worldCoords;
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
       ) {

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -65,7 +65,7 @@ function widgetBehavior(publicAPI, model) {
 
         if (type === 'corners') {
           // manipulator should be a plane manipulator
-          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
 
         if (type === 'faces') {
@@ -78,7 +78,7 @@ function widgetBehavior(publicAPI, model) {
 
           manipulator.setHandleOrigin(transformVec3(center, indexToWorldT));
           manipulator.setHandleNormal(rotateVec3(constraintAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
 
         if (type === 'edges') {
@@ -87,7 +87,7 @@ function widgetBehavior(publicAPI, model) {
             return a === 1 ? a : 0;
           });
           manipulator.setHandleNormal(rotateVec3(edgeAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
 
         if (worldCoords.length) {

package/Widgets/Widgets3D/ImplicitPlaneWidget.js

@@ -106,7 +106,9 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.updateFromOrigin = function (callData) {
     model.planeManipulator.setWidgetNormal(model.widgetState.getNormal());
-    var worldCoords = model.planeManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+
+    var _model$planeManipulat = model.planeManipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+        worldCoords = _model$planeManipulat.worldCoords;
 
     if (model.widgetState.containsPoint(worldCoords)) {
       model.activeState.setOrigin(worldCoords);

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -43,7 +43,9 @@ function widgetBehavior(publicAPI, model) {
     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 (model.activeState === model.widgetState.getMoveHandle() && manipulator) {
-      var worldCoords = manipulator.handleEvent(e, model._apiSpecificRenderWindow); // Commit handle to location
+      var _manipulator$handleEv = manipulator.handleEvent(e, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords; // Commit handle to location
+
 
       var moveHandle = model.widgetState.getMoveHandle();
       moveHandle.setOrigin(worldCoords);
@@ -100,7 +102,8 @@ function widgetBehavior(publicAPI, model) {
     var manipulator = (_model$activeState$ge3 = (_model$activeState2 = model.activeState) === null || _model$activeState2 === void 0 ? void 0 : (_model$activeState2$g = _model$activeState2.getManipulator) === null || _model$activeState2$g === void 0 ? void 0 : _model$activeState2$g.call(_model$activeState2)) !== null && _model$activeState$ge3 !== void 0 ? _model$activeState$ge3 : model.manipulator;
 
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv2 = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv2.worldCoords;
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging)) {
         model.activeState.setOrigin(worldCoords);

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -57,7 +57,7 @@ function widgetBehavior(publicAPI, model) {
 
     model._isDragging = true;
     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;
-    model.previousPosition = _toConsumableArray(manipulator.handleEvent(callData, model._apiSpecificRenderWindow));
+    model.previousPosition = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
 
     model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -203,7 +203,9 @@ function widgetBehavior(publicAPI, model) {
     var manipulator = (_model$activeState$ge3 = (_model$activeState2 = model.activeState) === null || _model$activeState2 === void 0 ? void 0 : (_model$activeState2$g = _model$activeState2.getManipulator) === null || _model$activeState2$g === void 0 ? void 0 : _model$activeState2$g.call(_model$activeState2)) !== null && _model$activeState$ge3 !== void 0 ? _model$activeState$ge3 : model.manipulator;
 
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords;
+
       var translation = model.previousPosition ? subtract(worldCoords, model.previousPosition, []) : [0, 0, 0];
       model.previousPosition = worldCoords;
 

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -52,7 +52,8 @@ function widgetBehavior(publicAPI, model) {
 
       (_model$activeState4 = model.activeState).setDirection.apply(_model$activeState4, _toConsumableArray(normal));
 
-      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords;
 
       if (worldCoords.length) {
         var _model$widgetState, _model$activeState5;

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -26,7 +26,8 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var _manipulator$handleEv = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+        worldCoords = _manipulator$handleEv.worldCoords;
 
     if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
     ) {

package/Widgets/Widgets3D/ResliceCursorWidget/Constants.js

@@ -12,7 +12,8 @@ var ScrollingMethods = {
 var InteractionMethodsName = {
   TranslateAxis: 'translateAxis',
   RotateLine: 'rotateLine',
-  TranslateCenter: 'translateCenter'
+  TranslateCenter: 'translateCenter',
+  TranslateCenterAndUpdatePlanes: 'translateCenterAndUpdatePlanes'
 };
 var defaultViewUpFromViewType = (_defaultViewUpFromVie = {}, _defineProperty(_defaultViewUpFromVie, ViewTypes.YZ_PLANE, [0, 0, 1]), _defineProperty(_defaultViewUpFromVie, ViewTypes.XZ_PLANE, [0, 0, 1]), _defineProperty(_defaultViewUpFromVie, ViewTypes.XY_PLANE, [0, -1, 0]), _defaultViewUpFromVie);
 var xyzToViewType = [ViewTypes.YZ_PLANE, ViewTypes.XZ_PLANE, ViewTypes.XY_PLANE];

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -2,10 +2,9 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../../macros.js';
 import vtkBoundingBox from '../../../Common/DataModel/BoundingBox.js';
 import vtkLine from '../../../Common/DataModel/Line.js';
-import vtkPlanePointManipulator from '../../Manipulators/PlaneManipulator.js';
-import { k as add, l as normalize, d as dot, j as cross, s as subtract, m as multiplyAccumulate, w as multiplyScalar, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
-import { getOtherLineName, updateState, boundPointOnPlane, getLinePlaneName, getLineInPlaneName, rotateVector } from './helpers.js';
-import { InteractionMethodsName, lineNames, ScrollingMethods, planeNameToViewType } from './Constants.js';
+import { k as add, l as normalize, s as subtract, d as dot, j as cross, m as multiplyAccumulate, w as multiplyScalar, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
+import { getLineNames, getOtherLineName, updateState, boundPointOnPlane, getLinePlaneName, getLineInPlaneName, rotateVector } from './helpers.js';
+import { InteractionMethodsName, ScrollingMethods, planeNameToViewType } from './Constants.js';
 
 function widgetBehavior(publicAPI, model) {
   model._isDragging = false;
@@ -46,7 +45,7 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.getActiveLineName = function () {
-    return lineNames.find(function (lineName) {
+    return getLineNames(model.widgetState).find(function (lineName) {
       return model.widgetState.getStatesWithLabel(lineName).includes(model.activeState);
     });
   }; // FIXME: label information should be accessible from activeState instead of parent state.
@@ -67,19 +66,27 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.getOtherLineHandle = function (lineName) {
     var _model$widgetState$2, _model$widgetState2;
 
-    return (_model$widgetState$2 = (_model$widgetState2 = model.widgetState)["getAxis".concat(getOtherLineName(lineName))]) === null || _model$widgetState$2 === void 0 ? void 0 : _model$widgetState$2.call(_model$widgetState2);
+    return (_model$widgetState$2 = (_model$widgetState2 = model.widgetState)["getAxis".concat(getOtherLineName(model.widgetState, lineName))]) === null || _model$widgetState$2 === void 0 ? void 0 : _model$widgetState$2.call(_model$widgetState2);
   }; // FIXME: label information should be accessible from activeState instead of parent state.
 
   /**
    * There are 2 rotation handles per axis: 'point0' and 'point1'.
    * This function returns which rotation handle (point0 or point1) is currently active.
    * ActiveState must be a RotationHandle.
-   * @returns 'point0' or 'point1'
+   * @returns 'point0', 'point1' or null if no point is active (e.g. line is being rotated)
    */
 
 
   publicAPI.getActiveRotationPointName = function () {
-    return model.widgetState.getStatesWithLabel('point0').includes(model.activeState) ? 'point0' : 'point1';
+    if (model.widgetState.getStatesWithLabel('point0').includes(model.activeState)) {
+      return 'point0';
+    }
+
+    if (model.widgetState.getStatesWithLabel('point1').includes(model.activeState)) {
+      return 'point1';
+    }
+
+    return null;
   };
 
   publicAPI.startScrolling = function (newPosition) {
@@ -122,12 +129,18 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonPress = function (callData) {
     if (model.activeState && model.activeState.getActive()) {
+      var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
       model._isDragging = true;
       var viewType = model.viewType;
       var currentPlaneNormal = model.widgetState.getPlanes()[viewType].normal;
-      model.planeManipulator.setWidgetOrigin(model.widgetState.getCenter());
-      model.planeManipulator.setWidgetNormal(currentPlaneNormal);
-      var worldCoords = model.planeManipulator.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;
+      manipulator.setWidgetOrigin(model.widgetState.getCenter());
+      manipulator.setWidgetNormal(currentPlaneNormal);
+
+      var _manipulator$handleEv = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv.worldCoords;
+
       previousPosition = worldCoords;
       publicAPI.startInteraction();
     } else if (model.widgetState.getScrollingMethod() === ScrollingMethods.LEFT_MOUSE_BUTTON) {
@@ -261,6 +274,8 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI[InteractionMethodsName.TranslateAxis] = function (calldata) {
+    var _model$activeState$ge3, _model$activeState2, _model$activeState2$g, _model$activeState3, _model$activeState3$g;
+
     var lineHandle = publicAPI.getActiveLineHandle();
     var lineName = publicAPI.getActiveLineName();
     var pointOnLine = add(lineHandle.getOrigin(), lineHandle.getDirection(), []);
@@ -268,25 +283,37 @@ function widgetBehavior(publicAPI, model) {
     normalize(currentLineVector); // Translate the current line along the other line
 
     var otherLineHandle = publicAPI.getOtherLineHandle(lineName);
-    var otherLineVector = otherLineHandle.getDirection();
-    normalize(otherLineVector);
-    var axisTranslation = otherLineVector;
-    var dot$1 = dot(currentLineVector, otherLineVector); // lines are colinear, translate along perpendicular axis from current line
+    var center = model.widgetState.getCenter();
+    var manipulator = (_model$activeState$ge3 = (_model$activeState2 = model.activeState) === null || _model$activeState2 === void 0 ? void 0 : (_model$activeState2$g = _model$activeState2.getManipulator) === null || _model$activeState2$g === void 0 ? void 0 : _model$activeState2$g.call(_model$activeState2)) !== null && _model$activeState$ge3 !== void 0 ? _model$activeState$ge3 : model.manipulator;
+    var worldCoords = null;
+    var newOrigin = [];
+
+    if ((_model$activeState3 = model.activeState) !== null && _model$activeState3 !== void 0 && (_model$activeState3$g = _model$activeState3.getManipulator) !== null && _model$activeState3$g !== void 0 && _model$activeState3$g.call(_model$activeState3)) {
+      worldCoords = manipulator.handleEvent(calldata, model._apiSpecificRenderWindow).worldCoords;
+      var translation = subtract(worldCoords, previousPosition, []);
+      add(center, translation, newOrigin);
+    } else if (otherLineHandle) {
+      var otherLineVector = otherLineHandle.getDirection();
+      normalize(otherLineVector);
+      var axisTranslation = otherLineVector;
+      var dot$1 = dot(currentLineVector, otherLineVector); // lines are colinear, translate along perpendicular axis from current line
+
+      if (dot$1 === 1 || dot$1 === -1) {
+        cross(currentLineVector, manipulator.getWidgetNormal(), axisTranslation);
+      }
 
-    if (dot$1 === 1 || dot$1 === -1) {
-      cross(currentLineVector, model.planeManipulator.getWidgetNormal(), axisTranslation);
+      var closestPoint = [];
+      worldCoords = manipulator.handleEvent(calldata, model._apiSpecificRenderWindow).worldCoords;
+      vtkLine.distanceToLine(worldCoords, lineHandle.getOrigin(), pointOnLine, closestPoint);
+      var translationVector = subtract(worldCoords, closestPoint, []);
+      var translationDistance = dot(translationVector, axisTranslation);
+      newOrigin = multiplyAccumulate(center, axisTranslation, translationDistance, newOrigin);
     }
 
-    var closestPoint = [];
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
-    vtkLine.distanceToLine(worldCoords, lineHandle.getOrigin(), pointOnLine, closestPoint);
-    var translationVector = subtract(worldCoords, closestPoint, []);
-    var translationDistance = dot(translationVector, axisTranslation);
-    var center = model.widgetState.getCenter();
-    var newOrigin = multiplyAccumulate(center, axisTranslation, translationDistance, [0, 0, 0]);
     newOrigin = publicAPI.getBoundedCenter(newOrigin);
     model.widgetState.setCenter(newOrigin);
     updateState(model.widgetState, model._factory.getScaleInPixels(), model._factory.getRotationHandlePosition());
+    previousPosition = worldCoords;
   };
 
   publicAPI.getBoundedCenter = function (newCenter) {
@@ -301,7 +328,13 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI[InteractionMethodsName.TranslateCenter] = function (calldata) {
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
+    var _model$activeState$ge4, _model$activeState4, _model$activeState4$g;
+
+    var manipulator = (_model$activeState$ge4 = (_model$activeState4 = model.activeState) === null || _model$activeState4 === void 0 ? void 0 : (_model$activeState4$g = _model$activeState4.getManipulator) === null || _model$activeState4$g === void 0 ? void 0 : _model$activeState4$g.call(_model$activeState4)) !== null && _model$activeState$ge4 !== void 0 ? _model$activeState$ge4 : model.manipulator;
+
+    var _manipulator$handleEv2 = manipulator.handleEvent(calldata, model._apiSpecificRenderWindow),
+        worldCoords = _manipulator$handleEv2.worldCoords;
+
     var translation = subtract(worldCoords, previousPosition, []);
     previousPosition = worldCoords;
     var newCenter = add(model.widgetState.getCenter(), translation, []);
@@ -311,20 +344,27 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI[InteractionMethodsName.RotateLine] = function (calldata) {
+    var _model$activeState$ge5, _model$activeState5, _model$activeState5$g;
+
     var activeLineHandle = publicAPI.getActiveLineHandle();
-    var planeNormal = model.planeManipulator.getWidgetNormal();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
+    var manipulator = (_model$activeState$ge5 = (_model$activeState5 = model.activeState) === null || _model$activeState5 === void 0 ? void 0 : (_model$activeState5$g = _model$activeState5.getManipulator) === null || _model$activeState5$g === void 0 ? void 0 : _model$activeState5$g.call(_model$activeState5)) !== null && _model$activeState$ge5 !== void 0 ? _model$activeState$ge5 : model.manipulator;
+    var planeNormal = manipulator.getWidgetNormal();
+
+    var _manipulator$handleEv3 = manipulator.handleEvent(calldata, model._apiSpecificRenderWindow),
+        worldCoords = _manipulator$handleEv3.worldCoords;
+
     var center = model.widgetState.getCenter();
+    var currentVectorToOrigin = [0, 0, 0];
+    subtract(worldCoords, center, currentVectorToOrigin);
+    normalize(currentVectorToOrigin);
     var previousLineDirection = activeLineHandle.getDirection();
     normalize(previousLineDirection);
+    var activePointName = publicAPI.getActiveRotationPointName();
 
-    if (publicAPI.getActiveRotationPointName() === 'point1') {
+    if (activePointName === 'point1' || !activePointName && dot(currentVectorToOrigin, previousLineDirection) < 0) {
       multiplyScalar(previousLineDirection, -1);
     }
 
-    var currentVectorToOrigin = [0, 0, 0];
-    subtract(worldCoords, center, currentVectorToOrigin);
-    normalize(currentVectorToOrigin);
     var radianAngle = signedAngleBetweenVectors(previousLineDirection, currentVectorToOrigin, planeNormal);
     publicAPI.rotateLineInView(publicAPI.getActiveLineName(), radianAngle);
   };
@@ -342,7 +382,7 @@ function widgetBehavior(publicAPI, model) {
     publicAPI.rotatePlane(viewType, radianAngle, planeNormal);
 
     if (publicAPI.getKeepOrthogonality()) {
-      var otherLineName = getOtherLineName(lineName);
+      var otherLineName = getOtherLineName(model.widgetState, lineName);
       var otherPlaneName = getLinePlaneName(otherLineName);
       publicAPI.rotatePlane(planeNameToViewType[otherPlaneName], radianAngle, planeNormal);
     }
@@ -371,8 +411,6 @@ function widgetBehavior(publicAPI, model) {
   // initialization
   // --------------------------------------------------------------------------
 
-
-  model.planeManipulator = vtkPlanePointManipulator.newInstance();
 }
 
 export { widgetBehavior as default };