-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue #180 #205
Merged
Merged
Issue #180 #205
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
* update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests
This reverts commit aa56cca.
* Fix undefined attribute _labels_key Accessing the property `model.labels_key` gave an `AttributeError("'ImageModel' object has no attribute '_labels_key'")` * Avoid exception when key binding collides with existing If the shortcut is already registered, Napari does not warn but raise an error. To avoid crashing Napari, we must provide the override argument (no matter whether preserving existing or overriding with the new command).
Looks great to me thanks! 🔥 |
LucaMarconato
approved these changes
Mar 14, 2024
melonora
added a commit
that referenced
this pull request
Mar 19, 2024
* Multi table (#198) * update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests * Multi table (#200) * update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests * remove legacy squidpy * remove legacy squidpy * remove coordinates * fix tests * silence warnings * fix last tests * fix mypy * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Multi table (#202) * update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests * remove legacy squidpy * remove legacy squidpy * remove coordinates * fix tests * silence warnings * fix last tests * fix mypy * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add table for adatascatter --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Fix adding layer without table * fix removing layer * fix wrong point size when affine specified (#193) * add color by in adata view (#204) * Issue #180 (#205) * Multi table (#196) * update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests * Revert "Multi table (#196)" (#197) This reverts commit aa56cca. * Avoid exception when registering shortcut (#201) * Fix undefined attribute _labels_key Accessing the property `model.labels_key` gave an `AttributeError("'ImageModel' object has no attribute '_labels_key'")` * Avoid exception when key binding collides with existing If the shortcut is already registered, Napari does not warn but raise an error. To avoid crashing Napari, we must provide the override argument (no matter whether preserving existing or overriding with the new command). * add color by in adata view * remove _scale from model * remove points coordinates * remove point_diameter * remove spot diameter --------- Co-authored-by: aeisenbarth <54448967+aeisenbarth@users.noreply.github.com> Co-authored-by: Luca Marconato <m.lucalmer@gmail.com> * Issue #192 (#207) * Multi table (#196) * update napari dependency * change deprecated is_categorical_dtype * Iinitial table widget * add table_names to model * More self explainable function name * allow changing tables * fix some tests * Fixed tests * Revert "Multi table (#196)" (#197) This reverts commit aa56cca. * Avoid exception when registering shortcut (#201) * Fix undefined attribute _labels_key Accessing the property `model.labels_key` gave an `AttributeError("'ImageModel' object has no attribute '_labels_key'")` * Avoid exception when key binding collides with existing If the shortcut is already registered, Napari does not warn but raise an error. To avoid crashing Napari, we must provide the override argument (no matter whether preserving existing or overriding with the new command). * add color by in adata view * remove _scale from model * remove points coordinates * remove point_diameter * remove spot diameter * fix #192 --------- Co-authored-by: aeisenbarth <54448967+aeisenbarth@users.noreply.github.com> Co-authored-by: Luca Marconato <m.lucalmer@gmail.com> * Test spatialelement table join (#208) * fixed all the non-cytassist images * refactor get_init_table_list * fix permutation * use join * use join for view * change hardcoded sample threshold * bunch of updates * adjust test * change into left join * change into left join * random hex colors * get actual index * change indices and adata * match rows left * fix joins * rename to vars * fix color by * fix radii * pass cs * fix _calc_default_radii() * fix tests * improve speed test * removed comments * added code to show circles as ellipses * correct point layer size after scaling * fix labels color by * fix mibitof example * last bug fixes * initial step points columns * add dask import back * fix points columns --------- Co-authored-by: wmv_hpomen <w-mv@hotmail.com> Co-authored-by: Wouter-Michiel Vierdag <michiel.vierdag@embl.de> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: LucaMarconato <2664412+LucaMarconato@users.noreply.github.com> Co-authored-by: aeisenbarth <54448967+aeisenbarth@users.noreply.github.com> Co-authored-by: Luca Marconato <m.lucalmer@gmail.com>
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.
closes #180
This PR depends on #204 and the
multi_table
branch ofSpatialData
and addresses all the tasks in #180 as far as they were still applicable. One difference is that it both removesspot_diameter
andpoint_diameter
as they didn't seem to have an effect. Ultimatelyspot_diameter
was used in case someone clicked on an item ofAListWidget
which for some reason would add a new napari layer if the ndim of the vector was equal to 2. This has been removed.