From d73ccd3ddc2751e4e7f51c88adefc678817cea49 Mon Sep 17 00:00:00 2001 From: clwgg Date: Tue, 23 Apr 2024 14:04:34 -0700 Subject: [PATCH 1/2] call set_transform for all added image axes --- src/spatialdata_plot/pl/render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spatialdata_plot/pl/render.py b/src/spatialdata_plot/pl/render.py index df7c33d0..5619a498 100644 --- a/src/spatialdata_plot/pl/render.py +++ b/src/spatialdata_plot/pl/render.py @@ -697,6 +697,7 @@ def _render_labels( alpha=render_params.outline_alpha, origin="lower", ) + _cax.set_transform(trans_data) _cax = ax.imshow( labels_infill, rasterized=True, @@ -706,7 +707,6 @@ def _render_labels( origin="lower", ) _cax.set_transform(trans_data) - cax = ax.add_image(_cax) else: # Default: no alpha, contour = infill label = _map_color_seg( @@ -728,7 +728,7 @@ def _render_labels( alpha=render_params.fill_alpha, origin="lower", ) - _cax.set_transform(trans_data) + _cax.set_transform(trans_data) cax = ax.add_image(_cax) _ = _decorate_axs( From 377e121410bfb236e4f74d7fbf4ee9f2685165a4 Mon Sep 17 00:00:00 2001 From: clwgg Date: Tue, 23 Apr 2024 14:10:11 -0700 Subject: [PATCH 2/2] remove superfluous (?) if-else in render_labels --- src/spatialdata_plot/pl/render.py | 103 ++++++++++++------------------ 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/src/spatialdata_plot/pl/render.py b/src/spatialdata_plot/pl/render.py index 5619a498..e1929c96 100644 --- a/src/spatialdata_plot/pl/render.py +++ b/src/spatialdata_plot/pl/render.py @@ -664,71 +664,48 @@ 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.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) - 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.set_transform(trans_data) + _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) _ = _decorate_axs(