Merge pull request #860 from ioam/stream_dimension_widgets

Widgets ignore dimension streams

holoviews/core/util.py

@@ -803,15 +803,23 @@ def dimensionless_contents(streams, kdims):
     with any of the key dimensions.
     """
     names = stream_parameters(streams)
-    kdim_names = [kdim.name for kdim in kdims]
-    return [name for name in names if name not in kdim_names]
+    return [name for name in names if name not in kdims]
+
+
+def unbound_dimensions(streams, kdims):
+    """
+    Return a list of dimensions that have not been associated with
+    any streams.
+    """
+    params = stream_parameters(streams)
+    return [d for d in kdims if d not in params]
 
 
 def wrap_tuple_streams(unwrapped, kdims, streams):
     """
     Fills in tuple keys with dimensioned stream values as appropriate.
     """
-    param_groups = [(s.params().keys(), s) for s in streams]
+    param_groups = [(s.contents.keys(), s) for s in streams]
     pairs = [(name,s)  for (group, s) in param_groups for name in group]
     substituted = []
     for pos,el in enumerate(wrap_tuple(unwrapped)):
@@ -824,6 +832,16 @@ def wrap_tuple_streams(unwrapped, kdims, streams):
     return tuple(substituted)
 
 
+def drop_streams(streams, kdims, keys):
+    """
+    Drop any dimensionsed streams from the keys and kdims.
+    """
+    stream_params = stream_parameters(streams)
+    inds, dims = zip(*[(ind, kdim) for ind, kdim in enumerate(kdims)
+                       if kdim not in stream_params])
+    return dims, [tuple(key[ind] for ind in inds) for key in keys]
+
+
 def itervalues(obj):
     "Get value iterator from dictionary for Python 2 and 3"
     return iter(obj.values()) if sys.version_info.major == 3 else obj.itervalues()

holoviews/plotting/bokeh/widgets.py

@@ -43,10 +43,6 @@ def _plot_figure(self, idx, fig_format='json'):
                 msg = dict(patch=json_patch, root=self.plot.state._id)
                 msg = serialize_json(msg)
             return msg
-        else:
-            self.plot.push()
-            return "Complete"
-
 
 class BokehSelectionWidget(BokehWidget, SelectionWidget):
     pass

holoviews/plotting/mpl/widgets.py

@@ -32,15 +32,6 @@ def _plot_figure(self, idx):
             return self.renderer.html(self.plot, figure_format, comm=False)
 
 
-    def update(self, key):
-        if self.plot.dynamic == 'bounded' and not isinstance(key, int):
-            key = tuple(dim.values[k] if dim.values else k
-                        for dim, k in zip(self.mock_obj.kdims, tuple(key)))
-        self.plot[key]
-        self.plot.push()
-        return '' if self.renderer.mode == 'nbagg' else 'Complete'
-
-
     def get_frames(self):
         if self.renderer.mode == 'nbagg':
             manager = self.plot.comm.get_figure_manager()

holoviews/plotting/plot.py

@@ -484,10 +484,9 @@ def refresh(self, **kwargs):
         the updated data if the plot has an associated Comm.
         """
         traverse_setter(self, '_force', True)
-        if self.current_key:
-            self.update(self.current_key)
-        else:
-            self.update(0)
+        key = self.current_key if self.current_key else self.keys[0]
+        stream_key = util.wrap_tuple_streams(key, self.dimensions, self.streams)
+        self.update(stream_key)
         if self.comm is not None:
             self.push()
 
@@ -573,6 +572,7 @@ def __init__(self, element, keys=None, ranges=None, dimensions=None,
                                                  **dict(params, **plot_opts))
         if top_level:
             self.comm = self.init_comm(element)
+        self.streams = self.hmap.streams if isinstance(self.hmap, DynamicMap) else []
 
         # Update plot and style options for batched plots
         if self.batched:
@@ -920,6 +920,9 @@ def __init__(self, layout, keys=None, dimensions=None, **params):
                                                    **params)
         if top_level:
             self.comm = self.init_comm(layout)
+        self.streams = [s for streams in layout.traverse(lambda x: x.streams,
+                                                         [DynamicMap])
+                        for s in streams]
 
 
     def _get_frame(self, key):

holoviews/plotting/renderer.py

@@ -11,7 +11,7 @@
 import param
 from ..core.io import Exporter
 from ..core.options import Store, StoreOptions, SkipRendering
-from ..core.util import find_file, unicode
+from ..core.util import find_file, unicode, unbound_dimensions
 from .. import Layout, HoloMap, AdjointLayout
 from .widgets import NdWidget, ScrubberWidget, SelectionWidget
 
@@ -201,9 +201,10 @@ def _validate(self, obj, fmt):
         holomap_formats = self.mode_formats['holomap'][self.mode]
 
         if fmt in ['auto', None]:
-            if ((len(plot) == 1 and not plot.dynamic)
+            if (((len(plot) == 1 and not plot.dynamic)
                 or (len(plot) > 1 and self.holomap is None) or
-                (plot.dynamic and len(plot.keys[0]) == 0)):
+                (plot.dynamic and len(plot.keys[0]) == 0)) or
+                not unbound_dimensions(plot.streams, plot.dimensions)):
                 fmt = fig_formats[0] if self.fig=='auto' else self.fig
             else:
                 fmt = holomap_formats[0] if self.holomap=='auto' else self.holomap

holoviews/plotting/widgets/__init__.py

@@ -8,7 +8,8 @@
 from ...core import OrderedDict, NdMapping
 from ...core.options import Store
 from ...core.util import (dimension_sanitizer, safe_unicode,
-                          unique_array, unicode, isnumeric)
+                          unique_array, unicode, isnumeric,
+                          wrap_tuple_streams, drop_streams)
 from ...core.traversal import hierarchical
 
 def escape_vals(vals, escape_numerics=True):
@@ -106,8 +107,9 @@ def __init__(self, plot, renderer=None, **params):
         super(NdWidget, self).__init__(**params)
         self.id = plot.comm.target if plot.comm else uuid.uuid4().hex
         self.plot = plot
-        self.dimensions = plot.dimensions
-        self.keys = plot.keys
+        self.dimensions, self.keys = drop_streams(plot.streams,
+                                                  plot.dimensions,
+                                                  plot.keys)
 
         self.json_data = {}
         if self.plot.dynamic: self.embed = False
@@ -194,7 +196,9 @@ def _plot_figure(self, idx):
 
 
     def update(self, key):
-        return self._plot_figure(key)
+        self.plot.update(key)
+        self.plot.push()
+        return 'Complete'
 
 
 
@@ -370,4 +374,10 @@ def update(self, key):
         if self.plot.dynamic:
             key = tuple(dim.values[k] if dim.values else k
                         for dim, k in zip(self.mock_obj.kdims, tuple(key)))
-        return self._plot_figure(key)
+            key = [key[self.dimensions.index(kdim)] if kdim in self.dimensions else None
+                   for kdim in self.plot.dimensions]
+            key = wrap_tuple_streams(tuple(key), self.plot.dimensions,
+                                     self.plot.streams)
+        self.plot.update(key)
+        self.plot.push()
+        return 'Complete'