@kitware/vtk.js 27.5.0 → 28.0.1

package/Widgets/Widgets3D/ResliceCursorWidget.js

@@ -4,6 +4,7 @@ import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlane from '../../Common/DataModel/Plane.js';
 import vtkPlaneSource from '../../Filters/Sources/PlaneSource.js';
+import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkLineHandleRepresentation from '../Representations/LineHandleRepresentation.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
 import { e as distance2BetweenPoints, m as multiplyAccumulate, s as subtract, l as normalize, w as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
@@ -263,11 +264,9 @@ function vtkResliceCursorWidget(publicAPI, model) {
     updateCamera(renderer, normal, viewType, resetFocalPoint, keepCenterFocalDistance);
   };
 
-  publicAPI.updateReslicePlane = function (imageReslice, viewType) {
-    // Calculate appropriate pixel spacing for the reslicing
-    var spacing = model.widgetState.getImage().getSpacing(); // Compute original (i.e. before rotation) plane (i.e. origin, p1, p2)
+  publicAPI.getPlaneSource = function (viewType) {
+    // Compute original (i.e. before rotation) plane (i.e. origin, p1, p2)
     // centered on cursor center.
-
     var planeSource = computeReslicePlaneOrigin(viewType);
     var _model$widgetState$ge = model.widgetState.getPlanes()[viewType],
         normal = _model$widgetState$ge.normal,
@@ -286,18 +285,25 @@ function vtkResliceCursorWidget(publicAPI, model) {
     planeSource.setOrigin.apply(planeSource, _toConsumableArray(boundedOrigin));
     planeSource.setPoint1.apply(planeSource, _toConsumableArray(boundedP1));
     planeSource.setPoint2.apply(planeSource, _toConsumableArray(boundedP2));
-    var o = planeSource.getOrigin();
+    return planeSource;
+  };
+
+  publicAPI.getResliceAxes = function (viewType) {
+    // Compute original (i.e. before rotation) plane (i.e. origin, p1, p2)
+    // centered on cursor center.
+    var planeSource = publicAPI.getPlaneSource(viewType); // TBD: use normal from planeSource ?
+
+    var normal = model.widgetState.getPlanes()[viewType].normal;
+    var planeOrigin = planeSource.getOrigin();
     var p1 = planeSource.getPoint1();
     var planeAxis1 = [];
-    subtract(p1, o, planeAxis1);
+    subtract(p1, planeOrigin, planeAxis1);
+    normalize(planeAxis1);
     var p2 = planeSource.getPoint2();
     var planeAxis2 = [];
-    subtract(p2, o, planeAxis2); // The x,y dimensions of the plane
-
-    var planeSizeX = normalize(planeAxis1);
-    var planeSizeY = normalize(planeAxis2);
+    subtract(p2, planeOrigin, planeAxis2);
+    normalize(planeAxis2);
     var newResliceAxes = mat4.identity(new Float64Array(16));
-    var planeOrigin = planeSource.getOrigin();
 
     for (var i = 0; i < 3; i++) {
       newResliceAxes[i] = planeAxis1[i];
@@ -306,6 +312,21 @@ function vtkResliceCursorWidget(publicAPI, model) {
       newResliceAxes[12 + i] = planeOrigin[i];
     }
 
+    return newResliceAxes;
+  };
+
+  publicAPI.updateReslicePlane = function (imageReslice, viewType) {
+    // Calculate appropriate pixel spacing for the reslicing
+    var spacing = model.widgetState.getImage().getSpacing();
+    var planeSource = publicAPI.getPlaneSource(viewType);
+    var newResliceAxes = publicAPI.getResliceAxes(viewType);
+    var planeOrigin = planeSource.getOrigin();
+    var p1 = planeSource.getPoint1();
+    var planeAxis1 = subtract(p1, planeOrigin, []);
+    var planeSizeX = normalize(planeAxis1);
+    var p2 = planeSource.getPoint2();
+    var planeAxis2 = subtract(p2, planeOrigin, []);
+    var planeSizeY = normalize(planeAxis2);
     var spacingX = Math.abs(planeAxis1[0] * spacing[0]) + Math.abs(planeAxis1[1] * spacing[1]) + Math.abs(planeAxis1[2] * spacing[2]);
     var spacingY = Math.abs(planeAxis2[0] * spacing[0]) + Math.abs(planeAxis2[1] * spacing[1]) + Math.abs(planeAxis2[2] * spacing[2]); // Compute a new set of resliced extents
 
@@ -350,12 +371,7 @@ function vtkResliceCursorWidget(publicAPI, model) {
     modified = imageReslice.setOutputSpacing([outputSpacingX, outputSpacingY, 1]) || modified;
     modified = imageReslice.setOutputOrigin([0.5 * outputSpacingX, 0.5 * outputSpacingY, 0]) || modified;
     modified = imageReslice.setOutputExtent([0, extentX - 1, 0, extentY - 1, 0, 0]) || modified;
-    return {
-      modified: modified,
-      origin: o,
-      point1: p1,
-      point2: p2
-    };
+    return modified;
   };
   /**
    * Returns a plane source with origin at cursor center and
@@ -429,13 +445,20 @@ function vtkResliceCursorWidget(publicAPI, model) {
   });
 } // ----------------------------------------------------------------------------
 
+/**
+ * Initializes the model.
+ * @param {*} initialValues optional object of member variables. initialValues.planes is an optional list of axis names (e.g. ['X', 'Y'])
+ * @returns the initial model object
+ */
+
 
 var defaultValues = function defaultValues(initialValues) {
   return _objectSpread({
     behavior: widgetBehavior,
-    widgetState: generateState(),
+    widgetState: generateState(initialValues.planes),
     rotationHandlePosition: 0.5,
-    scaleInPixels: true
+    scaleInPixels: true,
+    manipulator: vtkPlanePointManipulator.newInstance()
   }, initialValues);
 }; // ----------------------------------------------------------------------------
 
@@ -444,7 +467,7 @@ function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['scaleInPixels', 'rotationHandlePosition']);
+  macro.setGet(publicAPI, model, ['scaleInPixels', 'rotationHandlePosition', 'manipulator']);
   vtkResliceCursorWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -369,7 +369,8 @@ function widgetBehavior(publicAPI, model) {
       model.shapeHandle.setDirection(normal);
     }
 
-    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var _manipulator$handleEv = manipulator.handleEvent(callData, model._apiSpecificRenderWindow),
+        worldCoords = _manipulator$handleEv.worldCoords;
 
     if (!worldCoords.length) {
       return macro.VOID;
@@ -413,7 +414,8 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.hasFocus) {
-      var worldCoords = manipulator.handleEvent(e, model._apiSpecificRenderWindow);
+      var _manipulator$handleEv2 = manipulator.handleEvent(e, model._apiSpecificRenderWindow),
+          worldCoords = _manipulator$handleEv2.worldCoords;
 
       if (!model.point1) {
         model.point1Handle.setOrigin(worldCoords);

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -56,7 +56,7 @@ function widgetBehavior(publicAPI, model) {
     var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
 
     var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
-    return manipulator.handleEvent(e, model._apiSpecificRenderWindow);
+    return manipulator.handleEvent(e, model._apiSpecificRenderWindow).worldCoords;
   } // Update the sphere's center and radius.  Example:
   // handle.setCenterAndRadius([1,2,3], 10);
 

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -255,7 +255,9 @@ 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;
+
     var hoveredHandle = getHoveredHandle();
 
     if (hoveredHandle) {

package/index.d.ts

@@ -52,6 +52,7 @@
 /// <reference path="./Common/DataModel/Spline3D.d.ts" />
 /// <reference path="./Common/DataModel/Triangle.d.ts" />
 /// <reference path="./Common/Transform/LandmarkTransform.d.ts" />
+/// <reference path="./Common/Transform/Transform.d.ts" />
 /// <reference path="./Filters/General/AppendPolyData.d.ts" />
 /// <reference path="./Filters/General/ClipClosedSurface.d.ts" />
 /// <reference path="./Filters/General/ContourTriangulator.d.ts" />
@@ -151,6 +152,7 @@
 /// <reference path="./Rendering/Core/Glyph3DMapper.d.ts" />
 /// <reference path="./Rendering/Core/HardwareSelector.d.ts" />
 /// <reference path="./Rendering/Core/ImageArrayMapper.d.ts" />
+/// <reference path="./Rendering/Core/ImageCPRMapper.d.ts" />
 /// <reference path="./Rendering/Core/ImageMapper/Constants.d.ts" />
 /// <reference path="./Rendering/Core/ImageMapper.d.ts" />
 /// <reference path="./Rendering/Core/ImageProperty/Constants.d.ts" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "27.5.0",
+  "version": "28.0.1",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",