diff --git a/napari_clusters_plotter/_plotter.py b/napari_clusters_plotter/_plotter.py index 33b9a3d0..3242ca62 100644 --- a/napari_clusters_plotter/_plotter.py +++ b/napari_clusters_plotter/_plotter.py @@ -6,6 +6,7 @@ import pandas as pd from matplotlib.figure import Figure from napari.layers import Image, Labels, Layer, Points, Surface +from napari.utils import DirectLabelColormap from napari.utils.colormaps import ALL_COLORMAPS from napari_tools_menu import register_dock_widget from qtpy import QtWidgets @@ -719,7 +720,7 @@ def run( for prediction in np.unique(self.cluster_ids) } # take care of background label - cmap_dict[0] = [0, 0, 0, 0] + cmap_dict[None] = [0, 0, 0, 0] keep_selection = list(self.viewer.layers.selection) @@ -820,7 +821,7 @@ def _update_cluster_image( layer_in_viewer.colormap = self.visualized_layer.colormap layer_in_viewer.contrast_limits = self.visualized_layer.contrast_limits elif isinstance(self.visualized_layer, Labels): - layer_in_viewer.color = self.visualized_layer.color + layer_in_viewer.colormap = self.visualized_layer.colormap else: print("Update failed") @@ -856,11 +857,10 @@ def _draw_cluster_image( cluster_data = generate_cluster_4d_labels( self.analysed_layer, plot_cluster_name ) - cluster_layer = Layer.create( cluster_data, { - "color": cmap_dict, + "colormap": DirectLabelColormap(color_dict=cmap_dict), "name": "cluster_ids_in_space", "scale": self.layer_select.value.scale, }, @@ -878,7 +878,7 @@ def _draw_cluster_image( cluster_layer = Layer.create( cluster_data, { - "color": cmap_dict, + "colormap": DirectLabelColormap(color_dict=cmap_dict), "name": "cluster_ids_in_space", "scale": self.layer_select.value.scale, }, @@ -919,7 +919,7 @@ def _draw_cluster_image( cluster_layer = Layer.create( cluster_data, { - "color": cmap_dict, + "colormap": DirectLabelColormap(color_dict=cmap_dict), "name": "cluster_ids_in_space", "scale": self.layer_select.value.scale, }, diff --git a/requirements.txt b/requirements.txt index 94beb9dd..0acd1c7a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ tornado~=6.2 numpy~=1.23.5 docutils~=0.17.1 pandas~=1.5.3 -napari~=0.4.17 +napari~=0.4.19 matplotlib~=3.7.1 magicgui~=0.7.2 qtpy~=2.3.0 diff --git a/setup.cfg b/setup.cfg index 18085b90..f687e224 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,7 +49,7 @@ install_requires = hdbscan qtpy dask - napari + napari>=0.4.19 magicgui scikit-image superqt