hopefully fix last test, add renderer test

Author: alexrockhill

doc/conf.py

@@ -318,7 +318,7 @@ def __call__(self, gallery_conf, fname, when):
         except ImportError:
             MNEQtBrowser = None
         from mne.viz.backends.renderer import backend
-        _Renderer = backend._Rnderer if backend is not None else None
+        _Renderer = backend._Renderer if backend is not None else None
         reset_warnings(gallery_conf, fname)
         # in case users have interactive mode turned on in matplotlibrc,
         # turn it off here (otherwise the build can be very slow)

mne/viz/backends/_abstract.py

@@ -813,7 +813,7 @@ def _add_widget(self, widget, row=None, col=None):
         pass
 
 
-class _AbstractApplication(ABC):
+class _AbstractAppWindow(ABC):
 
     def __init__(self, size=None, fullscreen=False):
         pass

mne/viz/backends/_notebook.py

@@ -18,7 +18,7 @@
                         FloatSlider, BoundedFloatText, jsdlink)
 from ipyevents import Event
 
-from ._abstract import (_AbstractApplication, _AbstractHBoxLayout,
+from ._abstract import (_AbstractAppWindow, _AbstractHBoxLayout,
                         _AbstractVBoxLayout, _AbstractGridLayout,
                         _AbstractWidget, _AbstractCanvas,
                         _AbstractPopup, _AbstractLabel,
@@ -114,7 +114,7 @@ def _trigger_keypress(self, key):
         self._callback(key)
         # TO DO: actually simulate the keypress, see code below not yet working
         '''
-        # trigger to a vbox which will be present because the _Application is
+        # trigger to a vbox which will be present because the _AppWindow is
         # a vbox, this doesn't trigger specifically for the widget but this
         # is just for testing
         key_str = key.title() if len(key) > 1 else key
@@ -672,10 +672,10 @@ def _set_size(self, width=None, height=None):
             self.layout.height = height
 
 
-class _Application(_AbstractApplication, _Widget, VBox, metaclass=_BaseWidget):
+class _AppWindow(_AbstractAppWindow, _Widget, VBox, metaclass=_BaseWidget):
 
     def __init__(self, size=None, fullscreen=False):
-        _AbstractApplication.__init__(self)
+        _AbstractAppWindow.__init__(self)
         _Widget.__init__(self)
         VBox.__init__(self, **_BASE_KWARGS)
 
@@ -715,7 +715,7 @@ def _close(self):
         clear_output()
 
 
-class _Renderer(_PyVistaRenderer):
+class _3DRenderer(_PyVistaRenderer):
     _kind = 'notebook'
 
     def __init__(self, *args, **kwargs):
@@ -1422,9 +1422,9 @@ def set_shortcut(self, shortcut):
         pass
 
 
-class _Rnderer(_PyVistaRenderer, _IpyDock, _IpyToolBar, _IpyMenuBar,
-               _IpyStatusBar, _IpyWindow, _IpyPlayback, _IpyDialog,
-               _IpyKeyPress):
+class _Renderer(_PyVistaRenderer, _IpyDock, _IpyToolBar, _IpyMenuBar,
+                _IpyStatusBar, _IpyWindow, _IpyPlayback, _IpyDialog,
+                _IpyKeyPress):
     _kind = 'notebook'
 
     def __init__(self, *args, **kwargs):

mne/viz/backends/_qt.py

@@ -34,7 +34,7 @@
 from ._pyvista import _PyVistaRenderer
 from ._pyvista import (_close_all, _close_3d_figure, _check_3d_figure,  # noqa: F401,E501 analysis:ignore
                        _set_3d_view, _set_3d_title, _take_3d_screenshot)  # noqa: F401,E501 analysis:ignore
-from ._abstract import (_AbstractApplication, _AbstractHBoxLayout,
+from ._abstract import (_AbstractAppWindow, _AbstractHBoxLayout,
                         _AbstractVBoxLayout, _AbstractGridLayout,
                         _AbstractWidget, _AbstractCanvas,
                         _AbstractPopup, _AbstractLabel, _AbstractButton,
@@ -634,12 +634,12 @@ def __init__(self, parent=None, title=None, size=None):
         self.setAttribute(Qt.WA_ShowWithoutActivating, True)
 
 
-class _Application(_AbstractApplication, _MNEMainWindow, _Widget,
-                   metaclass=_BaseWidget):
+class _AppWindow(_AbstractAppWindow, _MNEMainWindow, _Widget,
+                 metaclass=_BaseWidget):
 
     def __init__(self, size=None, fullscreen=False):
         self._app = _init_mne_qtapp()
-        _AbstractApplication.__init__(self)
+        _AbstractAppWindow.__init__(self)
         _MNEMainWindow.__init__(self, size=size)
         _Widget.__init__(self)
 
@@ -719,7 +719,7 @@ def _close(self):
         self.close()
 
 
-class _Renderer(_PyVistaRenderer):
+class _3DRenderer(_PyVistaRenderer):
     _kind = 'qt'
 
     def __init__(self, *args, **kwargs):
@@ -1614,9 +1614,9 @@ def set_shortcut(self, shortcut):
         self._action.setShortcut(shortcut)
 
 
-class _Rnderer(_PyVistaRenderer, _QtDock, _QtToolBar, _QtMenuBar,
-               _QtStatusBar, _QtWindow, _QtPlayback, _QtDialog,
-               _QtKeyPress):
+class _Renderer(_PyVistaRenderer, _QtDock, _QtToolBar, _QtMenuBar,
+                _QtStatusBar, _QtWindow, _QtPlayback, _QtDialog,
+                _QtKeyPress):
     _kind = 'qt'
 
     def __init__(self, *args, **kwargs):

mne/viz/backends/renderer.py

@@ -40,7 +40,7 @@ def _get_backend():
 
 def _get_renderer(*args, **kwargs):
     _get_3d_backend()
-    return backend._Rnderer(*args, **kwargs)
+    return backend._Renderer(*args, **kwargs)
 
 
 def _check_3d_backend_name(backend_name):

mne/viz/backends/tests/test_abstract.py

@@ -15,8 +15,11 @@ def _do_widget_tests(backend):
     def callback(x=None):
         widget_checks.add('click' if x is None else x)
 
-    window = backend._Application()
+    window = backend._AppWindow()
     central_layout = backend._VBoxLayout(scroll=(500, 500))
+    renderer = backend._3DRenderer(name='test', size=(200, 200))
+    renderer.sphere([0, 0, 0], 'red', 1)
+    central_layout._add_widget(renderer.plotter)
     canvas = backend._Canvas(5, 5, 96)
     canvas.ax.plot(range(10), range(10), label='plot')
     central_layout._add_widget(canvas)

mne/viz/backends/tests/test_renderer.py

@@ -41,7 +41,7 @@ def test_3d_functions(renderer):
     """Test figure management functions."""
     fig = renderer.create_3d_figure((300, 300))
     assert isinstance(fig, Figure3D)
-    wrap_renderer = renderer.backend._Rnderer(fig=fig)
+    wrap_renderer = renderer.backend._Renderer(fig=fig)
     wrap_renderer.sphere(np.array([0., 0., 0.]), 'w', 1.)
     renderer.backend._check_3d_figure(fig)
     renderer.set_3d_view(figure=fig, azimuth=None, elevation=None,