@kitware/vtk.js 19.8.0 → 20.0.3

package/Widgets/Widgets3D/EllipseWidget/state.js

@@ -1,4 +1,5 @@
 import vtkStateBuilder from '../../Core/StateBuilder.js';
+import { TextPosition } from '../ShapeWidget/Constants.js';
 
 function generateState() {
   return vtkStateBuilder.createBuilder().addStateFromMixin({
@@ -7,7 +8,7 @@ function generateState() {
     name: 'point1Handle',
     initialValues: {
       scale1: 10,
-      origin: [0, 0, 0],
+      origin: [undefined, undefined, undefined],
       visible: false
     }
   }).addStateFromMixin({
@@ -16,7 +17,7 @@ function generateState() {
     name: 'point2Handle',
     initialValues: {
       scale1: 10,
-      origin: [0, 0, 0],
+      origin: [undefined, undefined, undefined],
       visible: false
     }
   }).addStateFromMixin({
@@ -27,6 +28,25 @@ function generateState() {
       visible: false,
       scale3: [1, 1, 1]
     }
+  }) // FIXME: How to not duplicate with RectangleWidget
+  .addStateFromMixin({
+    labels: ['SVGtext'],
+    mixins: ['origin', 'color', 'text', 'visible'],
+    name: 'text',
+    initialValues: {
+      /* text is empty to set a text filed in the SVGLayer and to avoid
+       * displaying text before positioning the handles */
+      text: '',
+      visible: false,
+      origin: [0, 0, 0]
+    }
+  }) // FIXME: to move in text handle sub state
+  .addField({
+    name: 'textPosition',
+    initialValue: [TextPosition.CENTER, TextPosition.CENTER, TextPosition.CENTER]
+  }).addField({
+    name: 'textWorldMargin',
+    initialValue: 0
   }).build();
 }
 

package/Widgets/Widgets3D/EllipseWidget.js

@@ -1,17 +1,16 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
-import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
+import vtkCircleContextRepresentation from '../Representations/CircleContextRepresentation.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
+import vtkShapeWidget from './ShapeWidget.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import vtkCircleContextRepresentation from '../Representations/CircleContextRepresentation.js';
+import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './EllipseWidget/behavior.js';
 import generateState from './EllipseWidget/state.js';
-import vtkShapeWidget from './ShapeWidget.js';
 import { BehaviorCategory, ShapeBehavior } from './ShapeWidget/Constants.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
-var _None;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -21,7 +20,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function vtkEllipseWidget(publicAPI, model) {
   model.classHierarchy.push('vtkEllipseWidget'); // --- Widget Requirement ---------------------------------------------------
 
-  model.methodsToLink = ['activeScaleFactor', 'activeColor', 'useActiveColor', 'glyphResolution', 'defaultScale', 'drawBorder', 'drawFace', 'opacity'];
+  model.methodsToLink = [].concat(_toConsumableArray(model.methodsToLink), ['activeScaleFactor', 'activeColor', 'useActiveColor', 'glyphResolution', 'defaultScale', 'drawBorder', 'drawFace', 'opacity']);
   model.behavior = widgetBehavior;
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
@@ -33,10 +32,20 @@ function vtkEllipseWidget(publicAPI, model) {
       default:
         return [{
           builder: vtkSphereHandleRepresentation,
-          labels: ['moveHandle']
+          labels: ['moveHandle'],
+          initialValues: {
+            scaleInPixels: true
+          }
         }, {
           builder: vtkCircleContextRepresentation,
           labels: ['ellipseHandle']
+        }, {
+          builder: vtkSVGLandmarkRepresentation,
+          initialValues: {
+            showCircle: false,
+            text: ''
+          },
+          labels: ['SVGtext']
         }];
     }
   }; // --------------------------------------------------------------------------
@@ -47,26 +56,25 @@ function vtkEllipseWidget(publicAPI, model) {
 
   model.manipulator = vtkPlanePointManipulator.newInstance();
   model.widgetState = generateState();
-  model.shapeHandle = model.widgetState.getEllipseHandle();
-  model.point1Handle = model.widgetState.getPoint1Handle();
-  model.point2Handle = model.widgetState.getPoint2Handle();
-  model.point1Handle.setManipulator(model.manipulator);
-  model.point2Handle.setManipulator(model.manipulator);
 } // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  modifierBehavior: {
-    None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CENTER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None),
-    Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),
-    Control: _defineProperty({}, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER)
-  }
-}; // ----------------------------------------------------------------------------
+function defaultValues(initialValues) {
+  var _None;
+
+  return _objectSpread({
+    modifierBehavior: {
+      None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CENTER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None),
+      Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),
+      Control: _defineProperty({}, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER)
+    }
+  }, initialValues);
+} // ----------------------------------------------------------------------------
+
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, _objectSpread(_objectSpread({}, vtkShapeWidget.DEFAULT_VALUES), DEFAULT_VALUES), initialValues);
-  vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
+  vtkShapeWidget.extend(publicAPI, model, defaultValues(initialValues));
   macro.setGet(publicAPI, model, ['manipulator', 'widgetState']);
   vtkEllipseWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Widgets/Widgets3D/LineWidget.js

