Refactor

Author: GuillaumeFavelier

mne/viz/_brain/_brain.py

@@ -2989,6 +2989,50 @@ def _save_movie(self, filename, time_dilation=4., tmin=None, tmax=None,
             kwargs['bitrate'] = bitrate
         imageio.mimwrite(filename, images, **kwargs)
 
+    def _save_movie_tv(self, filename, time_dilation=4., tmin=None, tmax=None,
+                       framerate=24, interpolation=None, codec=None,
+                       bitrate=None, callback=None, time_viewer=False,
+                       **kwargs):
+        def frame_callback(frame, n_frames):
+            if frame == n_frames:
+                # On the ImageIO step
+                self.status_msg.set_value(
+                    "Saving with ImageIO: %s"
+                    % filename
+                )
+                self.status_msg.show()
+                self.status_progress.hide()
+                self._renderer._status_bar_update()
+            else:
+                self.status_msg.set_value(
+                    "Rendering images (frame %d / %d) ..."
+                    % (frame + 1, n_frames)
+                )
+                self.status_msg.show()
+                self.status_progress.show()
+                self.status_progress.set_range([0, n_frames - 1])
+                self.status_progress.set_value(frame)
+                self.status_progress.update()
+            self.status_msg.update()
+            self._renderer._status_bar_update()
+
+        # set cursor to busy
+        default_cursor = self._renderer._window_get_cursor()
+        self._renderer._window_set_cursor(
+            self._renderer._window_new_cursor("WaitCursor"))
+
+        try:
+            self._save_movie(
+                filename=filename,
+                time_dilation=(1. / self.playback_speed),
+                callback=frame_callback,
+                **kwargs
+            )
+        except (Exception, KeyboardInterrupt):
+            warn('Movie saving aborted:\n' + traceback.format_exc())
+        finally:
+            self._renderer._window_set_cursor(default_cursor)
+
     @fill_doc
     def save_movie(self, filename, time_dilation=4., tmin=None, tmax=None,
                    framerate=24, interpolation=None, codec=None,
@@ -3042,73 +3086,10 @@ def save_movie(self, filename, time_dilation=4., tmin=None, tmax=None,
         dialog : object
             The opened dialog is returned for testing purpose only.
         """
-        if self.time_viewer:
-            if filename is None:
-                try:
-                    from pyvista.plotting.qt_plotting import FileDialog
-                except ImportError:
-                    from pyvistaqt.plotting import FileDialog
-                self.status_msg.set_value("Choose movie path ...")
-                self.status_msg.show()
-                self.status_progress.set_value(0)
-
-                def _post_setup(unused):
-                    del unused
-                    self.status_msg.hide()
-                    self.status_progress.hide()
-
-                dialog = FileDialog(
-                    self.plotter.app_window,
-                    callback=partial(self._save_movie, **kwargs)
-                )
-                dialog.setDirectory(os.getcwd())
-                dialog.finished.connect(_post_setup)
-                return dialog
-            else:
-                def frame_callback(frame, n_frames):
-                    if frame == n_frames:
-                        # On the ImageIO step
-                        self.status_msg.set_value(
-                            "Saving with ImageIO: %s"
-                            % filename
-                        )
-                        self.status_msg.show()
-                        self.status_progress.hide()
-                        self._renderer._status_bar_update()
-                    else:
-                        self.status_msg.set_value(
-                            "Rendering images (frame %d / %d) ..."
-                            % (frame + 1, n_frames)
-                        )
-                        self.status_msg.show()
-                        self.status_progress.show()
-                        self.status_progress.forward(
-                            "setRange", 0, n_frames - 1)
-                        self.status_progress.set_value(frame)
-                        self.status_progress.update()
-                    self.status_msg.update()
-                    self._renderer._status_bar_update()
-
-                # set cursor to busy
-                default_cursor = self._renderer._window_get_cursor()
-                self._renderer._window_set_cursor(
-                    self._renderer._window_new_cursor("WaitCursor"))
-
-                try:
-                    self._save_movie(
-                        filename=filename,
-                        time_dilation=(1. / self.playback_speed),
-                        callback=frame_callback,
-                        **kwargs
-                    )
-                except (Exception, KeyboardInterrupt):
-                    warn('Movie saving aborted:\n' + traceback.format_exc())
-                finally:
-                    self._renderer._window_set_cursor(default_cursor)
-        else:
-            self._save_movie(filename, time_dilation, tmin, tmax,
-                             framerate, interpolation, codec,
-                             bitrate, callback, time_viewer, **kwargs)
+        func = self._save_movie_tv if self.time_viewer else self._save_movie
+        func(filename, time_dilation, tmin, tmax,
+             framerate, interpolation, codec,
+             bitrate, callback, time_viewer, **kwargs)
 
     def _make_movie_frames(self, time_dilation, tmin, tmax, framerate,
                            interpolation, callback, time_viewer):

mne/viz/backends/_abstract.py

@@ -603,6 +603,10 @@ def set_value(self, value):
     def get_value(self):
         pass
 
+    @abstractmethod
+    def set_range(self, rng):
+        pass
+
     @abstractmethod
     def show(self):
         pass
@@ -615,10 +619,6 @@ def hide(self):
     def update(self, repaint=True):
         pass
 
-    def forward(self, name, *args, **kwargs):
-        if hasattr(self._widget, name):
-            getattr(self._widget, name)(*args, **kwargs)
-
 
 class _AbstractMplInterface(ABC):
     @abstractmethod

mne/viz/backends/_notebook.py

@@ -7,7 +7,7 @@
 from contextlib import contextmanager
 from IPython.display import display
 from ipywidgets import (Button, Dropdown, FloatSlider, FloatText, HBox,
-                        IntSlider, IntText, Text, VBox)
+                        IntSlider, IntText, Text, VBox, IntProgress)
 
 from ..utils import _generate_default_filename
 from ...fixes import nullcontext
@@ -218,7 +218,9 @@ def _status_bar_add_label(self, value, stretch=0):
         return _IpyWidget(widget)
 
     def _status_bar_add_progress_bar(self, stretch=0):
-        pass
+        widget = IntProgress()
+        self._layout_add_widget(self._status_bar_layout, widget)
+        return _IpyWidget(widget)
 
     def _status_bar_update(self):
         pass
@@ -300,6 +302,10 @@ def set_value(self, value):
     def get_value(self):
         return self._widget.value
 
+    def set_range(self, rng):
+        self._widget.min = rng[0]
+        self._widget.max = rng[1]
+
     def show(self):
         self._widget.layout.visibility = "visible"
 

mne/viz/backends/_qt.py

@@ -482,6 +482,9 @@ def get_value(self):
         elif hasattr(self._widget, "text"):
             return self._widget.text()
 
+    def set_range(self, rng):
+        self._widget.setRange(rng[0], rng[1])
+
     def show(self):
         self._widget.show()