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
6 changes: 3 additions & 3 deletions mne/viz/_brain/_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -2199,16 +2199,16 @@ def show_view(self, view=None, roll=None, distance=None, row=0, col=0,
if distance is not None:
view.update(distance=distance)
self._renderer.subplot(row, col)
self._renderer.set_camera(**view)
self._renderer.reset_camera()
self._renderer.set_camera(**view, reset_camera=False)
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])
self._renderer.set_camera(**views_dicts[h][v],
reset_camera=False)

def save_image(self, filename, mode='rgb'):
"""Save view from all panels to disk.
Expand Down
5 changes: 3 additions & 2 deletions mne/viz/backends/_pysurfer_mayavi.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def close(self):
_close_3d_figure(figure=self.fig)

def set_camera(self, azimuth=None, elevation=None, distance=None,
focalpoint=None, roll=None):
focalpoint=None, roll=None, reset_camera=None):
_set_3d_view(figure=self.fig, azimuth=azimuth,
elevation=elevation, distance=distance,
focalpoint=focalpoint, roll=roll)
Expand Down Expand Up @@ -450,7 +450,8 @@ def _close_all():
mlab.close(all=True)


def _set_3d_view(figure, azimuth, elevation, focalpoint, distance, roll=None):
def _set_3d_view(figure, azimuth, elevation, focalpoint, distance, roll=None,
reset_camera=True):
from mayavi import mlab
with warnings.catch_warnings(record=True): # traits
with SilenceStdout():
Expand Down
11 changes: 7 additions & 4 deletions mne/viz/backends/_pyvista.py
Original file line number Diff line number Diff line change
Expand Up @@ -609,9 +609,10 @@ def close(self):
_close_3d_figure(figure=self.figure)

def set_camera(self, azimuth=None, elevation=None, distance=None,
focalpoint=None, roll=None):
focalpoint=None, roll=None, reset_camera=True):
_set_3d_view(self.figure, azimuth=azimuth, elevation=elevation,
distance=distance, focalpoint=focalpoint, roll=roll)
distance=distance, focalpoint=focalpoint, roll=roll,
reset_camera=reset_camera)

def reset_camera(self):
self.plotter.reset_camera()
Expand Down Expand Up @@ -759,9 +760,11 @@ def _get_camera_direction(focalpoint, position):
return r, theta, phi, focalpoint


def _set_3d_view(figure, azimuth, elevation, focalpoint, distance, roll=None):
def _set_3d_view(figure, azimuth, elevation, focalpoint, distance, roll=None,
reset_camera=True):
position = np.array(figure.plotter.camera_position[0])
figure.plotter.reset_camera()
if reset_camera:
figure.plotter.reset_camera()
if focalpoint is None:
focalpoint = np.array(figure.plotter.camera_position[1])
r, theta, phi, fp = _get_camera_direction(focalpoint, position)
Expand Down
Loading