@kitware/vtk.js 25.10.0 → 26.0.0-beta.2

package/Widgets/Representations.js

@@ -2,11 +2,14 @@ import vtkCircleContextRepresentation from './Representations/CircleContextRepre
 import vtkContextRepresentation from './Representations/ContextRepresentation.js';
 import vtkConvexFaceContextRepresentation from './Representations/ConvexFaceContextRepresentation.js';
 import vtkCubeHandleRepresentation from './Representations/CubeHandleRepresentation.js';
+import vtkGlyphRepresentation from './Representations/GlyphRepresentation.js';
 import vtkHandleRepresentation from './Representations/HandleRepresentation.js';
 import vtkImplicitPlaneRepresentation from './Representations/ImplicitPlaneRepresentation.js';
+import vtkLineHandleRepresentation from './Representations/LineHandleRepresentation.js';
 import vtkOutlineContextRepresentation from './Representations/OutlineContextRepresentation.js';
 import vtkPolyLineRepresentation from './Representations/PolyLineRepresentation.js';
 import vtkSphereHandleRepresentation from './Representations/SphereHandleRepresentation.js';
+import vtkSplineContextRepresentation from './Representations/SplineContextRepresentation.js';
 import vtkWidgetRepresentation from './Representations/WidgetRepresentation.js';
 
 var Representations = {
@@ -14,11 +17,14 @@ var Representations = {
   vtkContextRepresentation: vtkContextRepresentation,
   vtkConvexFaceContextRepresentation: vtkConvexFaceContextRepresentation,
   vtkCubeHandleRepresentation: vtkCubeHandleRepresentation,
+  vtkGlyphRepresentation: vtkGlyphRepresentation,
   vtkHandleRepresentation: vtkHandleRepresentation,
   vtkImplicitPlaneRepresentation: vtkImplicitPlaneRepresentation,
+  vtkLineHandleRepresentation: vtkLineHandleRepresentation,
   vtkOutlineContextRepresentation: vtkOutlineContextRepresentation,
   vtkPolyLineRepresentation: vtkPolyLineRepresentation,
   vtkSphereHandleRepresentation: vtkSphereHandleRepresentation,
+  vtkSplineContextRepresentation: vtkSplineContextRepresentation,
   vtkWidgetRepresentation: vtkWidgetRepresentation
 };
 

package/Widgets/Widgets3D/AngleWidget.js

@@ -32,10 +32,7 @@ function vtkAngleWidget(publicAPI, model) {
       default:
         return [{
           builder: vtkSphereHandleRepresentation,
-          labels: ['handles']
-        }, {
-          builder: vtkSphereHandleRepresentation,
-          labels: ['moveHandle']
+          labels: ['handles', 'moveHandle']
         }, {
           builder: vtkPolyLineRepresentation,
           labels: ['handles', 'moveHandle']

package/Widgets/Widgets3D/EllipseWidget/state.js

@@ -23,7 +23,7 @@ function generateState() {
     mixins: ['origin', 'color', 'scale3', 'visible', 'orientation'],
     name: 'ellipseHandle',
     initialValues: {
-      visible: false,
+      // visible: false,
       scale3: [1, 1, 1]
     }
   }) // FIXME: How to not duplicate with RectangleWidget

package/Widgets/Widgets3D/EllipseWidget.js

@@ -5,7 +5,6 @@ import vtkCircleContextRepresentation from '../Representations/CircleContextRepr
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkShapeWidget from './ShapeWidget.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './EllipseWidget/behavior.js';
 import generateState from './EllipseWidget/state.js';
 import { BehaviorCategory, ShapeBehavior } from './ShapeWidget/Constants.js';
@@ -35,12 +34,6 @@ function vtkEllipseWidget(publicAPI, model) {
         }, {
           builder: vtkCircleContextRepresentation,
           labels: ['ellipseHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            text: ''
-          },
-          labels: ['SVGtext']
         }];
     }
   }; // --------------------------------------------------------------------------

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -1,9 +1,5 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../../macros.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 widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkLabelWidgetProp');
   model._isDragging = false; // --------------------------------------------------------------------------
