|
51 | 51 | from skimage.morphology import erosion, square |
52 | 52 | from skimage.segmentation import find_boundaries |
53 | 53 | from skimage.util import map_array |
54 | | -from spatialdata import SpatialData |
55 | | -from spatialdata._core.operations.rasterize import rasterize |
56 | | -from spatialdata._core.query.relational_query import _get_element_annotators, _locate_value, _ValueOrigin, get_values |
| 54 | +from spatialdata import SpatialData, get_element_annotators, get_values, rasterize |
| 55 | +from spatialdata._core.query.relational_query import _locate_value, _ValueOrigin |
57 | 56 | from spatialdata._types import ArrayLike |
58 | 57 | from spatialdata.models import Image2DModel, Labels2DModel, PointsModel, SpatialElement, get_model |
59 | 58 | from spatialdata.transformations.operations import get_transformation |
@@ -1816,14 +1815,14 @@ def _validate_col_for_column_table( |
1816 | 1815 | if not labels and col_for_color in sdata[element_name].columns: |
1817 | 1816 | table_name = None |
1818 | 1817 | elif table_name is not None: |
1819 | | - tables = _get_element_annotators(sdata, element_name) |
| 1818 | + tables = get_element_annotators(sdata, element_name) |
1820 | 1819 | if table_name not in tables or ( |
1821 | 1820 | col_for_color not in sdata[table_name].obs.columns and col_for_color not in sdata[table_name].var_names |
1822 | 1821 | ): |
1823 | 1822 | table_name = None |
1824 | 1823 | col_for_color = None |
1825 | 1824 | else: |
1826 | | - tables = _get_element_annotators(sdata, element_name) |
| 1825 | + tables = get_element_annotators(sdata, element_name) |
1827 | 1826 | for table_name in tables.copy(): |
1828 | 1827 | if col_for_color not in sdata[table_name].obs.columns and col_for_color not in sdata[table_name].var_names: |
1829 | 1828 | tables.remove(table_name) |
|
0 commit comments