Merge pull request Kitware#1987 from finetjul/spline-widget-pickability

fix(splinewidget): do not make spline context pickable by default
dvisionlab · Jul 8, 2021 · 4449d16 · 4449d16
2 parents ee751f0 + b076eab
commit 4449d16
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Sources/Widgets/Representations/SplineContextRepresentation/index.js b/Sources/Widgets/Representations/SplineContextRepresentation/index.js
@@ -1,6 +1,6 @@
 import macro from 'vtk.js/Sources/macro';
 import vtkActor from 'vtk.js/Sources/Rendering/Core/Actor';
-import vtkHandleRepresentation from 'vtk.js/Sources/Widgets/Representations/HandleRepresentation';
+import vtkContextRepresentation from 'vtk.js/Sources/Widgets/Representations/ContextRepresentation';
 import vtkMapper from 'vtk.js/Sources/Rendering/Core/Mapper';
 import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
 import vtkSpline3D from 'vtk.js/Sources/Common/DataModel/Spline3D';
@@ -155,7 +155,7 @@ const DEFAULT_VALUES = {
 export function extend(publicAPI, model, initialValues = {}) {
   Object.assign(model, DEFAULT_VALUES, initialValues);
 
-  vtkHandleRepresentation.extend(publicAPI, model, initialValues);
+  vtkContextRepresentation.extend(publicAPI, model, initialValues);
   macro.get(publicAPI, model, ['mapper']);
   macro.setGet(publicAPI, model, [
     'resolution',

diff --git a/Sources/Widgets/Widgets3D/SplineWidget/behavior.js b/Sources/Widgets/Widgets3D/SplineWidget/behavior.js
@@ -4,12 +4,15 @@ import { vec3 } from 'gl-matrix';
 export default function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkSplineWidgetProp');
 
+  model.keysDown = {};
+  model.moveHandle = model.widgetState.getMoveHandle();
+
   // --------------------------------------------------------------------------
   // Private methods
   // --------------------------------------------------------------------------
 
   const updateHandlesSize = () => {
-    if (model.handleSizeInPixels !== null) {
+    if (model.handleSizeInPixels != null) {
       const scale =
         model.handleSizeInPixels *
         vec3.distance(
@@ -104,21 +107,19 @@ export default function widgetBehavior(publicAPI, model) {
 
   // --------------------------------------------------------------------------
 
-  const superSetHandleSizeInPixels = publicAPI.setHandleSizeInPixels;
   publicAPI.setHandleSizeInPixels = (size) => {
-    superSetHandleSizeInPixels(size);
+    model.factory.setHandleSizeInPixels(size);
     updateHandlesSize();
   };
-  publicAPI.setHandleSizeInPixels(model.handleSizeInPixels); // set initial value
+  publicAPI.setHandleSizeInPixels(model.factory.getHandleSizeInPixels()); // set initial value
 
   // --------------------------------------------------------------------------
 
-  const superSetResolution = publicAPI.setResolution;
   publicAPI.setResolution = (resolution) => {
-    superSetResolution(resolution);
-    model.representations[1].setResolution(model.resolution);
+    model.factory.setResolution(resolution);
+    model.representations[1].setResolution(resolution);
   };
-  publicAPI.setResolution(model.resolution); // set initial value
+  publicAPI.setResolution(model.factory.getResolution()); // set initial value
 
   // --------------------------------------------------------------------------
 

diff --git a/Sources/Widgets/Widgets3D/SplineWidget/index.js b/Sources/Widgets/Widgets3D/SplineWidget/index.js
@@ -51,20 +51,18 @@ function vtkSplineWidget(publicAPI, model) {
   // initialization
   // --------------------------------------------------------------------------
 
-  model.moveHandle = model.widgetState.getMoveHandle();
   // Default manipulator
   model.manipulator = vtkPlanePointManipulator.newInstance();
 }
 
 // ----------------------------------------------------------------------------
 
 const DEFAULT_VALUES = {
-  keysDown: {},
   freehandMinDistance: 0.1,
   allowFreehand: true,
-  resolution: 32,
+  resolution: 32, // propagates to SplineContextRepresentation
   defaultCursor: 'pointer',
-  handleSizeInPixels: 10,
+  handleSizeInPixels: 10, // propagates to SplineContextRepresentation
 };
 
 // ----------------------------------------------------------------------------