Skip to content

A couple of fixes to render_labels #253

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.

Sign up for GitHub

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

Closed
clwgg wants to merge 2 commits into from
Closed

A couple of fixes to render_labels #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73ccd3
call set_transform for all added image axes
clwgg Apr 23, 2024
377e121
remove superfluous (?) if-else in render_labels
clwgg Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 39 additions & 62 deletions src/spatialdata_plot/pl/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,70 +664,47 @@ def _render_labels(
table_name=cast(str, table_name),
)

if (render_params.fill_alpha != render_params.outline_alpha) and render_params.contour_px is not None:
# First get the labels infill and plot them
labels_infill = _map_color_seg(
seg=label.values,
cell_id=instance_id,
color_vector=color_vector,
color_source_vector=color_source_vector,
cmap_params=render_params.cmap_params,
seg_erosionpx=None,
seg_boundaries=render_params.outline,
na_color=render_params.cmap_params.na_color,
)

# Then overlay the contour
labels_contour = _map_color_seg(
seg=label.values,
cell_id=instance_id,
color_vector=color_vector,
color_source_vector=color_source_vector,
cmap_params=render_params.cmap_params,
seg_erosionpx=render_params.contour_px,
seg_boundaries=render_params.outline,
na_color=render_params.cmap_params.na_color,
)
# First get the labels infill and plot them
labels_infill = _map_color_seg(
seg=label.values,
cell_id=instance_id,
color_vector=color_vector,
color_source_vector=color_source_vector,
cmap_params=render_params.cmap_params,
seg_erosionpx=None,
seg_boundaries=render_params.outline,
na_color=render_params.cmap_params.na_color,
)

_cax = ax.imshow(
labels_contour,
rasterized=True,
cmap=None if categorical else render_params.cmap_params.cmap,
norm=None if categorical else render_params.cmap_params.norm,
alpha=render_params.outline_alpha,
origin="lower",
)
_cax = ax.imshow(
labels_infill,
rasterized=True,
cmap=None if categorical else render_params.cmap_params.cmap,
norm=None if categorical else render_params.cmap_params.norm,
alpha=render_params.fill_alpha,
origin="lower",
)
_cax.set_transform(trans_data)
cax = ax.add_image(_cax)
else:
# Default: no alpha, contour = infill
label = _map_color_seg(
seg=label.values,
cell_id=instance_id,
color_vector=color_vector,
color_source_vector=color_source_vector,
cmap_params=render_params.cmap_params,
seg_erosionpx=render_params.contour_px,
seg_boundaries=render_params.outline,
na_color=render_params.cmap_params.na_color,
)
# Then overlay the contour
labels_contour = _map_color_seg(
seg=label.values,
cell_id=instance_id,
color_vector=color_vector,
color_source_vector=color_source_vector,
cmap_params=render_params.cmap_params,
seg_erosionpx=render_params.contour_px,
seg_boundaries=render_params.outline,
na_color=render_params.cmap_params.na_color,
)

_cax = ax.imshow(
label,
rasterized=True,
cmap=None if categorical else render_params.cmap_params.cmap,
norm=None if categorical else render_params.cmap_params.norm,
alpha=render_params.fill_alpha,
origin="lower",
)
_cax = ax.imshow(
labels_contour,
rasterized=True,
cmap=None if categorical else render_params.cmap_params.cmap,
norm=None if categorical else render_params.cmap_params.norm,
alpha=render_params.outline_alpha,
origin="lower",
)
_cax.set_transform(trans_data)
_cax = ax.imshow(
labels_infill,
rasterized=True,
cmap=None if categorical else render_params.cmap_params.cmap,
norm=None if categorical else render_params.cmap_params.norm,
alpha=render_params.fill_alpha,
origin="lower",
)
_cax.set_transform(trans_data)
cax = ax.add_image(_cax)

Expand Down