Merge pull request #934 from ioam/batched_fixes

Fixed setting of styles on batched bokeh plots
holoviz · Oct 14, 2016 · 6d59f43 · 6d59f43
2 parents 82de0a7 + 916e461
commit 6d59f43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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():