@kitware/vtk.js 24.18.7 → 24.18.10

package/Rendering/Core/CellPicker.js

@@ -254,14 +254,19 @@ function vtkCellPicker(publicAPI, model) {
       var tempCellMap = createCellMap();
       var minCellMap = createCellMap();
       var numberOfCells = data.getNumberOfCells();
+      /* eslint-disable no-continue */
 
       for (var cellId = 0; cellId < numberOfCells; cellId++) {
         var pCoords = [0, 0, 0];
-        minCellType = data.getCellType(cellId);
+        minCellType = data.getCellType(cellId); // Skip cells that are marked as empty
+
+        if (minCellType === CellType.VTK_EMPTY_CELL) {
+          continue;
+        }
+
         var cell = tempCellMap[minCellType];
 
         if (cell == null) {
-          // eslint-disable-next-line no-continue
           continue;
         }
 
@@ -294,6 +299,8 @@ function vtkCellPicker(publicAPI, model) {
           }
         }
       }
+      /* eslint-enable no-continue */
+
     }
 
     if (minCellId >= 0 && tMin < model.globalTMin) {

package/Widgets/Representations/PolyLineRepresentation.js

@@ -2,7 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';
-import { B as areEquals, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
+import { B as areEquals } from '../../Common/Core/Math/index.js';
 import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
 import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import vtkTubeFilter from '../../Filters/General/TubeFilter.js';
@@ -104,21 +104,7 @@ function vtkPolyLineRepresentation(publicAPI, model) {
       subStates.push(subState);
       return subStates;
     }, []);
-    var size = list.length; // Do not render last point if not visible or too close from previous point.
-
-    if (size > 1) {
-      var lastState = list[list.length - 1];
-      var last = lastState.getOrigin();
-      var prevLast = list[list.length - 2].getOrigin();
-      var delta = distance2BetweenPoints(last, prevLast) > model.threshold ? 0 : 1;
-
-      if (!delta && lastState.isVisible && !lastState.isVisible()) {
-        delta++;
-      }
-
-      size -= delta;
-    }
-
+    var size = list.length;
     var points = allocateSize(size, model.closePolyLine && size > 2);
 
     if (points) {

package/Widgets/Widgets3D/AngleWidget/behavior.js

@@ -5,7 +5,7 @@ import vtkPointPicker from '../../../Rendering/Core/PointPicker.js';
 var MAX_POINTS = 3;
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkAngleWidgetProp');
-  var isDragging = null;
+  model._isDragging = false;
   var picker = vtkPointPicker.newInstance();
   picker.setPickFromList(1); // --------------------------------------------------------------------------
   // Display 2D
@@ -46,8 +46,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
       newHandle.setManipulator(manipulator);
-    } else {
-      isDragging = true;
+    } else if (model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -69,7 +69,8 @@ function widgetBehavior(publicAPI, model) {
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
-      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
+      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
+      ) {
         model.activeState.setOrigin(worldCoords);
         publicAPI.invokeInteractionEvent();
         return macro.EVENT_ABORT;
@@ -87,32 +88,35 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging && model.pickable) {
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
+
+    if (model.hasFocus && model.widgetState.getHandleList().length === MAX_POINTS) {
+      publicAPI.loseFocus();
+      return macro.VOID;
+    }
+
+    if (model._isDragging) {
       model._apiSpecificRenderWindow.setCursor('pointer');
 
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
 
-      publicAPI.invokeEndInteractionEvent();
+      model._isDragging = false;
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
     }
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
-      publicAPI.invokeEndInteractionEvent();
-
       model._widgetManager.enablePicking();
 
       model._interactor.render();
-    } // Don't make any more points
-
-
-    if (model.widgetState.getHandleList().length === MAX_POINTS) {
-      publicAPI.loseFocus();
     }
 
-    isDragging = false;
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Focus API - modeHandle follow mouse when widget has focus
   // --------------------------------------------------------------------------
@@ -143,6 +147,7 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.deactivate();
     model.widgetState.getMoveHandle().deactivate();
     model.widgetState.getMoveHandle().setVisible(false);
+    model.widgetState.getMoveHandle().setOrigin(null);
     model.activeState = null;
     model.hasFocus = false;
 

package/Widgets/Widgets3D/DistanceWidget/behavior.js

@@ -4,7 +4,7 @@ import macro from '../../../macros.js';
 var MAX_POINTS = 2;
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkDistanceWidgetProp');
-  var isDragging = null; // --------------------------------------------------------------------------
+  model._isDragging = false; // --------------------------------------------------------------------------
   // Display 2D
   // --------------------------------------------------------------------------
 
@@ -41,8 +41,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
       newHandle.setManipulator(manipulator);
-    } else {
-      isDragging = true;
+    } else if (model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -59,17 +59,13 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     var _model$activeState$ge3, _model$activeState2, _model$activeState2$g;
 
-    if (model.hasFocus && model.widgetState.getHandleList().length === MAX_POINTS) {
-      publicAPI.loseFocus();
-      return macro.VOID;
-    }
-
     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);
 
-      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
+      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
+      ) {
         model.activeState.setOrigin(worldCoords);
         publicAPI.invokeInteractionEvent();
         return macro.EVENT_ABORT;
@@ -83,27 +79,35 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging && model.pickable) {
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
+
+    if (model.hasFocus && model.widgetState.getHandleList().length === MAX_POINTS) {
+      publicAPI.loseFocus();
+      return macro.VOID;
+    }
+
+    if (model._isDragging) {
       model._apiSpecificRenderWindow.setCursor('pointer');
 
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
 
-      publicAPI.invokeEndInteractionEvent();
+      model._isDragging = false;
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
     }
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
-      publicAPI.invokeEndInteractionEvent();
-
       model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
 
-    isDragging = false;
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Focus API - modeHandle follow mouse when widget has focus
   // --------------------------------------------------------------------------
@@ -134,6 +138,7 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.deactivate();
     model.widgetState.getMoveHandle().deactivate();
     model.widgetState.getMoveHandle().setVisible(false);
+    model.widgetState.getMoveHandle().setOrigin(null);
     model.activeState = null;
     model.hasFocus = false;
 

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -3,7 +3,7 @@ import macro from '../../../macros.js';
 import { handleTypeFromName, AXES, transformVec3, rotateVec3 } from './helpers.js';
 
 function widgetBehavior(publicAPI, model) {
-  var isDragging = null;
+  model._isDragging = false;
 
   publicAPI.setDisplayCallback = function (callback) {
     return model.representations[0].setDisplayCallback(callback);
@@ -14,15 +14,19 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    isDragging = true;
+    if (model.dragable) {
+      model._isDragging = true;
 
-    model._interactor.requestAnimation(publicAPI);
+      model._apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._interactor.requestAnimation(publicAPI);
+    }
 
     return macro.EVENT_ABORT;
   };
 
   publicAPI.handleMouseMove = function (callData) {
-    if (isDragging && model.pickable && model.dragable) {
+    if (model._isDragging) {
       return publicAPI.handleEvent(callData);
     }
 
@@ -30,13 +34,19 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging && model.pickable) {
-      isDragging = false;
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
+
+    if (model._isDragging) {
+      model._isDragging = false;
 
       model._interactor.cancelAnimation(publicAPI);
 
       model.widgetState.deactivate();
     }
+
+    return macro.EVENT_ABORT;
   };
 
   publicAPI.handleEvent = function (callData) {

package/Widgets/Widgets3D/ImplicitPlaneWidget.js

@@ -12,7 +12,7 @@ import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkPlaneWidget');
-  var isDragging = null;
+  model._isDragging = false;
 
   publicAPI.setDisplayCallback = function (callback) {
     return model.representations[0].setDisplayCallback(callback);
@@ -47,19 +47,24 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    isDragging = true;
     model.lineManipulator.setWidgetOrigin(model.widgetState.getOrigin());
     model.planeManipulator.setWidgetOrigin(model.widgetState.getOrigin());
     model.trackballManipulator.reset(callData); // setup trackball delta
 
-    model._interactor.requestAnimation(publicAPI);
+    if (model.dragable) {
+      model._isDragging = true;
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._interactor.requestAnimation(publicAPI);
+    }
 
     publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
   };
 
   publicAPI.handleMouseMove = function (callData) {
-    if (isDragging && model.pickable) {
+    if (model._isDragging) {
       return publicAPI.handleEvent(callData);
     }
 
@@ -67,14 +72,19 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging && model.pickable) {
-      publicAPI.invokeEndInteractionEvent();
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
 
+    if (model._isDragging) {
       model._interactor.cancelAnimation(publicAPI);
+
+      model._isDragging = false;
     }
 
-    isDragging = false;
     model.widgetState.deactivate();
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   };
 
   publicAPI.handleEvent = function (callData) {

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 = null; // --------------------------------------------------------------------------
+  model._isDragging = false; // --------------------------------------------------------------------------
   // Public methods
   // --------------------------------------------------------------------------
 
@@ -56,8 +56,8 @@ function widgetBehavior(publicAPI, model) {
       moveHandle.setOrigin(worldCoords);
       model.widgetState.getText().setOrigin(moveHandle.getOrigin());
       publicAPI.loseFocus();
-    } else {
-      model.isDragging = true;
+    } else if (model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -72,27 +72,30 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (model.isDragging && model.pickable) {
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
+
+    if (model._isDragging) {
       model._apiSpecificRenderWindow.setCursor('pointer');
 
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
 
-      publicAPI.invokeEndInteractionEvent();
+      model._isDragging = false;
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
     }
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
-      publicAPI.invokeEndInteractionEvent();
-
       model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
 
-    model.isDragging = false;
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Mouse move: Drag selected handle / Handle follow the mouse
   // --------------------------------------------------------------------------
@@ -106,7 +109,7 @@ function widgetBehavior(publicAPI, model) {
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
-      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model.isDragging)) {
+      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging)) {
         model.activeState.setOrigin(worldCoords);
         model.widgetState.getText().setOrigin(model.activeState.getOrigin());
         publicAPI.invokeInteractionEvent();

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -14,6 +14,7 @@ var MAX_POINTS = 2;
 var handleGetters = ['getHandle1', 'getHandle2', 'getMoveHandle'];
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkLineWidgetProp');
+  model._isDragging = false;
   /**
    * Returns the handle at the handleIndex'th index.
    * @param {number} handleIndex 0, 1 or 2
@@ -22,6 +23,27 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.getHandle = function (handleIndex) {
     return model.widgetState[handleGetters[handleIndex]]();
   };
+  /**
+   * Return the index in the of tbe handle in `representations` array,
+   * or -1 if the handle is not present in the widget state.
+   */
+
+
+  publicAPI.getHandleIndex = function (handle) {
+    switch (handle) {
+      case model.widgetState.getHandle1():
+        return 0;
+
+      case model.widgetState.getHandle2():
+        return 1;
+
+      case model.widgetState.getMoveHandle():
+        return 2;
+
+      default:
+        return -1;
+    }
+  };
 
   publicAPI.isPlaced = function () {
     return getNumberOfPlacedHandles(model.widgetState) === MAX_POINTS;
@@ -37,7 +59,7 @@ function widgetBehavior(publicAPI, model) {
   function updateCursor(callData) {
     var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
 
-    model.isDragging = true;
+    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));
 
@@ -145,12 +167,6 @@ function widgetBehavior(publicAPI, model) {
     model.representations[1].setViewMatrix(Array.from(model._camera.getViewMatrix()));
   }; // Handles visibility ---------------------------------------------------------
 
-
-  publicAPI.setMoveHandleVisibility = function (visibility) {
-    model.representations[2].setVisibilityFlagArray([visibility, visibility]);
-    model.widgetState.getMoveHandle().setVisible(visibility);
-    model.representations[2].updateActorVisibility();
-  };
   /**
    * Set actor visibility to true unless it is a NONE handle
    * and uses state visibility variable for the displayActor visibility to
@@ -196,7 +212,7 @@ function widgetBehavior(publicAPI, model) {
 
     if (handleIndex === 1) {
       publicAPI.placeText();
-      publicAPI.setMoveHandleVisibility(false);
+      publicAPI.loseFocus();
     }
   }; // --------------------------------------------------------------------------
   // Left press: Select handle to drag
@@ -212,7 +228,7 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.placeHandle(0);
     } else if (model.widgetState.getMoveHandle().getActive() && getNumberOfPlacedHandles(model.widgetState) === 1) {
       publicAPI.placeHandle(1);
-    } else if (!model.widgetState.getText().getActive()) {
+    } else if (model.dragable && !model.widgetState.getText().getActive()) {
       // Grab handle1, handle2 or whole widget
       updateCursor(e);
     }
@@ -227,11 +243,6 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     var _model$activeState$ge3, _model$activeState2, _model$activeState2$g;
 
-    if (model.hasFocus && publicAPI.isPlaced() && !model.isDragging) {
-      publicAPI.loseFocus();
-      return macro.VOID;
-    }
-
     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)) {
@@ -241,9 +252,10 @@ function widgetBehavior(publicAPI, model) {
 
       if ( // is placing first or second handle
       model.activeState === model.widgetState.getMoveHandle() || // is dragging already placed first or second handle
-      model.isDragging) {
+      model._isDragging) {
         if (model.activeState.setOrigin) {
           model.activeState.setOrigin(worldCoords);
+          publicAPI.updateHandleVisibility(publicAPI.getHandleIndex(model.activeState));
         } else {
           // Dragging line
           publicAPI.getHandle(0).setOrigin(add(publicAPI.getHandle(0).getOrigin(), translation, []));
@@ -259,18 +271,26 @@ function widgetBehavior(publicAPI, model) {
 
     return macro.VOID;
   }; // --------------------------------------------------------------------------
-  // Left release: Finish drag / Create new handle
+  // Left release: Finish drag
   // --------------------------------------------------------------------------
 
 
   publicAPI.handleLeftButtonRelease = function () {
-    // After dragging a point or placing all points
-    if (model.activeState && model.activeState.getActive() && (model.isDragging || publicAPI.isPlaced())) {
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      publicAPI.rotateHandlesToFaceCamera();
+      return macro.VOID;
+    }
+
+    if (model.hasFocus && publicAPI.isPlaced()) {
+      publicAPI.loseFocus();
+      return macro.VOID;
+    }
+
+    if (model._isDragging && publicAPI.isPlaced()) {
       var wasTextActive = model.widgetState.getText().getActive(); // Recompute offsets
 
       publicAPI.placeText();
       model.widgetState.deactivate();
-      model.widgetState.getMoveHandle().deactivate();
       model.activeState = null;
 
       if (!wasTextActive) {
@@ -280,18 +300,19 @@ function widgetBehavior(publicAPI, model) {
       model._apiSpecificRenderWindow.setCursor('pointer');
 
       model.hasFocus = false;
-      publicAPI.invokeEndInteractionEvent();
+      model._isDragging = false;
+    } else if (model.activeState !== model.widgetState.getMoveHandle()) {
+      model.widgetState.deactivate();
+    }
 
+    if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
 
-    if (model.isDragging === false && (!model.activeState || !model.activeState.getActive())) {
-      publicAPI.rotateHandlesToFaceCamera();
-    }
-
-    model.isDragging = false;
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Focus API - moveHandle follow mouse when widget has focus
   // --------------------------------------------------------------------------
@@ -301,7 +322,6 @@ function widgetBehavior(publicAPI, model) {
     if (!model.hasFocus && !publicAPI.isPlaced()) {
       model.activeState = model.widgetState.getMoveHandle();
       model.activeState.setShape(publicAPI.getHandle(0).getShape());
-      publicAPI.setMoveHandleVisibility(true);
       model.activeState.activate();
 
       model._interactor.requestAnimation(publicAPI);
@@ -322,6 +342,7 @@ function widgetBehavior(publicAPI, model) {
 
     model.widgetState.deactivate();
     model.widgetState.getMoveHandle().deactivate();
+    model.widgetState.getMoveHandle().setOrigin(null);
     model.activeState = null;
     model.hasFocus = false;
 

package/Widgets/Widgets3D/LineWidget/helpers.js

@@ -21,6 +21,10 @@ function updateTextPosition(model) {
   SVGTextState.setOrigin(calculateTextPosition(model));
 }
 function isHandlePlaced(handleIndex, widgetState) {
+  if (handleIndex === 2) {
+    return widgetState.getMoveHandle().getOrigin() != null;
+  }
+
   var handle1Origin = widgetState.getHandle1().getOrigin();
 
   if (handleIndex === 0) {

package/Widgets/Widgets3D/LineWidget.js

@@ -172,16 +172,14 @@ function vtkLineWidget(publicAPI, model) {
 } // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  // manipulator: null,
-  isDragging: false
+var DEFAULT_VALUES = {// manipulator: null,
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, DEFAULT_VALUES, initialValues);
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['manipulator', 'isDragging']);
+  macro.setGet(publicAPI, model, ['manipulator']);
   vtkLineWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -2,7 +2,7 @@ import macro from '../../../macros.js';
 
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkPolyLineWidgetProp');
-  var isDragging = null; // --------------------------------------------------------------------------
+  model._isDragging = false; // --------------------------------------------------------------------------
   // Display 2D
   // --------------------------------------------------------------------------
 
@@ -28,7 +28,8 @@ function widgetBehavior(publicAPI, model) {
 
     var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
-    if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
+    if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
+    ) {
       model.activeState.setOrigin(worldCoords);
       publicAPI.invokeInteractionEvent();
       return macro.EVENT_ABORT;
@@ -81,8 +82,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
       newHandle.setManipulator(manipulator);
-    } else {
-      isDragging = true;
+    } else if (model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -114,27 +115,30 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging && model.pickable) {
+    if (!model.activeState || !model.activeState.getActive() || !model.pickable) {
+      return macro.VOID;
+    }
+
+    if (model._isDragging) {
       model._apiSpecificRenderWindow.setCursor('pointer');
 
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
 
-      publicAPI.invokeEndInteractionEvent();
+      model._isDragging = false;
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
     }
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
-      publicAPI.invokeEndInteractionEvent();
-
       model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
 
-    isDragging = false;
+    publicAPI.invokeEndInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Escape key: Release focus to switch to drag mode
   // --------------------------------------------------------------------------
@@ -176,6 +180,7 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.deactivate();
     model.widgetState.getMoveHandle().deactivate();
     model.widgetState.getMoveHandle().setVisible(false);
+    model.widgetState.getMoveHandle().setOrigin(null);
     model.activeState = null;
     model.hasFocus = false;
 

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -3,12 +3,12 @@ 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 { x as multiplyScalar, s as subtract, l as normalize, d as dot, j as cross, m as multiplyAccumulate, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
+import { s as subtract, l as normalize, d as dot, j as cross, m as multiplyAccumulate, x as multiplyScalar, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
 import { updateState, getAssociatedLinesName, boundPointOnPlane, rotateVector } from './helpers.js';
 import { InteractionMethodsName, ScrollingMethods } from './Constants.js';
 
 function widgetBehavior(publicAPI, model) {
-  var isDragging = null;
+  model._isDragging = false;
   var isScrolling = false; // Reset "updateMethodName" attribute when no actors are selected
   // Useful to update 'updateMethodeName' to the correct name which
   // will be TranslateCenter by default
@@ -60,7 +60,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonPress = function (callData) {
     if (model.activeState && model.activeState.getActive()) {
-      isDragging = true;
+      model._isDragging = true;
       var viewType = model.widgetState.getActiveViewType();
       var currentPlaneNormal = model.widgetState.getPlanes()[viewType].normal;
       model.planeManipulator.setWidgetOrigin(model.widgetState.getCenter());
@@ -76,14 +76,14 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleMouseMove = function (callData) {
-    if (isDragging && model.pickable && model.dragable) {
+    if (model._isDragging) {
       return publicAPI.handleEvent(callData);
     }
 
     if (isScrolling) {
       if (model.previousPosition.y !== callData.position.y) {
         var step = model.previousPosition.y - callData.position.y;
-        publicAPI.translateCenterOnCurrentDirection(step, callData.pokedRenderer);
+        publicAPI.translateCenterOnPlaneDirection(step);
         model.previousPosition = callData.position;
         publicAPI.invokeInternalInteractionEvent();
       }
@@ -93,11 +93,11 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleLeftButtonRelease = function () {
-    if (isDragging || isScrolling) {
+    if (model._isDragging || isScrolling) {
       publicAPI.endScrolling();
     }
 
-    isDragging = false;
+    model._isDragging = false;
     model.widgetState.deactivate();
   };
 
@@ -121,7 +121,7 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseWheel = function (calldata) {
     var step = calldata.spinY;
     isScrolling = true;
-    publicAPI.translateCenterOnCurrentDirection(step, calldata.pokedRenderer);
+    publicAPI.translateCenterOnPlaneDirection(step);
     publicAPI.invokeInternalInteractionEvent();
     isScrolling = false;
     return macro.EVENT_ABORT;
@@ -178,10 +178,8 @@ function widgetBehavior(publicAPI, model) {
     });
   };
 
-  publicAPI.translateCenterOnCurrentDirection = function (nbSteps, renderer) {
-    var dirProj = renderer.getRenderWindow().getRenderers()[0].getActiveCamera().getDirectionOfProjection(); // Direction of the projection is the inverse of what we want
-
-    var direction = multiplyScalar(dirProj, -1);
+  publicAPI.translateCenterOnPlaneDirection = function (nbSteps) {
+    var dirProj = model.widgetState.getPlanes()[model.viewType].normal;
     var oldCenter = model.widgetState.getCenter();
     var image = model.widgetState.getImage();
     var imageSpacing = image.getSpacing(); // Use Chebyshev norm
@@ -191,9 +189,9 @@ function widgetBehavior(publicAPI, model) {
       return Math.abs(value);
     });
     var index = absDirProj.indexOf(Math.max.apply(Math, _toConsumableArray(absDirProj)));
-    var movingFactor = nbSteps * (imageSpacing[index] / dirProj[index]); // Define the potentially new center
+    var movingFactor = nbSteps * imageSpacing[index] / Math.abs(dirProj[index]); // Define the potentially new center
 
-    var newCenter = [oldCenter[0] + movingFactor * direction[0], oldCenter[1] + movingFactor * direction[1], oldCenter[2] + movingFactor * direction[2]];
+    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);

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -15,6 +15,7 @@ var vtkErrorMacro = macro.vtkErrorMacro;
 var EPSILON = 1e-6;
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkShapeWidgetProp');
+  model._isDragging = false;
   model.keysDown = {};
 
   var superClass = _objectSpread({}, publicAPI); // --------------------------------------------------------------------------
@@ -383,7 +384,7 @@ function widgetBehavior(publicAPI, model) {
         publicAPI.updateShapeBounds();
         publicAPI.invokeInteractionEvent();
       }
-    } else if (model.isDragging) {
+    } else if (model._isDragging) {
       if (model.activeState === model.point1Handle) {
         model.point1Handle.setOrigin(worldCoords);
         model.point1 = worldCoords;
@@ -396,7 +397,7 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.invokeInteractionEvent();
     }
 
-    return model.hasFocus || model.isDragging ? macro.EVENT_ABORT : macro.VOID;
+    return model.hasFocus || model._isDragging ? macro.EVENT_ABORT : macro.VOID;
   }; // --------------------------------------------------------------------------
   // Left click: Add point / End interaction
   // --------------------------------------------------------------------------
@@ -434,26 +435,24 @@ function widgetBehavior(publicAPI, model) {
       return macro.EVENT_ABORT;
     }
 
-    if (model.point1 && (model.activeState === model.point1Handle || model.activeState === model.point2Handle)) {
-      model.isDragging = true;
+    if (model.point1 && (model.activeState === model.point1Handle || model.activeState === model.point2Handle) && model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
-
-      publicAPI.invokeStartInteractionEvent();
-      return macro.EVENT_ABORT;
     }
 
-    return macro.VOID;
+    publicAPI.invokeStartInteractionEvent();
+    return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Left release: Maybe end interaction
   // --------------------------------------------------------------------------
 
 
   publicAPI.handleLeftButtonRelease = function (e) {
-    if (model.isDragging) {
-      model.isDragging = false;
+    if (model._isDragging) {
+      model._isDragging = false;
 
       model._apiSpecificRenderWindow.setCursor('pointer');
 

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -9,7 +9,7 @@ function widgetBehavior(publicAPI, model) {
   var borderHandle = state.getBorderHandle();
   var shapeHandle = state.getSphereHandle(); // Set while moving the center or border handle.
 
-  model.isDragging = false; // The last world coordinate of the mouse cursor during dragging.
+  model._isDragging = false; // The last world coordinate of the mouse cursor during dragging.
 
   model.previousPosition = null;
   model.classHierarchy.push('vtkSphereWidgetProp');
@@ -103,7 +103,7 @@ function widgetBehavior(publicAPI, model) {
       updateSphere();
     }
 
-    model.isDragging = true;
+    model._isDragging = true;
 
     model._apiSpecificRenderWindow.setCursor('grabbing');
 
@@ -113,7 +113,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleLeftButtonRelease = function (e) {
-    if (!model.isDragging) {
+    if (!model._isDragging) {
       model.activeState = null;
       return macro.VOID;
     }
@@ -125,7 +125,7 @@ function widgetBehavior(publicAPI, model) {
 
       model._apiSpecificRenderWindow.setCursor('pointer');
 
-      model.isDragging = false;
+      model._isDragging = false;
       model.activeState = null;
       state.deactivate();
     }
@@ -135,7 +135,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleMouseMove = function (e) {
-    if (!model.isDragging) {
+    if (!model._isDragging) {
       model.activeState = null;
       return macro.VOID;
     }
@@ -171,14 +171,14 @@ function widgetBehavior(publicAPI, model) {
     borderHandle.setVisible(false);
     centerHandle.setOrigin(null);
     borderHandle.setOrigin(null);
-    model.isDragging = true;
+    model._isDragging = true;
     model.activeState = moveHandle;
 
     model._interactor.render();
   };
 
   publicAPI.loseFocus = function () {
-    model.isDragging = false;
+    model._isDragging = false;
     model.activeState = null;
   };
 }

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -4,6 +4,7 @@ import { vec3 } from 'gl-matrix';
 
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkSplineWidgetProp');
+  model._isDragging = false;
   model.keysDown = {};
   model.moveHandle = model.widgetState.getMoveHandle(); // --------------------------------------------------------------------------
   // Private methods
@@ -166,7 +167,6 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.activeState === model.moveHandle) {
       if (model.widgetState.getHandleList().length === 0) {
-        publicAPI.invokeStartInteractionEvent();
         addPoint();
       } else {
         var hoveredHandle = getHoveredHandle();
@@ -176,24 +176,23 @@ function widgetBehavior(publicAPI, model) {
           model.moveHandle.setVisible(false);
           model.activeState = hoveredHandle;
           hoveredHandle.activate();
-          model.isDragging = true;
+          model._isDragging = true;
           model.lastHandle.setVisible(true);
         } else {
           addPoint();
         }
       }
 
-      model.freeHand = publicAPI.getAllowFreehand() && !model.isDragging;
-    } else {
-      model.isDragging = true;
+      model.freeHand = publicAPI.getAllowFreehand() && !model._isDragging;
+    } else if (model.dragable) {
+      model._isDragging = true;
 
       model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
-
-      publicAPI.invokeStartInteractionEvent();
     }
 
+    publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
   }; // --------------------------------------------------------------------------
   // Left release
@@ -201,7 +200,7 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleLeftButtonRelease = function (e) {
-    if (model.isDragging) {
+    if (model._isDragging) {
       if (!model.hasFocus) {
         model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
 
@@ -239,8 +238,8 @@ function widgetBehavior(publicAPI, model) {
     }
 
     model.freeHand = false;
-    model.isDragging = false;
     model.draggedPoint = false;
+    model._isDragging = false;
     return model.hasFocus ? macro.EVENT_ABORT : macro.VOID;
   }; // --------------------------------------------------------------------------
   // Mouse move: Drag selected handle / Handle follow the mouse
@@ -265,7 +264,7 @@ function widgetBehavior(publicAPI, model) {
       if (hoveredHandle !== model.firstHandle) {
         model._apiSpecificRenderWindow.setCursor('grabbing');
       }
-    } else if (!model.isDragging && model.hasFocus) {
+    } else if (!model._isDragging && model.hasFocus) {
       model.moveHandle.setVisible(true);
 
       model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
@@ -275,10 +274,10 @@ function widgetBehavior(publicAPI, model) {
       model.lastHandle.setVisible(true);
     }
 
-    if (worldCoords.length && (model.isDragging || model.activeState === model.moveHandle)) {
+    if (worldCoords.length && (model._isDragging || model.activeState === model.moveHandle)) {
       model.activeState.setOrigin(worldCoords);
 
-      if (model.isDragging) {
+      if (model._isDragging) {
         model.draggedPoint = true;
       }
 

package/package.json

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