Skip to content

Conversation

@GuillaumeFavelier
Copy link
Contributor

This PR fixes the issue with picking in _TimeViewer when the mouse wheel event is the first mouse button interaction.

Closes #7534

@hoechenberger
Copy link
Member

@GuillaumeFavelier Doesn't fix things for me…

Platform:      macOS-10.15.4-x86_64-i386-64bit
Python:        3.8.2 | packaged by conda-forge | (default, Mar 23 2020, 17:55:48)  [Clang 9.0.1 ]
Executable:    /Users/hoechenberger/miniconda3/envs/mne-dev-new/bin/python
CPU:           i386: 8 cores
Memory:        16.0 GB

mne:           0.21.dev0
numpy:         1.18.1 {blas=blas, lapack=blas}
scipy:         1.4.1
matplotlib:    3.2.1 {backend=MacOSX}

sklearn:       0.22.2.post1
numba:         Not found
nibabel:       3.0.2
cupy:          Not found
pandas:        1.0.3
dipy:          1.1.0
mayavi:        4.7.1 {qt_api=pyqt5, PyQt5=5.12.3}
pyvista:       0.24.0
vtk:           8.2.0

@GuillaumeFavelier GuillaumeFavelier changed the title Fix mouse wheel event in _TimeViewer WIP: Fix mouse wheel event in _TimeViewer Apr 6, 2020
@GuillaumeFavelier
Copy link
Contributor Author

Thanks for reporting. I will try something else.

@codecov
Copy link

codecov bot commented Apr 6, 2020

Codecov Report

Merging #7563 into master will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##           master    #7563   +/-   ##
=======================================
  Coverage   90.12%   90.13%           
=======================================
  Files         452      452           
  Lines       82800    82876   +76     
  Branches    13083    13101   +18     
=======================================
+ Hits        74626    74697   +71     
- Misses       5349     5350    +1     
- Partials     2825     2829    +4     

@GuillaumeFavelier
Copy link
Contributor Author

I improved the button press logic. How is it now?

@agramfort
Copy link
Member

@hoechenberger I let you do the first feedback / pass on @GuillaumeFavelier 's PRs ok for you?

@hoechenberger
Copy link
Member

@GuillaumeFavelier I have to apologize, I tested again and 30d44ea does already fix it for me!! I'm not sure what happened when I tried this out yesterday, maybe I forgot to reload mne / restart my Python interpreter after switching branches… But yes, you already fixed it yesterday :S

@GuillaumeFavelier
Copy link
Contributor Author

Let's go back on 30d44ea then 👍

@GuillaumeFavelier GuillaumeFavelier changed the title WIP: Fix mouse wheel event in _TimeViewer MRG: Fix mouse wheel event in _TimeViewer Apr 7, 2020
Copy link
Member

@hoechenberger hoechenberger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@larsoner larsoner merged commit 4aba0b7 into mne-tools:master Apr 7, 2020
larsoner pushed a commit that referenced this pull request Apr 7, 2020
* Fix mouse wheel exploit

* Improve mouse button check

* Revert "Improve mouse button check"

This reverts commit df58d83.
larsoner added a commit to larsoner/mne-python that referenced this pull request Apr 10, 2020
* upstream/master: (1522 commits)
  FIX: Show bug
  MRG, FIX: Datetime call in gdf 2.x age calculation (mne-tools#7581)
  DOC: Simplify Darwin installation (mne-tools#7584)
  MRG, ENH: Allow picking without preload (mne-tools#7507)
  DOC: Document anonymization better (mne-tools#7587)
  Rework _Brain show (mne-tools#7580)
  DOC: Fixes in tutorial (mne-tools#7579)
  ENH: muscle artifact detection (mne-tools#7407)
  MRG: Remove toolbars in PyVista plotter (mne-tools#7572)
  WIP: Deregister plotter from the figure list in close() (mne-tools#7573)
  MRG: Fix mouse wheel event in _TimeViewer (mne-tools#7563)
  FIX: Fix toggle all (mne-tools#7567)
  MRG, FIX: parallel n_jobs check (mne-tools#7566)
  Rename artifact detection to movement detection (mne-tools#7569)
  ENH: Update spelling check [ci skip] (mne-tools#7565)
  MRG, ENH: Dont require preload for raw resample (mne-tools#7508)
  MRG: Add interpolation for NIRS signals (mne-tools#7428)
  WIP: Add temporal derivative distribution repair algorithm (mne-tools#7556)
  DOC: fix link in docstr [skip ci] (mne-tools#7562)
  ENH: Custom figure title when plotting Dipole locations (mne-tools#7558)
  ...
@GuillaumeFavelier GuillaumeFavelier deleted the fix_time_viewer_wheel_picking branch June 11, 2020 09:43
larsoner added a commit to larsoner/mne-python that referenced this pull request Apr 25, 2023
* upstream/master: (1522 commits)
  FIX: Show bug
  MRG, FIX: Datetime call in gdf 2.x age calculation (mne-tools#7581)
  DOC: Simplify Darwin installation (mne-tools#7584)
  MRG, ENH: Allow picking without preload (mne-tools#7507)
  DOC: Document anonymization better (mne-tools#7587)
  Rework _Brain show (mne-tools#7580)
  DOC: Fixes in tutorial (mne-tools#7579)
  ENH: muscle artifact detection (mne-tools#7407)
  MRG: Remove toolbars in PyVista plotter (mne-tools#7572)
  WIP: Deregister plotter from the figure list in close() (mne-tools#7573)
  MRG: Fix mouse wheel event in _TimeViewer (mne-tools#7563)
  FIX: Fix toggle all (mne-tools#7567)
  MRG, FIX: parallel n_jobs check (mne-tools#7566)
  Rename artifact detection to movement detection (mne-tools#7569)
  ENH: Update spelling check [ci skip] (mne-tools#7565)
  MRG, ENH: Dont require preload for raw resample (mne-tools#7508)
  MRG: Add interpolation for NIRS signals (mne-tools#7428)
  WIP: Add temporal derivative distribution repair algorithm (mne-tools#7556)
  DOC: fix link in docstr [skip ci] (mne-tools#7562)
  ENH: Custom figure title when plotting Dipole locations (mne-tools#7558)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

If first interaction with PyVista plot is a zoom action, a sphere is placed on the brain

4 participants