Skip to content
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

Support dictionary cmaps for ImageStack #6025

Merged
merged 8 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
31 changes: 28 additions & 3 deletions holoviews/plotting/bokeh/raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,38 @@ def _get_cmapper_opts(self, low, high, factors, colors):

def _get_colormapper(self, eldim, element, ranges, style, factors=None,
colors=None, group=None, name='color_mapper'):
indices = None
vdims = element.vdims
if isinstance(style.get("cmap"), dict):
dict_cmap = style["cmap"]
missing = [vd.name for vd in vdims if vd.name not in dict_cmap]
extra = [k for k in dict_cmap if k not in vdims]
if missing:
missing_str = "', '".join(sorted(missing))
raise ValueError(
"The supplied cmap dictionary must have the same "
f"value dimensions as the element. Missing: '{missing_str}'"
)
elif extra:
ahuang11 marked this conversation as resolved.
Show resolved Hide resolved
extra_str = "', '".join(sorted(extra))
self.param.warning(
f"The supplied cmap dictionary has extra value dimensions: "
f"'{extra_str}'. Ignoring these value dimensions."
)
keys, values = zip(*dict_cmap.items())
style["cmap"] = list(values)
indices = [keys.index(vd.name) for vd in vdims]

cmapper = super()._get_colormapper(
eldim, element, ranges, style, factors=factors,
colors=colors, group=group, name=name
)
num_elements = len(element.vdims)
step_size = len(cmapper.palette) // num_elements
indices = np.arange(num_elements) * step_size

if indices is None:
num_elements = len(vdims)
step_size = len(cmapper.palette) // num_elements
indices = np.arange(num_elements) * step_size

cmapper.palette = np.array(cmapper.palette)[indices].tolist()
return cmapper

Expand Down
48 changes: 48 additions & 0 deletions holoviews/tests/plotting/bokeh/test_rasterplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from holoviews.plotting.bokeh.raster import ImageStackPlot
from holoviews.plotting.bokeh.util import bokeh34

from ..utils import ParamLogStream
from .test_plot import TestBokehPlot, bokeh_renderer


Expand Down Expand Up @@ -408,6 +409,53 @@ def test_image_stack_tuple_single_3darray(self):
assert source.data["dh"][0] == self.ysize
assert isinstance(plot, ImageStackPlot)

def test_image_stack_dict_cmap(self):
x = np.arange(0, 3)
y = np.arange(5, 8)
a = np.array([[np.nan, np.nan, 1], [np.nan] * 3, [np.nan] * 3])
b = np.array([[np.nan] * 3, [1, 1, np.nan], [np.nan] * 3])
c = np.array([[np.nan] * 3, [np.nan] * 3, [1, 1, 1]])

img_stack = ImageStack((x, y, a, b, c), kdims=["x", "y"], vdims=["b", "a", "c"])
img_stack.opts(cmap={"c": "yellow", "a": "red", "b": "green"})
plot = bokeh_renderer.get_plot(img_stack)
source = plot.handles["source"]
np.testing.assert_equal(source.data["image"][0][:, :, 0], a)
np.testing.assert_equal(source.data["image"][0][:, :, 1], b)
np.testing.assert_equal(source.data["image"][0][:, :, 2], c)
assert plot.handles["color_mapper"].palette == ["green", "red", "yellow"]

def test_image_stack_dict_cmap_missing(self):
x = np.arange(0, 3)
y = np.arange(5, 8)
a = np.array([[np.nan, np.nan, 1], [np.nan] * 3, [np.nan] * 3])
b = np.array([[np.nan] * 3, [1, 1, np.nan], [np.nan] * 3])
c = np.array([[np.nan] * 3, [np.nan] * 3, [1, 1, 1]])

img_stack = ImageStack((x, y, a, b, c), kdims=["x", "y"], vdims=["b", "a", "c"])
with pytest.raises(ValueError, match="must have the same value dimensions"):
img_stack.opts(cmap={"c": "yellow", "a": "red"})
bokeh_renderer.get_plot(img_stack)

def test_image_stack_dict_cmap_extra(self):
x = np.arange(0, 3)
y = np.arange(5, 8)
a = np.array([[np.nan, np.nan, 1], [np.nan] * 3, [np.nan] * 3])
b = np.array([[np.nan] * 3, [1, 1, np.nan], [np.nan] * 3])
c = np.array([[np.nan] * 3, [np.nan] * 3, [1, 1, 1]])

img_stack = ImageStack((x, y, a, b, c), kdims=["x", "y"], vdims=["a", "b", "c"])
with ParamLogStream() as log:
img_stack.opts(cmap={"c": "yellow", "a": "red", "b": "green", "d": "blue"})
plot = bokeh_renderer.get_plot(img_stack)
source = plot.handles["source"]
np.testing.assert_equal(source.data["image"][0][:, :, 0], a)
np.testing.assert_equal(source.data["image"][0][:, :, 1], b)
np.testing.assert_equal(source.data["image"][0][:, :, 2], c)
assert plot.handles["color_mapper"].palette == ["red", "green", "yellow"]
log_msg = log.stream.read()
assert "extra value dimensions: 'd'" in log_msg


class TestImageStackEven(_ImageStackBase):
__test__ = True
Expand Down
Loading