Skip to content

Commit

Permalink
Merge ece2cbf into fc565b7
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Mar 17, 2018
2 parents fc565b7 + ece2cbf commit fdb1671
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions holoviews/plotting/bokeh/plot.py
Expand Up @@ -422,8 +422,9 @@ def __init__(self, layout, ranges=None, layout_num=1, keys=None, **params):
def _create_subplots(self, layout, ranges):
subplots = OrderedDict()
frame_ranges = self.compute_ranges(layout, None, ranges)
keys = self.keys[:1] if self.dynamic else self.keys
frame_ranges = OrderedDict([(key, self.compute_ranges(layout, key, frame_ranges))
for key in self.keys])
for key in keys])
collapsed_layout = layout.clone(shared_data=False, id=layout.id)
for i, coord in enumerate(layout.keys(full_grid=True)):
r = i % self.rows
Expand Down Expand Up @@ -612,8 +613,9 @@ def _init_layout(self, layout):
layout_count = 0
collapsed_layout = layout.clone(shared_data=False, id=layout.id)
frame_ranges = self.compute_ranges(layout, None, None)
keys = self.keys[:1] if self.dynamic else self.keys
frame_ranges = OrderedDict([(key, self.compute_ranges(layout, key, frame_ranges))
for key in self.keys])
for key in keys])
layout_items = layout.grid_items()
layout_dimensions = layout.kdims if isinstance(layout, NdLayout) else None
layout_subplots, layouts, paths = {}, {}, {}
Expand Down
6 changes: 4 additions & 2 deletions holoviews/plotting/mpl/plot.py
Expand Up @@ -361,8 +361,9 @@ def _create_subplots(self, layout, axis, ranges, create_axes):
self.handles['fig'].set_size_inches(self.fig_inches)
subplots, subaxes = OrderedDict(), OrderedDict()
frame_ranges = self.compute_ranges(layout, None, ranges)
keys = self.keys[:1] if self.dynamic else self.keys
frame_ranges = OrderedDict([(key, self.compute_ranges(layout, key, frame_ranges))
for key in self.keys])
for key in keys])
collapsed_layout = layout.clone(shared_data=False, id=layout.id)
r, c = (0, 0)
for coord in layout.keys(full_grid=True):
Expand Down Expand Up @@ -883,8 +884,9 @@ def _compute_gridspec(self, layout):
tight = self.tight
collapsed_layout = layout.clone(shared_data=False, id=layout.id)
frame_ranges = self.compute_ranges(layout, None, None)
keys = self.keys[:1] if self.dynamic else self.keys
frame_ranges = OrderedDict([(key, self.compute_ranges(layout, key, frame_ranges))
for key in self.keys])
for key in keys])
layout_subplots, layout_axes = {}, {}
for r, c in self.coords:
# Compute the layout type from shape
Expand Down

0 comments on commit fdb1671

Please sign in to comment.