@kitware/vtk.js 24.0.1 → 24.1.0

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -59,7 +59,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -74,8 +75,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       model.manipulator.setOrigin(model.activeState.getOrigin());
-      model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -85,7 +86,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.hasFocus) {
-      model.widgetManager.disablePicking();
+      model._widgetManager.disablePicking();
     }
 
     return macro.VOID;
@@ -96,7 +97,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -108,7 +110,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -157,7 +160,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -37,19 +37,23 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.updateCursor = function () {
     switch (model.activeState.getUpdateMethodName()) {
       case InteractionMethodsName.TranslateCenter:
-        model.apiSpecificRenderWindow.setCursor('move');
+        model._apiSpecificRenderWindow.setCursor('move');
+
         break;
 
       case InteractionMethodsName.RotateLine:
-        model.apiSpecificRenderWindow.setCursor('alias');
+        model._apiSpecificRenderWindow.setCursor('alias');
+
         break;
 
       case InteractionMethodsName.TranslateAxis:
-        model.apiSpecificRenderWindow.setCursor('pointer');
+        model._apiSpecificRenderWindow.setCursor('pointer');
+
         break;
 
       default:
-        model.apiSpecificRenderWindow.setCursor('default');
+        model._apiSpecificRenderWindow.setCursor('default');
+
         break;
     }
   };
