fix: solve some visualization errors + homogenize parameters offscreen-->off_screen

Author: elenafuengar

wakis/gridFIT3D.py

@@ -583,7 +583,8 @@ def _assign_colors(self):
         for key in self.stl_solids:
             mat = self.stl_materials[key]
             if type(mat) is str:
-                self.stl_colors[key] = mat
+                _color = material_colors.get(mat, material_colors['other'])
+                self.stl_colors[key] = _color
             elif len(mat) == 2:
                 if mat[0] is np.inf:  #eps_r
                     self.stl_colors[key] = material_colors['pec']
@@ -615,7 +616,7 @@ def _add_logo_widget(self, pl):
 
     def plot_solids(self, bounding_box=False, show_grid=False, anti_aliasing=None,
                     opacity=1.0, specular=0.5, smooth_shading=False,
-                    offscreen=False, **kwargs):
+                    off_screen=False, **kwargs):
         """
         Generates a 3D visualization of the imported STL geometries using PyVista.
 
@@ -678,15 +679,15 @@ def plot_solids(self, bounding_box=False, show_grid=False, anti_aliasing=None,
         if show_grid:
             pl.add_mesh(self.grid, style='wireframe', color='grey', opacity=0.3, name='grid')
 
-        if offscreen:
+        if off_screen:
             pl.export_html('grid_plot_solids.html')
         else:
             pl.show()
 
     def plot_stl_mask(self, stl_solid, cmap='viridis', bounding_box=True, show_grid=True,
                       add_stl='all', stl_opacity=0., stl_colors=None,
                       xmax=None, ymax=None, zmax=None,
-                      anti_aliasing='ssaa', smooth_shading=False, offscreen=False):
+                      anti_aliasing='ssaa', smooth_shading=False, off_screen=False):
 
         """
         Interactive 3D visualization of the structured grid mask and imported STL geometries.
@@ -728,8 +729,8 @@ def plot_stl_mask(self, stl_solid, cmap='viridis', bounding_box=True, show_grid=
             maximum domain extent.
         anti_aliasing : {'ssaa', 'fxaa', None}, default 'ssaa'
             Anti-aliasing mode passed to `pl.enable_anti_aliasing`.
-        offscreen : bool, default False
-            If True, render offscreen and export the scene to
+        off_screen : bool, default False
+            If True, render off-screen and export the scene to
             ``grid_stl_mask_<stl_solid>.html``. If False, open an interactive window.
 
         Notes
@@ -848,13 +849,13 @@ def update_clip(val, axis="x"):
             pl.add_mesh(pv.Box(bounds=(self.xmin, self.xmax, self.ymin, self.ymax, self.zmin, self.zmax)),
             style="wireframe", color="black", line_width=2, name="domain_box")
 
-        if offscreen:
+        if off_screen:
             pl.export_html(f'grid_stl_mask_{stl_solid}.html')
         else:
             pl.show()
 
     def inspect(self, add_stl=None, stl_opacity=0.5, stl_colors=None,
-                anti_aliasing='ssaa', smooth_shading=True, offscreen=False):
+                anti_aliasing='ssaa', smooth_shading=True, off_screen=False):
 
         '''3D plot using pyvista to visualize
         the structured grid and
@@ -927,7 +928,7 @@ def clip(widget):
         pl.enable_3_lights()
         pl.enable_anti_aliasing(anti_aliasing)
 
-        if offscreen:
+        if off_screen:
             pl.export_html('grid_inspect.html')
         else:
             pl.show()

wakis/plotting.py

@@ -826,7 +826,7 @@ def inspect(self, wake=None, window_size=None, off_screen=False,
             print('[!] plot3D is not supported when `use_mpi=True`')
             return
         if wake is not None:
-            self.solver.wake = wake
+            self.wake = wake
 
         # Initialize plotter
         pl = pv.Plotter(window_size=window_size)
@@ -905,7 +905,7 @@ def master_cb(v):
         for i, name in enumerate(solid_state):
             y = cy - (i + 2) * dy
             _color_on = self.stl_colors.get(name, color_on)
-            if _color_on == 'white' or _color_on == [1.0, 1.0, 1.0]:
+            if str(_color_on) == 'white' or list(_color_on) == [1.0, 1.0, 1.0]:
                 _color_on = 'gray'
             btn = pl.add_checkbox_button_widget(make_cb(name), value=False,
                                                 color_on=_color_on,
@@ -926,9 +926,9 @@ def master_cb(v):
                                direction=(0, 0, 1), height=z_height, radius=radius)
 
             beam_actor = pl.add_mesh(beam, color="orange", name="beam", opacity=1.0)
-            beam_actor.SetVisibility(False)
+            beam_actor.SetVisibility(True)
             path_actor = pl.add_mesh(path, color="blue", name="integration_path", opacity=1.0)
-            path_actor.SetVisibility(False)
+            path_actor.SetVisibility(True)
 
             bx = int(w - box - 200 * ui)
             to = box + pad
@@ -938,12 +938,12 @@ def beam_cb(v):
             def path_cb(v):
                 path_actor.SetVisibility(bool(v))
 
-            pl.add_checkbox_button_widget(path_cb, value=False,
+            pl.add_checkbox_button_widget(path_cb, value=True,
                                         color_off=color_off, color_on="blue",
                                         position=(bx, cy + dy), size=box)
             pl.add_text("Integration path", position=(bx + to, cy + dy), font_size=font)
 
-            pl.add_checkbox_button_widget(beam_cb, value=False,
+            pl.add_checkbox_button_widget(beam_cb, value=True,
                                         color_off=color_off, color_on="orange",
                                         position=(bx, cy), size=box)
             pl.add_text("Beam", position=(bx + to, cy), font_size=font)