Skip to content

fixed! #222

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

Merged
merged 2 commits into from
Mar 19, 2024
Merged

fixed! #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7c1b3
fixed!
melonora Mar 19, 2024
1ee3d17
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 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
4 changes: 2 additions & 2 deletions src/spatialdata_plot/pl/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def _render_shapes(
value_to_plot=render_params.col_for_color[index],
groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
palette=render_params.palette[index]
if render_params.palette is not None and render_params.palette[index][0] is not None
else None,
if render_params.palette is not None
else None, # and render_params.palette[index][0] is not None
na_color=render_params.color[index] or render_params.cmap_params.na_color,
cmap_params=render_params.cmap_params,
table_name=table_name,
Expand Down
22 changes: 17 additions & 5 deletions src/spatialdata_plot/pl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ def _set_color_source_vec(

# numerical case, return early
if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
if palette[element_index][0] is not None:
if palette[0] is not None:
logger.warning(
"Ignoring categorical palette which is given for a continuous variable. "
"Consider using `cmap` to pass a ColorMap."
Expand All @@ -632,7 +632,16 @@ def _set_color_source_vec(
color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
categories = groups

color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
if groups is not None:
palette_input = palette[0] if palette[0] is None else palette
elif palette is not None:
palette_input = palette[0]
else:
palette_input = palette

color_map = dict(
zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
)

if color_map is None:
raise ValueError("Unable to create color palette.")
Expand Down Expand Up @@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
params.groups = [groups[0] for _ in range(len(render_elements))]
if palette is not None:
params.palette = [palette[0] for _ in range(len(render_elements))]
else:
params.palette = [[None] for _ in range(len(render_elements))]
else:
if len(groups) != len(render_elements):
raise ValueError(
Expand Down Expand Up @@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
else:
params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

if params.palette is None:
params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
# params.palette = [[None] for _ in wanted_elements_on_cs]
image_flag = element_type == "images"
return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
return params