@@ -114,8 +114,11 @@ function vtkLineWidget(publicAPI, model) {
           initialValues: {
             showCircle: false,
             isVisible: false,
-            offsetText: true,
-            text: ''
+            text: '',
+            textProps: {
+              dx: 12,
+              dy: -12
+            }
           },
           labels: ['SVGtext']
         }, {

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -0,0 +1,107 @@
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import macro from '../../../macros.js';
+import { c as cross } from '../../../vendor/gl-matrix/esm/vec3.js';
+
+function widgetBehavior(publicAPI, model) {
+  publicAPI.handleLeftButtonPress = function (callData) {
+    if (!model.activeState || !model.activeState.getActive()) {
+      return macro.VOID;
+    }
+
+    model.painting = true;
+    var trailCircle = model.widgetState.addTrail();
+    trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
+    publicAPI.invokeStartInteractionEvent();
+    return macro.EVENT_ABORT;
+  };
+
+  publicAPI.handleMouseMove = function (callData) {
+    return publicAPI.handleEvent(callData);
+  };
+
+  publicAPI.handleLeftButtonRelease = function () {
+    if (model.painting) {
+      publicAPI.invokeEndInteractionEvent();
+      model.widgetState.clearTrailList();
+    }
+
+    model.painting = false;
+    return model.hasFocus ? macro.EVENT_ABORT : macro.VOID;
+  };
+
+  publicAPI.handleEvent = function (callData) {
+    if (model.manipulator && model.activeState && model.activeState.getActive()) {
+      var _model$activeState, _model$activeState2, _model$activeState3;
+
+      var normal = model.camera.getDirectionOfProjection();
+      var up = model.camera.getViewUp();
+      var right = [];
+      cross(right, up, normal);
+
+      (_model$activeState = model.activeState).setUp.apply(_model$activeState, _toConsumableArray(up));
+
+      (_model$activeState2 = model.activeState).setRight.apply(_model$activeState2, right);
+
+      (_model$activeState3 = model.activeState).setDirection.apply(_model$activeState3, _toConsumableArray(normal));
+
+      model.manipulator.setNormal(normal);
+      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+
+      if (worldCoords.length) {
+        var _model$widgetState, _model$activeState4;
+
+        (_model$widgetState = model.widgetState).setTrueOrigin.apply(_model$widgetState, _toConsumableArray(worldCoords));
+
+        (_model$activeState4 = model.activeState).setOrigin.apply(_model$activeState4, _toConsumableArray(worldCoords));
+
+        if (model.painting) {
+          var trailCircle = model.widgetState.addTrail();
+          trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
+        }
+      }
+
+      publicAPI.invokeInteractionEvent();
+      return macro.EVENT_ABORT;
+    }
+
+    return macro.VOID;
+  };
+
+  publicAPI.grabFocus = function () {
+    if (!model.hasFocus) {
+      model.activeState = model.widgetState.getHandle();
+      model.activeState.activate();
+      model.interactor.requestAnimation(publicAPI);
+      var canvas = model.apiSpecificRenderWindow.getCanvas();
+
+      canvas.onmouseenter = function () {
+        if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {
+          model.activeState.setVisible(true);
+        }
+      };
+
+      canvas.onmouseleave = function () {
+        if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {
+          model.activeState.setVisible(false);
+        }
+      };
+    }
+
+    model.hasFocus = true;
+  };
+
+  publicAPI.loseFocus = function () {
+    if (model.hasFocus) {
+      model.interactor.cancelAnimation(publicAPI);
+    }
+
+    model.widgetState.deactivate();
+    model.widgetState.getHandle().deactivate();
+    model.activeState = null;
+    model.hasFocus = false;
+  };
+
+  macro.get(publicAPI, model, ['painting']);
+}
+
+export { widgetBehavior as default };

package/Widgets/Widgets3D/PaintWidget/state.js

@@ -0,0 +1,29 @@
+import vtkStateBuilder from '../../Core/StateBuilder.js';
+
+function generateState(radius) {
+  return vtkStateBuilder.createBuilder().addField({
+    name: 'trueOrigin',
+    initialValue: [0, 0, 0]
+  }).addStateFromMixin({
+    labels: ['handle'],
+    mixins: ['origin', 'color', 'scale1', 'orientation', 'manipulator', 'visible'],
+    name: 'handle',
+    initialValues: {
+      scale1: radius * 2,
+      origin: [0, 0, 0],
+      orientation: [1, 0, 0, 0, 1, 0, 0, 0, 1],
+      visible: true
+    }
+  }).addDynamicMixinState({
+    labels: ['trail'],
+    mixins: ['origin', 'color', 'scale1', 'orientation'],
+    name: 'trail',
+    initialValues: {
+      scale1: radius * 2,
+      origin: [0, 0, 0],
+      orientation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+    }
+  }).build();
+}
+
+export { generateState as default };

package/Widgets/Widgets3D/PaintWidget.js

@@ -1,125 +1,20 @@
-import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkCircleContextRepresentation from '../Representations/CircleContextRepresentation.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import vtkStateBuilder from '../Core/StateBuilder.js';
+import widgetBehavior from './PaintWidget/behavior.js';
+import generateState from './PaintWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
-import { c as cross } from '../../vendor/gl-matrix/esm/vec3.js';
 
-// Widget linked to a view
-// ----------------------------------------------------------------------------
-
-function widgetBehavior(publicAPI, model) {
-  publicAPI.handleLeftButtonPress = function (callData) {
-    if (!model.activeState || !model.activeState.getActive()) {
-      return macro.VOID;
-    }
-
-    model.painting = true;
-    var trailCircle = model.widgetState.addTrail();
-    trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
-    publicAPI.invokeStartInteractionEvent();
-    return macro.EVENT_ABORT;
-  };
-
-  publicAPI.handleMouseMove = function (callData) {
-    return publicAPI.handleEvent(callData);
-  };
-
-  publicAPI.handleLeftButtonRelease = function () {
-    if (model.painting) {
-      publicAPI.invokeEndInteractionEvent();
-      model.widgetState.clearTrailList();
-    }
-
-    model.painting = false;
-    return model.hasFocus ? macro.EVENT_ABORT : macro.VOID;
-  };
-
-  publicAPI.handleEvent = function (callData) {
-    if (model.manipulator && model.activeState && model.activeState.getActive()) {
-      var _model$activeState, _model$activeState2, _model$activeState3;
-
-      var normal = model.camera.getDirectionOfProjection();
-      var up = model.camera.getViewUp();
-      var right = [];
-      cross(right, up, normal);
-
-      (_model$activeState = model.activeState).setUp.apply(_model$activeState, _toConsumableArray(up));
-
-      (_model$activeState2 = model.activeState).setRight.apply(_model$activeState2, right);
-
-      (_model$activeState3 = model.activeState).setDirection.apply(_model$activeState3, _toConsumableArray(normal));
-
-      model.manipulator.setNormal(normal);
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
-
-      if (worldCoords.length) {
-        var _model$widgetState, _model$activeState4;
-
-        (_model$widgetState = model.widgetState).setTrueOrigin.apply(_model$widgetState, _toConsumableArray(worldCoords));
-
-        (_model$activeState4 = model.activeState).setOrigin.apply(_model$activeState4, _toConsumableArray(worldCoords));
-
-        if (model.painting) {
-          var trailCircle = model.widgetState.addTrail();
-          trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
-        }
-      }
-
-      publicAPI.invokeInteractionEvent();
-      return macro.EVENT_ABORT;
-    }
-
-    return macro.VOID;
-  };
-
-  publicAPI.grabFocus = function () {
-    if (!model.hasFocus) {
-      model.activeState = model.widgetState.getHandle();
-      model.activeState.activate();
-      model.interactor.requestAnimation(publicAPI);
-      var canvas = model.apiSpecificRenderWindow.getCanvas();
-
-      canvas.onmouseenter = function () {
-        if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {
-          model.activeState.setVisible(true);
-        }
-      };
-
-      canvas.onmouseleave = function () {
-        if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {
-          model.activeState.setVisible(false);
-        }
-      };
-    }
-
-    model.hasFocus = true;
-  };
-
-  publicAPI.loseFocus = function () {
-    if (model.hasFocus) {
-      model.interactor.cancelAnimation(publicAPI);
-    }
-
-    model.widgetState.deactivate();
-    model.widgetState.getHandle().deactivate();
-    model.activeState = null;
-    model.hasFocus = false;
-  };
-
-  macro.get(publicAPI, model, ['painting']);
-} // ----------------------------------------------------------------------------
 // Factory
 // ----------------------------------------------------------------------------
 
-
 function vtkPaintWidget(publicAPI, model) {
   model.classHierarchy.push('vtkPaintWidget'); // --- Widget Requirement ---------------------------------------------------
 
   model.behavior = widgetBehavior;
+  model.widgetState = generateState(model.radius);
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
@@ -139,32 +34,8 @@ function vtkPaintWidget(publicAPI, model) {
         }];
     }
   }; // --- Widget Requirement ---------------------------------------------------
