From f44e617a061f250013751eb83a7939c68320921c Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Thu, 28 Oct 2021 14:18:24 +0200 Subject: [PATCH 1/4] fix --- mne/gui/_coreg.py | 3 ++- mne/gui/tests/test_coreg_gui.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mne/gui/_coreg.py b/mne/gui/_coreg.py index 7637b6dd4b4..e90adb3c792 100644 --- a/mne/gui/_coreg.py +++ b/mne/gui/_coreg.py @@ -146,6 +146,7 @@ def _get_default(var, val): subjects_dir = get_subjects_dir( subjects_dir=subjects_dir, raise_error=True) subject = _get_default(subject, self._get_subjects(subjects_dir)[0]) + lock_fids = info is not None # setup the window self._renderer = _get_renderer( @@ -182,8 +183,8 @@ def _get_default(var, val): # once the docks are initialized self._set_current_fiducial(self._defaults["fiducial"]) - self._set_lock_fids(self._defaults["lock_fids"]) self._set_scale_mode(self._defaults["scale_mode"]) + self._set_lock_fids(lock_fids) if trans is not None: self._load_trans(trans) diff --git a/mne/gui/tests/test_coreg_gui.py b/mne/gui/tests/test_coreg_gui.py index b36f2c5e860..01f5de62eda 100644 --- a/mne/gui/tests/test_coreg_gui.py +++ b/mne/gui/tests/test_coreg_gui.py @@ -377,8 +377,9 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): tempdir = str(tmpdir) config = get_config(home_dir=os.environ.get('_MNE_FAKE_HOME_DIR')) tmp_trans = op.join(tempdir, 'tmp-trans.fif') - coreg = coregistration(subject='sample', subjects_dir=subjects_dir, - trans=fname_trans) + coreg = coregistration(inst=None, subject='sample', + subjects_dir=subjects_dir, trans=fname_trans) + assert not coreg._lock_fids coreg._reset_fiducials() coreg.close() coreg = coregistration(inst=raw_path, subject='sample', @@ -391,7 +392,6 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): coreg._on_button_press(vtk_picker, None) coreg._on_pick(vtk_picker, None) coreg._on_button_release(vtk_picker, None) - coreg._set_lock_fids(True) assert coreg._lock_fids coreg._on_pick(vtk_picker, None) # also pick when locked coreg._set_lock_fids(False) From 87f557ea30f1fa1169acc216aa62364332cbc7a3 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Thu, 28 Oct 2021 14:32:58 +0200 Subject: [PATCH 2/4] simplify diff --- mne/gui/_coreg.py | 3 +-- mne/gui/tests/test_coreg_gui.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mne/gui/_coreg.py b/mne/gui/_coreg.py index e90adb3c792..4e76e0ba3bf 100644 --- a/mne/gui/_coreg.py +++ b/mne/gui/_coreg.py @@ -146,7 +146,6 @@ def _get_default(var, val): subjects_dir = get_subjects_dir( subjects_dir=subjects_dir, raise_error=True) subject = _get_default(subject, self._get_subjects(subjects_dir)[0]) - lock_fids = info is not None # setup the window self._renderer = _get_renderer( @@ -184,7 +183,7 @@ def _get_default(var, val): # once the docks are initialized self._set_current_fiducial(self._defaults["fiducial"]) self._set_scale_mode(self._defaults["scale_mode"]) - self._set_lock_fids(lock_fids) + self._set_lock_fids(info is not None) if trans is not None: self._load_trans(trans) diff --git a/mne/gui/tests/test_coreg_gui.py b/mne/gui/tests/test_coreg_gui.py index 01f5de62eda..ca66dbbd5bf 100644 --- a/mne/gui/tests/test_coreg_gui.py +++ b/mne/gui/tests/test_coreg_gui.py @@ -377,7 +377,7 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): tempdir = str(tmpdir) config = get_config(home_dir=os.environ.get('_MNE_FAKE_HOME_DIR')) tmp_trans = op.join(tempdir, 'tmp-trans.fif') - coreg = coregistration(inst=None, subject='sample', + coreg = coregistration(subject='sample', subjects_dir=subjects_dir, trans=fname_trans) assert not coreg._lock_fids coreg._reset_fiducials() From a8b662cf70db50afabed24ec42cd45fc9551311f Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Thu, 28 Oct 2021 14:34:09 +0200 Subject: [PATCH 3/4] simplify diff --- mne/gui/tests/test_coreg_gui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mne/gui/tests/test_coreg_gui.py b/mne/gui/tests/test_coreg_gui.py index ca66dbbd5bf..11f444d1b73 100644 --- a/mne/gui/tests/test_coreg_gui.py +++ b/mne/gui/tests/test_coreg_gui.py @@ -377,8 +377,8 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): tempdir = str(tmpdir) config = get_config(home_dir=os.environ.get('_MNE_FAKE_HOME_DIR')) tmp_trans = op.join(tempdir, 'tmp-trans.fif') - coreg = coregistration(subject='sample', - subjects_dir=subjects_dir, trans=fname_trans) + coreg = coregistration(subject='sample', subjects_dir=subjects_dir, + trans=fname_trans) assert not coreg._lock_fids coreg._reset_fiducials() coreg.close() From eaa22761e6ed31e21071eb2f1e82bf1975e7b436 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Thu, 28 Oct 2021 14:44:28 +0200 Subject: [PATCH 4/4] update testing --- mne/gui/tests/test_coreg_gui.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mne/gui/tests/test_coreg_gui.py b/mne/gui/tests/test_coreg_gui.py index 11f444d1b73..f9d8c0250c1 100644 --- a/mne/gui/tests/test_coreg_gui.py +++ b/mne/gui/tests/test_coreg_gui.py @@ -377,27 +377,36 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): tempdir = str(tmpdir) config = get_config(home_dir=os.environ.get('_MNE_FAKE_HOME_DIR')) tmp_trans = op.join(tempdir, 'tmp-trans.fif') + coreg = coregistration(subject='sample', subjects_dir=subjects_dir, trans=fname_trans) assert not coreg._lock_fids coreg._reset_fiducials() coreg.close() + coreg = coregistration(inst=raw_path, subject='sample', subjects_dir=subjects_dir) coreg._set_fiducials_file(fid_fname) assert coreg._fiducials_file == fid_fname + + # unlock fiducials + assert coreg._lock_fids + coreg._set_lock_fids(False) + assert not coreg._lock_fids + # picking vtk_picker = TstVTKPicker(coreg._surfaces['head'], 0, (0, 0)) coreg._on_mouse_move(vtk_picker, None) coreg._on_button_press(vtk_picker, None) coreg._on_pick(vtk_picker, None) coreg._on_button_release(vtk_picker, None) - assert coreg._lock_fids coreg._on_pick(vtk_picker, None) # also pick when locked - coreg._set_lock_fids(False) - assert not coreg._lock_fids + + # lock fiducials coreg._set_lock_fids(True) assert coreg._lock_fids + + # fitting assert coreg._nasion_weight == 10. coreg._set_point_weight(11., 'nasion') assert coreg._nasion_weight == 11. @@ -408,9 +417,12 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): assert coreg._coreg._extra_points_filter is not None coreg._reset_omit_hsp_filter() assert coreg._coreg._extra_points_filter is None + assert coreg._grow_hair == 0 coreg._set_grow_hair(0.1) assert coreg._grow_hair == 0.1 + + # visualization assert coreg._orient_glyphs == \ (config.get('MNE_COREG_ORIENT_TO_SURFACE', '') == 'true') assert coreg._hpi_coils @@ -423,6 +435,8 @@ def test_coreg_gui_pyvista(tmpdir, renderer_interactive_pyvistaqt): assert not coreg._head_transparency coreg._set_head_transparency(True) assert coreg._head_transparency + coreg._save_trans(tmp_trans) assert op.isfile(tmp_trans) + coreg.close()