@@ -12,9 +8,6 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.setText = function (text) {
     model.widgetState.getText().setText(text);
-    model.representations[1].setCircleProps(_objectSpread(_objectSpread({}, model.representations[1].getCircleProps()), {}, {
-      visible: !text
-    }));
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/LabelWidget.js

@@ -2,11 +2,9 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import widgetBehavior from './LabelWidget/behavior.js';
 import generateState from './LabelWidget/state.js';
-import { VerticalTextAlignment } from '../SVG/SVGLandmarkRepresentation/Constants.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; }
@@ -21,7 +19,7 @@ function vtkLabelWidget(publicAPI, model) {
   var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
 
 
-  model.methodsToLink = ['textProps', 'fontProperties', 'strokeFontProperties', 'scaleInPixels'];
+  model.methodsToLink = ['scaleInPixels'];
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
@@ -33,21 +31,6 @@ function vtkLabelWidget(publicAPI, model) {
         return [{
           builder: vtkSphereHandleRepresentation,
           labels: ['moveHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            circleProps: {
-              visible: true
-            },
-            textProps: {
-              'text-anchor': 'middle',
-              verticalAlign: VerticalTextAlignment.MIDDLE
-            },
-            strokeFontProperties: {
-              fontStyle: 'bold'
-            }
-          },
-          labels: ['SVGtext']
         }];
     }
   }; // --- Public methods -------------------------------------------------------

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -1,13 +1,9 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import Constants from './Constants.js';
 import macro from '../../../macros.js';
 import { s as subtract, l as add, m as normalize } from '../../../Common/Core/Math/index.js';
 import { getNumberOfPlacedHandles, isHandlePlaced, calculateTextPosition, updateTextPosition, getPoint } from './helpers.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; }
 var ShapeType = Constants.ShapeType; // Total number of points to place
 
 var MAX_POINTS = 2;
@@ -70,44 +66,6 @@ function widgetBehavior(publicAPI, model) {
   // Text methods
   // --------------------------------------------------------------------------
 
-  /**
-   * check for handle 2 position in comparison to handle 1 position
-   * and sets text offset to not overlap on the line representation
-   */
-
-
-  function getOffsetDirectionForTextPosition() {
-    var pos1 = publicAPI.getHandle(0).getOrigin();
-    var pos2 = publicAPI.getHandle(1).getOrigin();
-    var dySign = 1;
-
-    if (pos1 && pos2) {
-      if (pos1[0] <= pos2[0]) {
-        dySign = pos1[1] <= pos2[1] ? 1 : -1;
-      } else {
-        dySign = pos1[1] <= pos2[1] ? -1 : 1;
-      }
-    }
-
-    return dySign;
-  }
-  /**
-   * place SVGText on line according to both handle positions
-   * which purpose is to never have text representation overlapping
-   * on PolyLine representation
-   * */
-
-
-  publicAPI.placeText = function () {
-    var dySign = getOffsetDirectionForTextPosition();
-
-    var textPropsCp = _objectSpread({}, model.representations[3].getTextProps());
-
-    textPropsCp.dy = dySign * Math.abs(textPropsCp.dy);
-    model.representations[3].setTextProps(textPropsCp);
-
-    model._interactor.render();
-  };
 
   publicAPI.setText = function (text) {
     model.widgetState.getText().setText(text);
@@ -211,7 +169,6 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (handleIndex === 1) {
-      publicAPI.placeText();
       publicAPI.loseFocus();
     }
   }; // --------------------------------------------------------------------------
@@ -289,7 +246,6 @@ function widgetBehavior(publicAPI, model) {
     if (model._isDragging && publicAPI.isPlaced()) {
       var wasTextActive = model.widgetState.getText().getActive(); // Recompute offsets
 
-      publicAPI.placeText();
       model.widgetState.deactivate();
       model.activeState = null;
 

package/Widgets/Widgets3D/LineWidget.js

@@ -5,7 +5,6 @@ import generateState from './LineWidget/state.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkArrowHandleRepresentation from '../Representations/ArrowHandleRepresentation.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import vtkPolyLineRepresentation from '../Representations/PolyLineRepresentation.js';
 import widgetBehavior from './LineWidget/behavior.js';
 import { Behavior } from '../Representations/WidgetRepresentation/Constants.js';
@@ -107,16 +106,6 @@ function vtkLineWidget(publicAPI, model) {
               }
             }
           }
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            text: '',
-            textProps: {
-              dx: 12,
-              dy: -12
-            }
-          },
-          labels: ['SVGtext']
         }, {
           builder: vtkPolyLineRepresentation,
           labels: ['handle1', 'handle2', 'moveHandle'],

package/Widgets/Widgets3D/PolyLineWidget.js

@@ -4,7 +4,6 @@ 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 vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './PolyLineWidget/behavior.js';
 import generateState from './PolyLineWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
@@ -36,15 +35,6 @@ function vtkPolyLineWidget(publicAPI, model) {
         }, {
           builder: vtkSphereHandleRepresentation,
           labels: ['moveHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            textProps: {
-              dx: 12,
-              dy: -12
-            }
-          },
-          labels: ['handles']
         }, {
           builder: vtkPolyLineRepresentation,
           labels: ['handles', 'moveHandle']

package/Widgets/Widgets3D/RectangleWidget.js

@@ -5,7 +5,6 @@ import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkShapeWidget from './ShapeWidget.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
 import vtkRectangleContextRepresentation from '../Representations/RectangleContextRepresentation.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './RectangleWidget/behavior.js';
 import generateState from './RectangleWidget/state.js';
 import { BehaviorCategory, ShapeBehavior } from './ShapeWidget/Constants.js';
@@ -34,12 +33,6 @@ function vtkRectangleWidget(publicAPI, model) {
         }, {
           builder: vtkRectangleContextRepresentation,
           labels: ['rectangleHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            text: ''
-          },
-          labels: ['SVGtext']
         }];
     }
   }; // --------------------------------------------------------------------------

