Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added mne/icons/mne-circle-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions mne/icons/mne.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<file alias="visibility_off.svg">visibility_off-black-18dp.svg</file>
<file alias="help.svg">help-black-18dp.svg</file>
<file alias="play.svg">play-black-18dp.svg</file>
<file alias="reset.svg">reset-black-18dp.svg</file>
<file alias="pause.svg">pause-black-18dp.svg</file>
<file alias="scale.svg">scale-black-18dp.svg</file>
<file alias="restore.svg">restore-black-18dp.svg</file>
Expand Down
1 change: 1 addition & 0 deletions mne/icons/reset-black-18dp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
703 changes: 368 additions & 335 deletions mne/icons/resources.py

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion mne/viz/_brain/_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ def __init__(self, subject_id, hemi, surf, title=None,
bgcolor=background,
shape=shape,
fig=figure)

for h in self._hemis:
# Initialize a Surface object as the geometry
geo = Surface(subject_id, h, surf, subjects_dir, offset,
Expand Down Expand Up @@ -299,6 +298,9 @@ def __init__(self, subject_id, hemi, surf, title=None,
for ri, ci, v in self._iter_views(h):
self.show_view(v, row=ri, col=ci, hemi=h)

if surf == 'flat':
self._renderer.set_interaction("rubber_band_2d")

@property
def interaction(self):
"""The interaction style."""
Expand Down Expand Up @@ -518,6 +520,7 @@ def add_data(self, array, fmin=None, fmid=None, fmax=None,
self._data['time'] = time
self._data['initial_time'] = initial_time
self._data['time_label'] = time_label
self._data['initial_time_idx'] = time_idx
self._data['time_idx'] = time_idx
self._data['transparent'] = transparent
# data specific for a hemi
Expand Down Expand Up @@ -1182,6 +1185,13 @@ def show_view(self, view=None, roll=None, distance=None, row=0, col=0,
self._renderer.reset_camera()
self._update()

def reset_view(self):
"""Reset the camera."""
for h in self._hemis:
for ri, ci, v in self._iter_views(h):
self._renderer.subplot(ri, ci)
self._renderer.set_camera(**views_dicts[h][v])

def save_image(self, filename, mode='rgb'):
"""Save view from all panels to disk.

Expand Down
16 changes: 16 additions & 0 deletions mne/viz/_brain/_timeviewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,16 @@ def toggle_playback(self, value=None):
self.brain.set_time_point(0) # first index
self._last_tick = time.time()

def reset(self):
self.brain.reset_view()
max_time = len(self.brain._data['time']) - 1
if max_time > 0:
self.time_call(
self.brain._data["initial_time_idx"],
update_widget=True,
)
self.plotter.update()

def set_playback_speed(self, speed):
self.playback_speed = speed

Expand Down Expand Up @@ -953,6 +963,7 @@ def load_icons(self):
self.icons["help"] = QIcon(":/help.svg")
self.icons["play"] = QIcon(":/play.svg")
self.icons["pause"] = QIcon(":/pause.svg")
self.icons["reset"] = QIcon(":/reset.svg")
self.icons["scale"] = QIcon(":/scale.svg")
self.icons["clear"] = QIcon(":/clear.svg")
self.icons["movie"] = QIcon(":/movie.svg")
Expand Down Expand Up @@ -982,6 +993,11 @@ def configure_tool_bar(self):
"Play/Pause",
self.toggle_playback
)
self.actions["reset"] = self.tool_bar.addAction(
self.icons["reset"],
"Reset",
self.reset
)
self.actions["scale"] = self.tool_bar.addAction(
self.icons["scale"],
"Auto-Scale",
Expand Down
1 change: 1 addition & 0 deletions mne/viz/_brain/tests/test_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ def test_brain_timeviewer(renderer_interactive, pixel_ratio):
time_viewer.toggle_playback()
time_viewer.apply_auto_scaling()
time_viewer.restore_user_scaling()
time_viewer.reset()
plt.close('all')
time_viewer.help()
assert len(plt.get_fignums()) == 1
Expand Down
13 changes: 12 additions & 1 deletion mne/viz/backends/_pyvista.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,18 @@ def scene(self):
return self.figure

def set_interaction(self, interaction):
getattr(self.plotter, f'enable_{interaction}_style')()
if interaction == "rubber_band_2d":
for renderer in self.plotter.renderers:
renderer.enable_parallel_projection()
if hasattr(self.plotter, 'enable_rubber_band_2d_style'):
self.plotter.enable_rubber_band_2d_style()
else:
style = vtk.vtkInteractorStyleRubberBand2D()
self.plotter.interactor.SetInteractorStyle(style)
else:
for renderer in self.plotter.renderers:
renderer.disable_parallel_projection()
getattr(self.plotter, f'enable_{interaction}_style')()

def polydata(self, mesh, color=None, opacity=1.0, normals=None,
backface_culling=False, scalars=None, colormap=None,
Expand Down