From 916e4612e2b4f980ef67791a6a39f08b746fe173 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 14 Oct 2016 17:57:27 +0100 Subject: [PATCH] Fixed setting of styles on batched bokeh plots --- holoviews/plotting/bokeh/chart.py | 6 ++++-- holoviews/plotting/bokeh/path.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py index c7d805fc96..ec71a238e3 100644 --- a/holoviews/plotting/bokeh/chart.py +++ b/holoviews/plotting/bokeh/chart.py @@ -85,8 +85,9 @@ def get_data(self, element, ranges=None, empty=False): def get_batched_data(self, element, ranges=None, empty=False): data = defaultdict(list) - style = self.style.max_cycles(len(self.ordering)) for key, el in element.items(): + style = self.lookup_options(el, 'style') + style = style.max_cycles(len(self.ordering)) self.set_param(**self.lookup_options(el, 'plot').options) eldata, elmapping = self.get_data(el, ranges, empty) for k, eld in eldata.items(): @@ -141,9 +142,10 @@ def get_data(self, element, ranges=None, empty=False): dict(x=x, y=y)) def get_batched_data(self, overlay, ranges=None, empty=False): - style = self.style.max_cycles(len(self.ordering)) data = defaultdict(list) for key, el in overlay.items(): + style = self.lookup_options(el, 'style') + style = style.max_cycles(len(self.ordering)) zorder = self.get_zorder(overlay, key, el) for opt in self._mapping: if opt in ['xs', 'ys']: diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py index ada06529d2..09572acf22 100644 --- a/holoviews/plotting/bokeh/path.py +++ b/holoviews/plotting/bokeh/path.py @@ -28,8 +28,9 @@ def get_data(self, element, ranges=None, empty=False): def get_batched_data(self, element, ranges=None, empty=False): data = defaultdict(list) - style = self.style.max_cycles(len(self.ordering)) for key, el in element.data.items(): + style = self.lookup_options(el, 'style') + style = style.max_cycles(len(self.ordering)) self.overlay_dims = dict(zip(element.kdims, key)) eldata, elmapping = self.get_data(el, ranges, empty) for k, eld in eldata.items(): @@ -76,8 +77,9 @@ def get_data(self, element, ranges=None, empty=False): def get_batched_data(self, element, ranges=None, empty=False): data = defaultdict(list) - style = self.style.max_cycles(len(self.ordering)) for key, el in element.data.items(): + style = self.lookup_options(el, 'style') + style = style.max_cycles(len(self.ordering)) self.overlay_dims = dict(zip(element.kdims, key)) eldata, elmapping = self.get_data(el, ranges, empty) for k, eld in eldata.items():