-
Notifications
You must be signed in to change notification settings - Fork 17
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
Test spatialelement table join #208
Conversation
tests/test_spatialdata.py
Outdated
).sum() | ||
) | ||
assert widget.viewer_model.viewer.layers[0].metadata.get("region_key") is not None | ||
|
||
|
||
def test_sdatawidget_points(caplog, make_napari_viewer: Any): | ||
sdata.points["many_points"] = PointsModel.parse( | ||
@pytest.mark.xfail |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove this and adjust the asserts in the test.
Some additional comments, I will put them here while I test.
|
|
I could reproduce the bug appearing with the I verified the robustness against shuffling and it works. I will now check the |
* 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>
Closes #181
Adds a test for checking that the plot is correct even when some rows of the table are not annotating instances of the spatial element or when the spatial element contains instances not in the table.
Also, checks that this works both for the case when the
instance_key
column has dtypeint
and when it's astr
.Eventually, the
instance_key
column will only have dtypeint
, as discussed here: scverse/spatialdata#158, but for the moment it would be easier if both were supported, as this PR will check.