-  // Default state
-
-
-  model.widgetState = vtkStateBuilder.createBuilder().addField({
-    name: 'trueOrigin',
-    initialValue: [0, 0, 0]
-  }).addStateFromMixin({
-    labels: ['handle'],
-    mixins: ['origin', 'color', 'scale1', 'orientation', 'manipulator', 'visible'],
-    name: 'handle',
-    initialValues: {
-      scale1: model.radius * 2,
-      origin: [0, 0, 0],
-      orientation: [1, 0, 0, 0, 1, 0, 0, 0, 1],
-      visible: true
-    }
-  }).addDynamicMixinState({
-    labels: ['trail'],
-    mixins: ['origin', 'color', 'scale1', 'orientation'],
-    name: 'trail',
-    initialValues: {
-      scale1: model.radius * 2,
-      origin: [0, 0, 0],
-      orientation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-    }
-  }).build();
+
+
   var handle = model.widgetState.getHandle(); // Default manipulator
 
   model.manipulator = vtkPlanePointManipulator.newInstance();

package/Widgets/Widgets3D/PolyLineWidget.js

@@ -39,6 +39,12 @@ function vtkPolyLineWidget(publicAPI, model) {
           }
         }, {
           builder: vtkSVGLandmarkRepresentation,
+          initialValues: {
+            textProps: {
+              dx: 12,
+              dy: -12
+            }
+          },
           labels: ['handles']
         }, {
           builder: vtkPolyLineRepresentation,

package/Widgets/Widgets3D/RectangleWidget/behavior.js

@@ -5,7 +5,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function widgetBehavior(publicAPI, model) {
-  // We inherit shapeBehavior
+  model.shapeHandle = model.widgetState.getRectangleHandle();
+  model.point1Handle = model.widgetState.getPoint1Handle();
+  model.point2Handle = model.widgetState.getPoint2Handle();
+  model.point1Handle.setManipulator(model.manipulator);
+  model.point2Handle.setManipulator(model.manipulator); // We inherit shapeBehavior
+
   widgetBehavior$1(publicAPI, model);
 
   var superClass = _objectSpread({}, publicAPI);

package/Widgets/Widgets3D/RectangleWidget/state.js

@@ -1,4 +1,5 @@
 import vtkStateBuilder from '../../Core/StateBuilder.js';
+import { TextPosition } from '../ShapeWidget/Constants.js';
 
 function generateState() {
   return vtkStateBuilder.createBuilder().addStateFromMixin({
@@ -7,7 +8,7 @@ function generateState() {
     name: 'point1Handle',
     initialValues: {
       scale1: 10,
-      origin: [1, 0, 0],
+      origin: [undefined, undefined, undefined],
       visible: false
     }
   }).addStateFromMixin({
@@ -16,7 +17,7 @@ function generateState() {
     name: 'point2Handle',
     initialValues: {
       scale1: 10,
-      origin: [1, 0, 0],
+      origin: [undefined, undefined, undefined],
       visible: false
     }
   }).addStateFromMixin({
@@ -26,6 +27,25 @@ function generateState() {
     initialValues: {
       visible: false
     }
+  }) // FIXME: How to not duplicate with EllipseWidget
+  .addStateFromMixin({
+    labels: ['SVGtext'],
+    mixins: ['origin', 'color', 'text', 'visible'],
+    name: 'text',
+    initialValues: {
+      /* text is empty to set a text filed in the SVGLayer and to avoid
+       * displaying text before positioning the handles */
+      text: '',
+      visible: false,
+      origin: [0, 0, 0]
+    }
+  }) // FIXME: to move in text handle sub state
+  .addField({
+    name: 'textPosition',
+    initialValue: [TextPosition.CENTER, TextPosition.CENTER, TextPosition.CENTER]
+  }).addField({
+    name: 'textWorldMargin',
+    initialValue: 0
   }).build();
 }
 

package/Widgets/Widgets3D/RectangleWidget.js

@@ -1,17 +1,16 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
-import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 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 vtkShapeWidget from './ShapeWidget.js';
 import { BehaviorCategory, ShapeBehavior } from './ShapeWidget/Constants.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
-var _None;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -20,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function vtkRectangleWidget(publicAPI, model) {
   model.classHierarchy.push('vtkRectangleWidget');
-  model.methodsToLink = ['activeScaleFactor', 'activeColor', 'useActiveColor', 'drawBorder', 'drawFace', 'opacity']; // --- Widget Requirement ---------------------------------------------------
+  model.methodsToLink = [].concat(_toConsumableArray(model.methodsToLink), ['activeScaleFactor', 'activeColor', 'useActiveColor', 'drawBorder', 'drawFace', 'opacity']); // --- Widget Requirement ---------------------------------------------------
 
   model.behavior = widgetBehavior;
 
@@ -33,10 +32,20 @@ function vtkRectangleWidget(publicAPI, model) {
       default:
         return [{
           builder: vtkSphereHandleRepresentation,
-          labels: ['moveHandle']
+          labels: ['moveHandle'],
+          initialValues: {
+            scaleInPixels: true
+          }
         }, {
           builder: vtkRectangleContextRepresentation,
           labels: ['rectangleHandle']
+        }, {
+          builder: vtkSVGLandmarkRepresentation,
+          initialValues: {
+            showCircle: false,
+            text: ''
+          },
+          labels: ['SVGtext']
         }];
     }
   }; // --------------------------------------------------------------------------
@@ -47,26 +56,25 @@ function vtkRectangleWidget(publicAPI, model) {
 
   model.manipulator = vtkPlanePointManipulator.newInstance();
   model.widgetState = generateState();
-  model.shapeHandle = model.widgetState.getRectangleHandle();
-  model.point1Handle = model.widgetState.getPoint1Handle();
-  model.point2Handle = model.widgetState.getPoint2Handle();
-  model.point1Handle.setManipulator(model.manipulator);
-  model.point2Handle.setManipulator(model.manipulator);
 } // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  modifierBehavior: {
-    None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None),
-    Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),
-    Control: _defineProperty({}, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CENTER_TO_CORNER)
-  }
-}; // ----------------------------------------------------------------------------
+function defaultValues(initalValues) {
+  var _None;
+
+  return _objectSpread({
+    modifierBehavior: {
+      None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None),
+      Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),
+      Control: _defineProperty({}, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CENTER_TO_CORNER)
+    }
+  }, initalValues);
+} // ----------------------------------------------------------------------------
+
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, _objectSpread(_objectSpread({}, vtkShapeWidget.DEFAULT_VALUES), DEFAULT_VALUES), initialValues);
-  vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
+  vtkShapeWidget.extend(publicAPI, model, defaultValues(initialValues));
   macro.setGet(publicAPI, model, ['manipulator', 'widgetState']);
   vtkRectangleWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------