@@ -197,7 +201,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI[InteractionMethodsName.TranslateAxis] = function (calldata) {
     var stateLine = model.widgetState.getActiveLineState();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var point1 = stateLine.getPoint1();
     var point2 = stateLine.getPoint2(); // Translate the current line along the other line
 
@@ -237,7 +241,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI[InteractionMethodsName.TranslateCenter] = function (calldata) {
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     worldCoords = publicAPI.getBoundedCenter(worldCoords);
     model.activeState.setCenter(worldCoords);
     updateState(model.widgetState);
@@ -246,7 +250,7 @@ function widgetBehavior(publicAPI, model) {
   publicAPI[InteractionMethodsName.RotateLine] = function (calldata) {
     var activeLine = model.widgetState.getActiveLineState();
     var planeNormal = model.planeManipulator.getNormal();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var center = model.widgetState.getCenter();
     var previousLineDirection = subtract(activeLine.getPoint1(), activeLine.getPoint2(), []);
     normalize(previousLineDirection);

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -238,17 +238,19 @@ function widgetBehavior(publicAPI, model) {
   };
 
   var computeTextPosition = function computeTextPosition(worldBounds, textPosition) {
-    var _model$apiSpecificRen, _model$apiSpecificRen2, _model$apiSpecificRen5;
+    var _model$_apiSpecificRe, _model$_apiSpecificRe2, _model$_apiSpecificRe5;
 
     var worldMargin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     var viewPlaneOrigin = model.manipulator.getOrigin();
     var viewPlaneNormal = model.manipulator.getNormal();
-    var viewUp = model.renderer.getActiveCamera().getViewUp();
+
+    var viewUp = model._renderer.getActiveCamera().getViewUp();
+
     var positionMargin = Array.isArray(worldMargin) ? _toConsumableArray(worldMargin) : [worldMargin, worldMargin, viewPlaneOrigin ? worldMargin : 0]; // Map bounds from world positions to display positions
 
-    var minPoint = (_model$apiSpecificRen = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen, _toConsumableArray(vtkBoundingBox.getMinPoint(worldBounds)).concat([model.renderer]));
+    var minPoint = (_model$_apiSpecificRe = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe, _toConsumableArray(vtkBoundingBox.getMinPoint(worldBounds)).concat([model._renderer]));
 
-    var maxPoint = (_model$apiSpecificRen2 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen2, _toConsumableArray(vtkBoundingBox.getMaxPoint(worldBounds)).concat([model.renderer]));
+    var maxPoint = (_model$_apiSpecificRe2 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe2, _toConsumableArray(vtkBoundingBox.getMaxPoint(worldBounds)).concat([model._renderer]));
 
     var displayBounds = vtkMath.computeBoundsFromPoints(minPoint, maxPoint, []);
     var planeOrigin = [];
@@ -257,15 +259,15 @@ function widgetBehavior(publicAPI, model) {
     var p3 = []; // If we are in a 2D projection
 
     if (viewPlaneOrigin && viewPlaneNormal && viewUp && vtkBoundingBox.intersectPlane(displayBounds, viewPlaneOrigin, viewPlaneNormal)) {
-      var _model$apiSpecificRen3, _model$apiSpecificRen4;
+      var _model$_apiSpecificRe3, _model$_apiSpecificRe4;
 
       // Map plane origin from world positions to display positions
-      var displayPlaneOrigin = (_model$apiSpecificRen3 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen3, _toConsumableArray(viewPlaneOrigin).concat([model.renderer])); // Map plane normal from world positions to display positions
+      var displayPlaneOrigin = (_model$_apiSpecificRe3 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe3, _toConsumableArray(viewPlaneOrigin).concat([model._renderer])); // Map plane normal from world positions to display positions
 
 
       var planeNormalPoint = vtkMath.add(viewPlaneOrigin, viewPlaneNormal, []);
 
-      var displayPlaneNormalPoint = (_model$apiSpecificRen4 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen4, _toConsumableArray(planeNormalPoint).concat([model.renderer]));
+      var displayPlaneNormalPoint = (_model$_apiSpecificRe4 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe4, _toConsumableArray(planeNormalPoint).concat([model._renderer]));
 
       var displayPlaneNormal = vtkMath.subtract(displayPlaneNormalPoint, displayPlaneOrigin); // Project view plane into bounding box
 
@@ -300,7 +302,7 @@ function widgetBehavior(publicAPI, model) {
     vtkMath.add(finalPosition, v, finalPosition);
     vtkMath.add(finalPosition, w, finalPosition);
     vtkMath.add(finalPosition, positionMargin, finalPosition);
-    return (_model$apiSpecificRen5 = model.apiSpecificRenderWindow).displayToWorld.apply(_model$apiSpecificRen5, finalPosition.concat([model.renderer]));
+    return (_model$_apiSpecificRe5 = model._apiSpecificRenderWindow).displayToWorld.apply(_model$_apiSpecificRe5, finalPosition.concat([model._renderer]));
   };
 
   publicAPI.updateTextPosition = function (point1, point2) {
@@ -350,8 +352,10 @@ function widgetBehavior(publicAPI, model) {
     if (!model.point2) {
       // Update orientation to match the camera's plane
       // if the corners are not yet placed
-      var normal = model.camera.getDirectionOfProjection();
-      var up = model.camera.getViewUp();
+      var normal = model._camera.getDirectionOfProjection();
+
+      var up = model._camera.getViewUp();
+
       var right = [];
       vec3.cross(right, up, normal);
       model.shapeHandle.setUp(up);
@@ -360,7 +364,7 @@ function widgetBehavior(publicAPI, model) {
       model.manipulator.setNormal(normal);
     }
 
-    var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (!worldCoords.length) {
       return macro.VOID;
@@ -420,7 +424,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.point1 && (model.activeState === model.point1Handle || model.activeState === model.point2Handle)) {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
 
@@ -437,7 +442,9 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleLeftButtonRelease = function (e) {
     if (model.isDragging) {
       model.isDragging = false;
-      model.apiSpecificRenderWindow.setCursor('pointer');
+
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -450,7 +457,7 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    var viewSize = model.apiSpecificRenderWindow.getSize();
+    var viewSize = model._apiSpecificRenderWindow.getSize();
 
     if (e.position.x < 0 || e.position.x > viewSize[0] - 1 || e.position.y < 0 || e.position.y > viewSize[1] - 1) {
       return macro.VOID;
@@ -550,7 +557,8 @@ function widgetBehavior(publicAPI, model) {
 
     model._interactor.render();
 
-    model.widgetManager.enablePicking();
+    model._widgetManager.enablePicking();
+
     superClass.loseFocus();
   };
 }

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -50,11 +50,12 @@ function widgetBehavior(publicAPI, model) {
     shapeHandle.setVisible(true);
     shapeHandle.setOrigin(center);
     shapeHandle.setScale1(radius * 2);
-    model.interactor.render();
+
+    model._interactor.render();
   }
 
   function currentWorldCoords(e) {
-    return model.manipulator.handleEvent(e, model.apiSpecificRenderWindow);
+    return model.manipulator.handleEvent(e, model._apiSpecificRenderWindow);
   } // Update the sphere's center and radius.  Example:
   // handle.setCenterAndRadius([1,2,3], 10);
 
@@ -78,7 +79,8 @@ function widgetBehavior(publicAPI, model) {
     centerHandle.setOrigin(newCenter);
     borderHandle.setOrigin(newBorder);
     updateSphere();
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
   };
 
   publicAPI.handleLeftButtonPress = function (e) {
@@ -101,7 +103,9 @@ function widgetBehavior(publicAPI, model) {
     }
 
     model.isDragging = true;
-    model.apiSpecificRenderWindow.setCursor('grabbing');
+
+    model._apiSpecificRenderWindow.setCursor('grabbing');
+
     model.previousPosition = _toConsumableArray(currentWorldCoords(e));
     publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
@@ -115,8 +119,11 @@ function widgetBehavior(publicAPI, model) {
 
     if (isPlaced()) {
       model.previousPosition = null;
-      model.widgetManager.enablePicking();
-      model.apiSpecificRenderWindow.setCursor('pointer');
+
+      model._widgetManager.enablePicking();
+
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.isDragging = false;
       model.activeState = null;
       state.deactivate();
@@ -165,7 +172,8 @@ function widgetBehavior(publicAPI, model) {
     borderHandle.setOrigin(null);
     model.isDragging = true;
     model.activeState = moveHandle;
-    model.interactor.render();
+
+    model._interactor.render();
   };
 
   publicAPI.loseFocus = function () {

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -37,14 +37,14 @@ function widgetBehavior(publicAPI, model) {
         model.firstHandle = model.lastHandle;
       }
 
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+      model._apiSpecificRenderWindow.setCursor('grabbing');
     }
   }; // --------------------------------------------------------------------------
 
 
   var getHoveredHandle = function getHoveredHandle() {
     var handles = model.widgetState.getHandleList();
-    var scale = model.moveHandle.getScale1() * vec3.distance(model.apiSpecificRenderWindow.displayToWorld(0, 0, 0, model.renderer), model.apiSpecificRenderWindow.displayToWorld(1, 0, 0, model.renderer));
+    var scale = model.moveHandle.getScale1() * vec3.distance(model._apiSpecificRenderWindow.displayToWorld(0, 0, 0, model._renderer), model._apiSpecificRenderWindow.displayToWorld(1, 0, 0, model._renderer));
     return handles.reduce(function (_ref, handle) {
       var closestHandle = _ref.closestHandle,
           closestDistance = _ref.closestDistance;
@@ -185,7 +185,8 @@ function widgetBehavior(publicAPI, model) {
       model.freeHand = publicAPI.getAllowFreehand() && !model.isDragging;
     } else {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
 
@@ -201,7 +202,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleLeftButtonRelease = function (e) {
     if (model.isDragging) {
       if (!model.hasFocus) {
-        model.apiSpecificRenderWindow.setCursor(model.defaultCursor);
+        model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
+
         model.widgetState.deactivate();
 
         model._interactor.cancelAnimation(publicAPI);
@@ -249,19 +251,20 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-    var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     var hoveredHandle = getHoveredHandle();
 
     if (hoveredHandle) {
       model.moveHandle.setVisible(false);
 
       if (hoveredHandle !== model.firstHandle) {
-        model.apiSpecificRenderWindow.setCursor('grabbing');
+        model._apiSpecificRenderWindow.setCursor('grabbing');
       }
     } else if (!model.isDragging && model.hasFocus) {
       model.moveHandle.setVisible(true);
-      model.apiSpecificRenderWindow.setCursor(model.defaultCursor);
+
+      model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
     }
 
     if (model.lastHandle) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "24.0.1",
+  "version": "24.1.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -87,7 +87,7 @@
     "html-webpack-plugin": "5.5.0",
     "husky": "7.0.4",
     "ignore-loader": "0.1.2",
-    "karma": "6.3.10",
+    "karma": "6.3.17",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.1.0",
     "karma-firefox-launcher": "2.1.2",