key binding dispatch implementation #6204
Open
+4,956
−2,238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eybinding-integration
…3/napari into keybinding-integration � Conflicts: � napari/_app_model/_app.py
'kne42:keybind-contribution' * aganders3-app-model-action-manager-rebase: Finish porting layer actions to app-model with attribute-restoring callback Add labels and shapes commands - mode commands still TODO Update/fix after rebase on main Update callback name when registering command Add GeneratorCallback wrapper for generator callbacks in app-model commands. Initial refactor of image and points actions into app-model Move viewer actions callbacks back to _viewer_key_bindings.py Move actions from _viewer_key_bindings to app-model fix: add disposer for repeatable action registry feature: keep track of which app-model actions can be repeated
dalthviz
reviewed
Oct 3, 2023
This was referenced Oct 19, 2023
* main: (59 commits) Fix permission for JasonEtco/create-an-issue@v2 action (napari#6370) Ensure the conda bundle workflows have the appropriate permissions (napari#6379) Exclude the loaded property when linking two layers (napari#6377) Automatic add `maintenance` label to upgrade dependecies workflow (napari#6371) Pydantic 2 compatibility using `pydantic.v1` (napari#6358) Update `fsspec`, `imageio`, `magicgui`, `napari-console`, `npe2`, `pillow`, `tensorstore`, `xarray` (napari#6367) fix `TransformChain.__getitem__` signature (napari#6369) Fix some typing in napari._vispy (napari#6245) Fix typing in napari.utils.theme (napari#6247) Fix typing in napari.layers.base (napari#6028) Fix build wheel workflow file name (napari#6357) Fix upstream deprecation: change `np.alltrue` to `np.array_equiv` (napari#6347) Add codecov token to reduce propability of fail to upload from main branch (napari#6346) Disable ptrace protection to make pytest-pystack work (napari#6343) Update example scripts (magicgui with threads) (napari#6353) Update `dask`, `hypothesis`, `numpy`, `pillow`, `pretend`, `psutil`, `pyqt5`, `pyqt6`, `pyside6`, `superqt` (napari#6322) Add vortex optical flow example (napari#6041) Enable memory benchmarks for layers (napari#6295) Fix labeler configuration (napari#6344) Add 'raise' option back to `strict_qt` in `make_napari_viewer` (napari#6335) ...
Co-authored-by: dalthviz <16781833+dalthviz@users.noreply.github.com>
dalthviz
reviewed
Oct 26, 2023
|
|
||
| app = get_app() | ||
|
|
||
| kb = coerce_keybinding(key_bind) |
There was a problem hiding this comment.
Just in case, checking locally the error from the CI, I think adding here a call to the to_int method could help. So something like:
Suggested change
| kb = coerce_keybinding(key_bind) | |
| kb = coerce_keybinding(key_bind).to_int() |
dalthviz
reviewed
Oct 26, 2023
napari/_app_model/_app.py
Outdated
| self.keybindings.register_keybinding_rule( | ||
| entry.command, | ||
| KeyBindingRule( | ||
| primary=KeyBinding.from_str(entry.key), |
There was a problem hiding this comment.
Seems like adding a call to the to_int method here can also help with pydantic validation errors. So something like:
Suggested change
| primary=KeyBinding.from_str(entry.key), | |
| primary=KeyBinding.from_str(entry.key).to_int(), |
* main: (80 commits) Check in LabelColormap that fewer than 2**16 colors are requested (napari#6540) Fix label color shuffling by also updating colormap size (napari#6460) Add `_block_refresh()` to layers (napari#6525) MNT: Use `partial` in samples menu to avoid leaking (napari#6538) Update performance and reduce memory usage for big Labels layer in direct color mode (napari#6439) Reset single step and decimals on reset range slider in popup (napari#6523) Add copy operator to fix memory benchmarks (napari#6530) Restore quit shortcut (napari#6526) Fix problem with invalidate cache (napari#6520) [pre-commit.ci] pre-commit autoupdate (napari#6505) Pass key event from Main window to our internal mechanism (napari#6419) Typing: Fully type 5 more files (napari#6361) Do not use native dialog for reset shortcuts (napari#6493) Use views rather than CPU-based hashing for 8- and 16-bit Labels data (napari#6467) Add import lint back to CI (napari#6506) Type napari.layers.image helper sub-modules (napari#6499) Bugfix: ensure gamma and opacity are floats (napari#6498) FIX: Remove `None` default from `_remove_dock_widget` (napari#6481) Add testing_extra and optional dependencies when creating constraints (napari#6487) Run test suite with optional dependencies and fix tests when `triangle` is installed (napari#6488) ...
* main: Use blobs instead of random integers (napari#6527) Set default dtype for empty `_ImageSliceResponse` (napari#6552) Add creating image from clipboard (napari#6532) Fix check if plugin is available from conda (napari#6545) Fix generation of layer creation functions docstrings (napari#6558) Print a whole stack if throttler is not finished (napari#6549) Update `app-model`, `babel`, `coverage`, `dask`, `fsspec`, `hypothesis`, `imageio`, `ipython`, `lxml`, `magicgui`, `pandas`, `pint`, `psutil`, `pydantic`, `pyqt6`, `pytest-qt`, `tensorstore`, `tifffile`, `virtualenv`, `xarray` (napari#6478) Minimal changes for mlx (and jax) compatibility for Image layers (napari#6553) [pre-commit.ci] pre-commit autoupdate (napari#6528) Moving IntensityVisualizationMixin from _ImageBase to Image (napari#6548)
* main: [Maint] Update build_docs workflow to match napari/docs (napari#6547) Add cache to Transform calculation (napari#6536)
* main: Fix labels mapping cache by filling it with background, not 0 (napari#6580) Simplify unused parameters of Quaternion functions. (napari#6424) Add size and ndim to LayerDataProtocol (napari#6494) Fix label direct mode for installation without numba (napari#6571) Fix test in napari_builtins to remove import from conftest (napari#6568) Remove `app-model!=0.2.4` from test constraints (napari#6577) Bump mypy version and fix errors (napari#6557) Update test to work with `app-model==0.2.4` (napari#6573) Added support for features in surface layers (napari#6515)
This was referenced Jan 11, 2024
|
Hey @napari/core-devs, what do you think is needed before we can merge this? It's becoming a bit troublesome to keep this updated as new commands are added that I need to merge in. There also appears to be some random bug (currently re-running the test) but I'm not sure what it is/if it is related to this PR, anyone got ideas on what to do with it? |
|
This strange bug is unrelated and reported here #5443 I think that it could be merged just after finish 0.4.19 release. As we got last pending review it should be fast. |
|
Hi there, just in case, did a quick check locally and the only thing I noticed, regarding the shortcuts functionality from the GUI, is a curious behavior where setting the default keybinding for an action manually causes for the
|
|
As 0.4.19 is released, could you resolve conflicts? Then ping me for review. |
This was referenced Mar 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
status:
napari.utils.key_bindingsnapari._qt._qapp_model.QKeyBindingDispatcherAttrRestoreCallbackssee NAP 7 for more information