Skip to content

fix_col_for_color #227

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

Merged
merged 1 commit into from
Mar 20, 2024
Merged
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions src/spatialdata_plot/pl/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1403,15 +1403,18 @@ def _validate_colors_element_table_mapping_points_shapes(
params.col_for_color.append(col_color)
element_table_mapping[element_name] = set()
else:
for table_name in element_table_mapping[element_name].copy():
if (
col_color not in sdata[table_name].obs.columns
and col_color not in sdata[table_name].var_names
):
element_table_mapping[element_name].remove(table_name)
params.col_for_color.append(None)
else:
params.col_for_color.append(col_color)
if len(element_table_mapping[element_name].copy()) != 0:
for table_name in element_table_mapping[element_name].copy():
if (
col_color not in sdata[table_name].obs.columns
and col_color not in sdata[table_name].var_names
):
element_table_mapping[element_name].remove(table_name)
params.col_for_color.append(None)
else:
params.col_for_color.append(col_color)
else:
params.col_for_color.append(None)
else:
params.color = [None] * len(render_elements)
params.col_for_color = [None] * len(render_elements)
Expand Down Expand Up @@ -1439,7 +1442,7 @@ def _validate_colors_element_table_mapping_points_shapes(
element_table_mapping[element_name].remove(table_name)
for index, element_name in enumerate(render_elements):
# We only want one table value per element and only when there is a color column in the table
if params.col_for_color[index] is not None:
if isinstance(params.col_for_color, list) and params.col_for_color[index] is not None:
table_set = element_table_mapping[element_name]
if len(table_set) > 1:
raise ValueError(f"More than one table found with color column {params.col_for_color[index]}.")
Expand Down