Skip to content
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

fix wrong point size when affine specified #193

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

LucaMarconato
Copy link
Member

Closes #179.

This PR implements a workaround, which can be removed when napari/napari#6649 is fixed upstream.

@melonora melonora changed the base branch from main to multi_table March 14, 2024 13:27
Copy link
Collaborator

@melonora melonora left a comment

Choose a reason for hiding this comment

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

LGTM!

@LucaMarconato LucaMarconato merged commit 16551b2 into multi_table Mar 14, 2024
2 of 7 checks passed
@LucaMarconato LucaMarconato deleted the fix/points_scaling branch March 14, 2024 13:53
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 <[email protected]>
Co-authored-by: Luca Marconato <[email protected]>

* 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 <[email protected]>
Co-authored-by: Luca Marconato <[email protected]>

* 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 <[email protected]>
Co-authored-by: Wouter-Michiel Vierdag <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: LucaMarconato <[email protected]>
Co-authored-by: aeisenbarth <[email protected]>
Co-authored-by: Luca Marconato <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Radius of circles is not affected by coordinate transformations
2 participants