Bugfix/region highlight bugs (#196)

* Set interpolation type based on background or not * Put guard for valid region in onSelect for visibility * Move valid region check to widgets
RENCI · Nov 11, 2022 · 9db036f · 9db036f
1 parent daa1f92
commit 9db036f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/client/src/modules/view/components/slice-view/widgets.js b/client/src/modules/view/components/slice-view/widgets.js
@@ -252,7 +252,7 @@ export function Widgets(painter) {
       handles.visibility.onEndInteractionEvent(() => {
         const info = getWidgetInfo(widgets.visibility);
 
-        onSelect(info.region, 'visibility');
+        if (info.region) onSelect(info.region, 'visibility');
       });
 
       handles.claim.onEndInteractionEvent(() => {

diff --git a/client/src/modules/view/components/surface/region-surface.js b/client/src/modules/view/components/surface/region-surface.js
@@ -2,14 +2,14 @@ import { Surface } from './surface';
 
 export function RegionSurface() {
   const surface = Surface();
-  surface.setSliceHighlight(true);
   surface.getMapper().setScalarVisibility(false);
 
   return {
     setRegion: region => surface.setRegions([region]),
     getRegion: () => surface.getRegions()[0],
     setInputData: data => surface.setInputData(data),
     getInputData: () => surface.getInputData(),
+    setSliceHighlight: () => surface.setSliceHighlight(true),
     getActor: () => surface.getActor(),
     getHighlight: () => surface.getHighlight(),
     setVisibility: visible => surface.getActor().setVisibility(visible),

diff --git a/client/src/modules/view/components/surface/surface.js b/client/src/modules/view/components/surface/surface.js
@@ -23,6 +23,7 @@ export function Surface() {
 
   const actor = vtkActor.newInstance();
   actor.setMapper(mapper);
+  actor.getProperty().setInterpolationToFlat();
 
   const highlight = Highlight();
   highlight.setVisibility(false);
@@ -55,11 +56,15 @@ export function Surface() {
           VertexShaderCode: SliceHighlightVP,
           FragmentShaderCode: SliceHighlightFP
         };
+
+        actor.getProperty().setInterpolationToFlat();
       }
       else {
         mapper.setInputConnection(flyingEdges.getOutputPort());
 
         if (sliceCalculator) sliceCalculator.delete();
+
+        actor.getProperty().setInterpolationToPhong();
       }
     },
     setSlice: (slice, colors) => {      

diff --git a/client/src/modules/view/components/volume-view/volume-view.js b/client/src/modules/view/components/volume-view/volume-view.js
@@ -194,6 +194,7 @@ export function VolumeView(painter) {
       // Clean up any old surfaces
       [...surfaces, ...backgroundSurfaces].forEach(surface => {
         renderWindow.getRenderer().removeActor(surface.getActor());
+        renderWindow.getRenderer().removeActor(surface.getHighlight().getActor());
         surface.cleanUp();
       });
 
@@ -202,17 +203,18 @@ export function VolumeView(painter) {
       // Create surfaces for each region
       surfaces = regions.map(region => {
         const surface = RegionSurface();
-        surface.setColor(region.colors.surface);
         surface.setRegion(region);
+        surface.setColor(region.colors.surface);
+        surface.setSliceHighlight(true);
 
         return surface;
       });
 
       // Create surfaces for each background region
       backgroundSurfaces = backgroundRegions.map(region => {
         const surface = RegionSurface();
-        surface.setColor(backgroundColors.surface2);
         surface.setRegion(region);
+        surface.setColor(backgroundColors.surface2);
         surface.setVisibility(false);
 
         return surface;
@@ -226,6 +228,7 @@ export function VolumeView(painter) {
         surfaces.forEach(surface => {
           surface.setInputData(data);     
           renderer.addActor(surface.getActor());
+          renderer.addActor(surface.getHighlight().getActor());
 
           if (slice >= 0) {
             const region = getRegion(regions, surface);
@@ -237,6 +240,7 @@ export function VolumeView(painter) {
         backgroundSurfaces.forEach(surface => {
           surface.setInputData(data);     
           renderer.addActor(surface.getActor());
+          renderer.addActor(surface.getHighlight().getActor());
         });
       }
     },