Moved compositing operations into plotting utilities

holoviews/operation/stats.py

@@ -133,31 +133,3 @@ def _process(self, element, key=None):
             cntr = contours(img, filled=self.p.filled)
             return cntr.clone(cntr.data[1:])
         return img
-
-
-class univariate_composite(Operation):
-
-    output_type = Area
-
-    def _process(self, element, key=None):
-        plot_opts = Store.lookup_options(Store.current_backend, element, 'plot').kwargs
-        bw = plot_opts.pop('bw', univariate_kde.bandwidth)
-        transformed = univariate_kde(element, bandwidth=bw)
-        Store.transfer_options(element, transformed, ['bw'])
-        return transformed
-
-
-class bivariate_composite(Operation):
-
-    output_type = Polygons
-
-    def _process(self, element, key=None):
-        plot_opts = Store.lookup_options(Store.current_backend, element, 'plot').kwargs
-        bw = plot_opts.pop('bw', bivariate_kde.bandwidth)
-        filled = plot_opts.pop('filled', bivariate_kde.filled)
-        transformed = bivariate_kde(element, bandwidth=bw, filled=filled)
-        Store.transfer_options(element, transformed, ['bw', 'filled'])
-        return transformed
-
-Compositor.register(Compositor("Distribution", univariate_composite, 'Area', 'data'))
-Compositor.register(Compositor("Bivariate", bivariate_composite, 'Polygons', 'data'))

holoviews/plotting/__init__.py

@@ -9,6 +9,10 @@
 from ..core.options import Cycle
 from .plot import Plot
 from .renderer import Renderer, HTML_TAGS # noqa (API import)
+from .util import univariate_composite, bivariate_composite
+
+Compositor.register(Compositor("Distribution", univariate_composite, 'Area', 'data'))
+Compositor.register(Compositor("Bivariate", bivariate_composite, 'Polygons', 'data'))
 
 def public(obj):
     if not isinstance(obj, type): return False

holoviews/plotting/util.py

@@ -10,6 +10,8 @@
 from ..core.spaces import get_nested_streams
 from ..core.util import (match_spec, is_number, wrap_tuple, basestring,
                          get_overlay_spec, unique_iterator)
+from ..element import Area, Polygons
+from ..operation.stats import univariate_kde, bivariate_kde, Operation
 from ..streams import LinkedStream
 
 def displayable(obj):
@@ -451,6 +453,31 @@ def get_min_distance(element):
     return 0
 
 
+class univariate_composite(Operation):
+
+    output_type = Area
+
+    def _process(self, element, key=None):
+        plot_opts = Store.lookup_options(Store.current_backend, element, 'plot').kwargs
+        bw = plot_opts.pop('bw', univariate_kde.bandwidth)
+        transformed = univariate_kde(element, bandwidth=bw)
+        Store.transfer_options(element, transformed, ['bw'])
+        return transformed
+
+
+class bivariate_composite(Operation):
+
+    output_type = Polygons
+
+    def _process(self, element, key=None):
+        plot_opts = Store.lookup_options(Store.current_backend, element, 'plot').kwargs
+        bw = plot_opts.pop('bw', bivariate_kde.bandwidth)
+        filled = plot_opts.pop('filled', bivariate_kde.filled)
+        transformed = bivariate_kde(element, bandwidth=bw, filled=filled)
+        Store.transfer_options(element, transformed, ['bw', 'filled'])
+        return transformed
+
+
 def rgb2hex(rgb):
     """
     Convert RGB(A) tuple to hex.