WIP: Fix bugs in Brain (#8361)

GuillaumeFavelier · larsoner · larsoner · commit 35662d07f8cb · 2020-10-14T08:26:21.000-04:00
* Update _add_mesh

* Update mne/viz/backends/_pyvista.py

Co-authored-by: Eric Larson &lt;larson.eric.d@gmail.com&gt;

* Show the plotter when ready

* Remove empty line

* Fix save_movie action

* Fix show

Co-authored-by: Eric Larson &lt;larson.eric.d@gmail.com&gt;
diff --git a/mne/viz/_3d.py b/mne/viz/_3d.py
@@ -1839,7 +1839,7 @@ def _plot_stc(stc, subject, surface, hemi, colormap, time_label,
         "views": views, "alpha": brain_alpha,
     }
     if backend in ['pyvista', 'notebook']:
-        kwargs["show"] = not time_viewer
+        kwargs["show"] = False
         kwargs["view_layout"] = view_layout
     else:
         kwargs.update(_check_pysurfer_antialias(Brain))
@@ -1951,6 +1951,9 @@ def _plot_stc(stc, subject, surface, hemi, colormap, time_label,
         else:  # PyVista
             from ._brain import _TimeViewer as TimeViewer
             TimeViewer(brain, show_traces=show_traces)
+    else:
+        if not using_mayavi:
+            brain.show()
 
     return brain
 
diff --git a/mne/viz/_brain/_timeviewer.py b/mne/viz/_brain/_timeviewer.py
@@ -233,7 +233,7 @@ def frame_callback(frame, n_frames):
             self.brain.save_movie(
                 filename=filename,
                 time_dilation=(1. / self.playback_speed),
-                callback=frame_callback,
+                callback=partial(frame_callback, fname=None),
                 **kwargs
             )
         except (Exception, KeyboardInterrupt):
diff --git a/mne/viz/backends/_pyvista.py b/mne/viz/backends/_pyvista.py
@@ -22,6 +22,7 @@
 
 from .base_renderer import _BaseRenderer
 from ._utils import _get_colormap_from_array, ALLOWED_QUIVER_MODES
+from ...fixes import _get_args
 from ...utils import copy_base_doc_to_subclass_doc, _check_option
 from ...externals.decorator import decorator
 
@@ -658,6 +659,10 @@ def _add_mesh(plotter, *args, **kwargs):
         smooth_shading = kwargs.pop('smooth_shading')
     else:
         smooth_shading = True
+    # disable rendering pass for add_mesh, render()
+    # is called in show()
+    if 'render' not in kwargs and 'render' in _get_args(plotter.add_mesh):
+        kwargs['render'] = False
     actor = plotter.add_mesh(*args, **kwargs)
     if smooth_shading and 'Normals' in mesh.point_arrays:
         prop = actor.GetProperty()

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ def frame_callback(frame, n_frames):`
`233`	`233`	`self.brain.save_movie(`
`234`	`234`	`filename=filename,`
`235`	`235`	`time_dilation=(1. / self.playback_speed),`
`236`		`- callback=frame_callback,`
	`236`	`+ callback=partial(frame_callback, fname=None),`
`237`	`237`	`**kwargs`
`238`	`238`	`)`
`239`	`239`	`except (Exception, KeyboardInterrupt):`