package/Widgets/Widgets3D/ResliceCursorWidget/Constants.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { ViewTypes } from '../../Core/WidgetManager/Constants.js';
 
-var _defaultViewUpFromVie, _viewTypeToXYZ;
+var _defaultViewUpFromVie, _viewTypeToXYZ, _viewTypeToPlaneName;
 var ScrollingMethods = {
   MIDDLE_MOUSE_BUTTON: 0,
   LEFT_MOUSE_BUTTON: 1,
@@ -17,11 +17,23 @@ var InteractionMethodsName = {
 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];
 var viewTypeToXYZ = (_viewTypeToXYZ = {}, _defineProperty(_viewTypeToXYZ, ViewTypes.YZ_PLANE, 0), _defineProperty(_viewTypeToXYZ, ViewTypes.XZ_PLANE, 1), _defineProperty(_viewTypeToXYZ, ViewTypes.XY_PLANE, 2), _viewTypeToXYZ);
+var planeNames = ['X', 'Y', 'Z'];
+var viewTypeToPlaneName = (_viewTypeToPlaneName = {}, _defineProperty(_viewTypeToPlaneName, ViewTypes.YZ_PLANE, 'X'), _defineProperty(_viewTypeToPlaneName, ViewTypes.XZ_PLANE, 'Y'), _defineProperty(_viewTypeToPlaneName, ViewTypes.XY_PLANE, 'Z'), _viewTypeToPlaneName);
+var planeNameToViewType = {
+  X: ViewTypes.YZ_PLANE,
+  Y: ViewTypes.XZ_PLANE,
+  Z: ViewTypes.XY_PLANE
+};
+var lineNames = ['YinX', 'ZinX', 'XinY', 'ZinY', 'XinZ', 'YinZ'];
 var Constants = {
   ScrollingMethods: ScrollingMethods,
   InteractionMethodsName: InteractionMethodsName,
   xyzToViewType: xyzToViewType,
-  viewTypeToXYZ: viewTypeToXYZ
+  viewTypeToXYZ: viewTypeToXYZ,
+  planeNames: planeNames,
+  viewTypeToPlaneName: viewTypeToPlaneName,
+  planeNameToViewType: planeNameToViewType,
+  lineNames: lineNames
 };
 
-export { InteractionMethodsName, ScrollingMethods, Constants as default, defaultViewUpFromViewType, viewTypeToXYZ, xyzToViewType };
+export { InteractionMethodsName, ScrollingMethods, Constants as default, defaultViewUpFromViewType, lineNames, planeNameToViewType, planeNames, viewTypeToPlaneName, viewTypeToXYZ, xyzToViewType };

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -3,16 +3,75 @@ 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 { s as subtract, m as normalize, d as dot, k as cross, o as multiplyAccumulate, x as multiplyScalar, T as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
-import { updateState, getAssociatedLinesName, boundPointOnPlane, rotateVector } from './helpers.js';
-import { InteractionMethodsName, ScrollingMethods } from './Constants.js';
+import { l as add, m as normalize, d as dot, k as cross, s as subtract, o as multiplyAccumulate, x as multiplyScalar, T 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';
 
 function widgetBehavior(publicAPI, model) {
   model._isDragging = false;
-  var isScrolling = false; // Reset "updateMethodName" attribute when no actors are selected
+  var isScrolling = false; // FIXME: label information should be accessible from activeState instead of parent state.
+
+  publicAPI.getActiveInteraction = function () {
+    if (model.widgetState.getStatesWithLabel('rotation').includes(model.activeState)) {
+      return InteractionMethodsName.RotateLine;
+    }
+
+    if (model.widgetState.getStatesWithLabel('line').includes(model.activeState)) {
+      return InteractionMethodsName.TranslateAxis;
+    }
+
+    if (model.widgetState.getStatesWithLabel('center').includes(model.activeState)) {
+      return InteractionMethodsName.TranslateCenter;
+    }
+
+    return null;
+  };
+  /**
+   * ActiveState can be RotationHandle or a LineHandle
+   * @returns 'YinX', 'ZinX', 'XinY', 'ZinY', 'XinZ' or 'YinZ'
+   */
+
+
+  publicAPI.getActiveLineName = function () {
+    return lineNames.find(function (lineName) {
+      return model.widgetState.getStatesWithLabel(lineName).includes(model.activeState);
+    });
+  }; // FIXME: label information should be accessible from activeState instead of parent state.
+
+
+  publicAPI.getActiveLineHandle = function () {
+    var _model$widgetState$, _model$widgetState;
+
+    return (_model$widgetState$ = (_model$widgetState = model.widgetState)["getAxis".concat(publicAPI.getActiveLineName())]) === null || _model$widgetState$ === void 0 ? void 0 : _model$widgetState$.call(_model$widgetState);
+  };
+  /**
+   * Return the line handle of the other line in the same view.
+   * @param {string} lineName name of the line (YinX, ZinX, XinY, ZinY, XinZ, YinZ)
+   * @returns ZinX if lineName == YinX, YinX if lineName == ZinX, ZinY if lineName == XinY...
+   */
+
+
+  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);
+  }; // 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'
+   */
+
+
+  publicAPI.getActiveRotationPointName = function () {
+    return model.widgetState.getStatesWithLabel('point0').includes(model.activeState) ? 'point0' : 'point1';
+  }; // Reset "updateMethodName" attribute when no actors are selected
   // Useful to update 'updateMethodeName' to the correct name which
   // will be TranslateCenter by default
 
+
   publicAPI.resetUpdateMethod = function () {
     if (model.representations.length !== 0) {
       model.representations[0].getSelectedState();
@@ -35,7 +94,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.updateCursor = function () {
-    switch (model.activeState.getUpdateMethodName()) {
+    switch (publicAPI.getActiveInteraction()) {
       case InteractionMethodsName.TranslateCenter:
         model._apiSpecificRenderWindow.setCursor('move');
 
@@ -61,7 +120,7 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleLeftButtonPress = function (callData) {
     if (model.activeState && model.activeState.getActive()) {
       model._isDragging = true;
-      var viewType = model.widgetState.getActiveViewType();
+      var viewType = model.viewType;
       var currentPlaneNormal = model.widgetState.getPlanes()[viewType].normal;
       model.planeManipulator.setWidgetOrigin(model.widgetState.getCenter());
       model.planeManipulator.setWidgetNormal(currentPlaneNormal);
@@ -145,7 +204,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleEvent = function (callData) {
     if (model.activeState.getActive()) {
-      publicAPI[model.activeState.getUpdateMethodName()](callData);
+      publicAPI[publicAPI.getActiveInteraction()](callData);
       publicAPI.invokeInternalInteractionEvent();
       return macro.EVENT_ABORT;
     }
@@ -154,7 +213,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.invokeInternalInteractionEvent = function () {
-    var methodName = model.activeState ? model.activeState.getUpdateMethodName() : '';
+    var methodName = publicAPI.getActiveInteraction();
     var computeFocalPointOffset = methodName !== InteractionMethodsName.RotateLine;
     var canUpdateFocalPoint = methodName === InteractionMethodsName.RotateLine;
     publicAPI.invokeInteractionEvent({
@@ -194,22 +253,20 @@ function widgetBehavior(publicAPI, model) {
     var newCenter = [oldCenter[0] + movingFactor * dirProj[0], oldCenter[1] + movingFactor * dirProj[1], oldCenter[2] + movingFactor * dirProj[2]];
     newCenter = publicAPI.getBoundedCenter(newCenter);
     model.widgetState.setCenter(newCenter);
-    updateState(model.widgetState);
+    updateState(model.widgetState, model._factory.getDisplayScaleParams(), model._factory.getRotationHandlePosition());
   };
 
   publicAPI[InteractionMethodsName.TranslateAxis] = function (calldata) {
-    var stateLine = model.widgetState.getActiveLineState();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
-    var point1 = stateLine.getPoint1();
-    var point2 = stateLine.getPoint2(); // Translate the current line along the other line
-
-    var otherLineName = getAssociatedLinesName(stateLine.getName());
-    var otherLine = model.widgetState["get".concat(otherLineName)]();
-    var otherLineVector = subtract(otherLine.getPoint2(), otherLine.getPoint1(), []);
+    var lineHandle = publicAPI.getActiveLineHandle();
+    var lineName = publicAPI.getActiveLineName();
+    var pointOnLine = add(lineHandle.getOrigin(), lineHandle.getDirection(), []);
+    var currentLineVector = lineHandle.getDirection();
+    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 currentLineVector = subtract(point2, point1, [0, 0, 0]);
-    normalize(currentLineVector);
     var dot$1 = dot(currentLineVector, otherLineVector); // lines are colinear, translate along perpendicular axis from current line
 
     if (dot$1 === 1 || dot$1 === -1) {
@@ -217,14 +274,15 @@ function widgetBehavior(publicAPI, model) {
     }
 
     var closestPoint = [];
-    vtkLine.distanceToLine(worldCoords, point1, point2, 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);
+    updateState(model.widgetState, model._factory.getDisplayScaleParams(), model._factory.getRotationHandlePosition());
   };
 
   publicAPI.getBoundedCenter = function (newCenter) {
@@ -241,19 +299,19 @@ function widgetBehavior(publicAPI, model) {
   publicAPI[InteractionMethodsName.TranslateCenter] = function (calldata) {
     var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     worldCoords = publicAPI.getBoundedCenter(worldCoords);
-    model.activeState.setCenter(worldCoords);
-    updateState(model.widgetState);
+    model.widgetState.setCenter(worldCoords);
+    updateState(model.widgetState, model._factory.getDisplayScaleParams(), model._factory.getRotationHandlePosition());
   };
 
   publicAPI[InteractionMethodsName.RotateLine] = function (calldata) {
-    var activeLine = model.widgetState.getActiveLineState();
+    var activeLineHandle = publicAPI.getActiveLineHandle();
     var planeNormal = model.planeManipulator.getWidgetNormal();
     var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var center = model.widgetState.getCenter();
-    var previousLineDirection = subtract(activeLine.getPoint1(), activeLine.getPoint2(), []);
+    var previousLineDirection = activeLineHandle.getDirection();
     normalize(previousLineDirection);
 
-    if (model.widgetState.getActiveRotationPointName() === 'point1') {
+    if (publicAPI.getActiveRotationPointName() === 'point0') {
       multiplyScalar(previousLineDirection, -1);
     }
 
@@ -261,29 +319,28 @@ function widgetBehavior(publicAPI, model) {
     subtract(worldCoords, center, currentVectorToOrigin);
     normalize(currentVectorToOrigin);
     var radianAngle = signedAngleBetweenVectors(previousLineDirection, currentVectorToOrigin, planeNormal);
-    publicAPI.rotateLineInView(activeLine, radianAngle);
+    publicAPI.rotateLineInView(publicAPI.getActiveLineName(), radianAngle);
   };
   /**
    * Rotate a line by a specified angle
-   * @param {Line} line The line to rotate (e.g. getActiveLineState())
+   * @param {string} lineName The line name to rotate (e.g. YinX, ZinX, XinY, ZinY, XinZ, YinZ)
    * @param {Number} radianAngle Applied angle in radian
    */
 
 
-  publicAPI.rotateLineInView = function (line, radianAngle) {
-    var viewType = line.getViewType();
-    var inViewType = line.getInViewType();
+  publicAPI.rotateLineInView = function (lineName, radianAngle) {
+    var viewType = planeNameToViewType[getLinePlaneName(lineName)];
+    var inViewType = planeNameToViewType[getLineInPlaneName(lineName)];
     var planeNormal = model.widgetState.getPlanes()[inViewType].normal;
     publicAPI.rotatePlane(viewType, radianAngle, planeNormal);
 
     if (model.widgetState.getKeepOrthogonality()) {
-      var associatedLineName = getAssociatedLinesName(line.getName());
-      var associatedLine = model.widgetState["get".concat(associatedLineName)]();
-      var associatedViewType = associatedLine.getViewType();
-      publicAPI.rotatePlane(associatedViewType, radianAngle, planeNormal);
+      var otherLineName = getOtherLineName(lineName);
+      var otherPlaneName = getLinePlaneName(otherLineName);
+      publicAPI.rotatePlane(planeNameToViewType[otherPlaneName], radianAngle, planeNormal);
     }
 
-    updateState(model.widgetState);
+    updateState(model.widgetState, model._factory.getDisplayScaleParams(), model._factory.getRotationHandlePosition());
   };
   /**
    * Rotate a specified plane around an other specified plane.