From c4e9cbf7af9b9b3d92ce41b148eaae3f69f82fc1 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 15:02:35 +0100 Subject: [PATCH 1/6] Fix window name --- mne/viz/_brain/_brain.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index 3ca3396c6ad..9481902ccd5 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -199,7 +199,8 @@ def __init__(self, subject_id, hemi, surf, title=None, if figure is not None and not isinstance(figure, int): _check_3d_figure(figure) - self._renderer = _get_renderer(size=fig_size, bgcolor=background, + self._renderer = _get_renderer(name=title, size=fig_size, + bgcolor=background, shape=(n_row, n_col), fig=figure) for h in self._hemis: From 01e9b07e405289af14bbf574ea2952fc94e251c2 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 15:36:21 +0100 Subject: [PATCH 2/6] Revert "Fix window name" This reverts commit c4e9cbf7af9b9b3d92ce41b148eaae3f69f82fc1. --- mne/viz/_brain/_brain.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index 9481902ccd5..3ca3396c6ad 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -199,8 +199,7 @@ def __init__(self, subject_id, hemi, surf, title=None, if figure is not None and not isinstance(figure, int): _check_3d_figure(figure) - self._renderer = _get_renderer(name=title, size=fig_size, - bgcolor=background, + self._renderer = _get_renderer(size=fig_size, bgcolor=background, shape=(n_row, n_col), fig=figure) for h in self._hemis: From 2f22bd966fa403bd391292f3f1f113a935a149d0 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 15:42:35 +0100 Subject: [PATCH 3/6] Use _set_3d_title to set the title --- mne/viz/_brain/_brain.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index 3ca3396c6ad..e6be96a0822 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -143,7 +143,8 @@ def __init__(self, subject_id, hemi, surf, title=None, foreground=None, figure=None, subjects_dir=None, views=['lateral'], offset=True, show_toolbar=False, offscreen=False, interaction=None, units='mm'): - from ..backends.renderer import _get_renderer, _check_3d_figure + from ..backends.renderer import (_get_renderer, _check_3d_figure, + _set_3d_title) from matplotlib.colors import colorConverter if interaction is not None: @@ -201,6 +202,7 @@ def __init__(self, subject_id, hemi, surf, title=None, _check_3d_figure(figure) self._renderer = _get_renderer(size=fig_size, bgcolor=background, shape=(n_row, n_col), fig=figure) + _set_3d_title(figure=self._renderer.figure, title=self._title) for h in self._hemis: # Initialize a Surface object as the geometry From 888b947e46ae766e9ff0e71d64d613af320f4342 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 15:48:12 +0100 Subject: [PATCH 4/6] Improve stability --- mne/viz/_brain/_brain.py | 3 ++- mne/viz/_brain/tests/test_brain.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index e6be96a0822..cd9c458c085 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -202,7 +202,8 @@ def __init__(self, subject_id, hemi, surf, title=None, _check_3d_figure(figure) self._renderer = _get_renderer(size=fig_size, bgcolor=background, shape=(n_row, n_col), fig=figure) - _set_3d_title(figure=self._renderer.figure, title=self._title) + if self._title is not None: + _set_3d_title(figure=self._renderer.figure, title=self._title) for h in self._hemis: # Initialize a Surface object as the geometry diff --git a/mne/viz/_brain/tests/test_brain.py b/mne/viz/_brain/tests/test_brain.py index 49501839cc9..64a64475707 100644 --- a/mne/viz/_brain/tests/test_brain.py +++ b/mne/viz/_brain/tests/test_brain.py @@ -70,7 +70,7 @@ def test_brain_init(renderer): _Brain(subject_id=subject_id, hemi='foo', surf=surf) brain = _Brain(subject_id, hemi, surf, size=(300, 300), - subjects_dir=subjects_dir) + subjects_dir=subjects_dir, title='test') brain.show_view(view=dict(azimuth=180., elevation=90.)) brain.close() From bb27aca20d9dfe5c01c8675061cc83cef04e17a0 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 17:02:08 +0100 Subject: [PATCH 5/6] Use unified renderer API --- mne/viz/_brain/_brain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index cd9c458c085..4f61189aaeb 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -203,7 +203,7 @@ def __init__(self, subject_id, hemi, surf, title=None, self._renderer = _get_renderer(size=fig_size, bgcolor=background, shape=(n_row, n_col), fig=figure) if self._title is not None: - _set_3d_title(figure=self._renderer.figure, title=self._title) + _set_3d_title(fig=self._renderer.scene(), title=self._title) for h in self._hemis: # Initialize a Surface object as the geometry From b1bb9ba2d33963a9c9a04d8823269e8decf61473 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Wed, 4 Mar 2020 17:51:07 +0100 Subject: [PATCH 6/6] Fix parameter name --- mne/viz/_brain/_brain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne/viz/_brain/_brain.py b/mne/viz/_brain/_brain.py index 4f61189aaeb..ec49db18075 100644 --- a/mne/viz/_brain/_brain.py +++ b/mne/viz/_brain/_brain.py @@ -203,7 +203,7 @@ def __init__(self, subject_id, hemi, surf, title=None, self._renderer = _get_renderer(size=fig_size, bgcolor=background, shape=(n_row, n_col), fig=figure) if self._title is not None: - _set_3d_title(fig=self._renderer.scene(), title=self._title) + _set_3d_title(figure=self._renderer.scene(), title=self._title) for h in self._hemis: # Initialize a Surface object as the geometry