feat(LineGlyphRepresentation): support scale1 state mixin

Add handle representations to example.
Kitware · Aug 27, 2023 · 37acd7d · 37acd7d
1 parent fa89694
commit 37acd7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Sources/Widgets/Representations/LineGlyphRepresentation/example/index.js b/Sources/Widgets/Representations/LineGlyphRepresentation/example/index.js
@@ -6,6 +6,7 @@ import '@kitware/vtk.js/Rendering/Profiles/All';
 import vtkFullScreenRenderWindow from '@kitware/vtk.js/Rendering/Misc/FullScreenRenderWindow';
 import vtkStateBuilder from '@kitware/vtk.js/Widgets/Core/StateBuilder';
 
+import vtkSphereHandleRepresentation from '@kitware/vtk.js/Widgets/Representations/SphereHandleRepresentation';
 import vtkLineGlyphRepresentation from '@kitware/vtk.js/Widgets/Representations/LineGlyphRepresentation';
 
 // ----------------------------------------------------------------------------
@@ -26,7 +27,7 @@ const compositeState = vtkStateBuilder
   .createBuilder()
   .addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin'],
+    mixins: ['origin', 'scale1'],
     name: 'handle',
   })
   .build();
@@ -41,6 +42,7 @@ const points = [
 points.forEach((point) => {
   const handle = compositeState.addHandle();
   handle.setOrigin(point);
+  handle.setScale1(1);
 });
 
 // -----------------------------------------------------------
@@ -49,11 +51,18 @@ points.forEach((point) => {
 
 const widgetRep = vtkLineGlyphRepresentation.newInstance({
   scaleInPixels: false,
-  close: true,
+  lineThickness: 0.5, // radius of the cylinder
 });
 widgetRep.setInputData(compositeState);
 widgetRep.setLabels(['handles']);
 widgetRep.getActors().forEach(renderer.addActor);
 
+const handleRep = vtkSphereHandleRepresentation.newInstance({
+  scaleInPixels: false,
+});
+handleRep.setInputData(compositeState);
+handleRep.setLabels(['handles']);
+handleRep.getActors().forEach(renderer.addActor);
+
 renderer.resetCamera();
 renderWindow.render();
diff --git a/Sources/Widgets/Representations/LineGlyphRepresentation/index.js b/Sources/Widgets/Representations/LineGlyphRepresentation/index.js
@@ -49,11 +49,7 @@ function cylinderScale(publicAPI, model) {
           model.displayScaleParams
         );
       }
-      const scale = state.getScale3?.() ?? [
-        model.lineThickness,
-        model.lineThickness,
-        1,
-      ];
+      const scale = [1, model.lineThickness, model.lineThickness];
       scales[j++] = length * scale[0];
       scales[j++] = scaleFactor * scale[1];
       scales[j++] = scaleFactor * scale[2];
@@ -113,6 +109,7 @@ function defaultValues(publicAPI, model, initialValues) {
     },
     applyMixin: {
       noScale: cylinderScale(publicAPI, model),
+      scale1: cylinderScale(publicAPI, model),
       noOrientation: cylinderDirection(publicAPI, model),
     },
   };