Consistent naming for adjoined plots

holoviz · Dec 11, 2015 · 7716fba · 7716fba
1 parent 95dbccd
commit 7716fba
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
@@ -14,7 +14,7 @@
 from .callbacks import Callbacks
 from .element import OverlayPlot, BokehMPLWrapper, BokehMPLRawWrapper
 from .chart import (PointPlot, CurvePlot, SpreadPlot, ErrorPlot, HistogramPlot,
-                    AdjointHistogramPlot, SpikesPlot, MarginalSpikesPlot)
+                    SideHistogramPlot, SpikesPlot, SideSpikesPlot)
 from .path import PathPlot, PolygonPlot
 from .plot import GridPlot, LayoutPlot, AdjointLayoutPlot
 from .raster import RasterPlot, RGBPlot, HeatmapPlot
@@ -81,8 +81,8 @@
                'bokeh')
 
 
-AdjointLayoutPlot.registry[Histogram] = AdjointHistogramPlot
-AdjointLayoutPlot.registry[Spikes] = MarginalSpikesPlot
+AdjointLayoutPlot.registry[Histogram] = SideHistogramPlot
+AdjointLayoutPlot.registry[Spikes] = SideSpikesPlot
 
 try:
     from ..mpl.seaborn import TimeSeriesPlot, BivariatePlot, DistributionPlot

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
@@ -143,7 +143,7 @@ def get_data(self, element, ranges=None):
         return (data, mapping)
 
 
-class AdjointHistogramPlot(HistogramPlot):
+class SideHistogramPlot(HistogramPlot):
 
     style_opts = HistogramPlot.style_opts + ['cmap']
 
@@ -265,7 +265,7 @@ def get_data(self, element, ranges=None):
 
 
 
-class MarginalSpikesPlot(SpikesPlot):
+class SideSpikesPlot(SpikesPlot):
     """
     SpikesPlot with useful defaults for plotting adjoined rug plot.
     """

diff --git a/holoviews/plotting/mpl/__init__.py b/holoviews/plotting/mpl/__init__.py
@@ -159,7 +159,7 @@ def grid_selector(grid):
 
 MPLPlot.sideplots.update({Histogram: SideHistogramPlot,
                           GridSpace: GridPlot,
-                          Spikes: MarginalRugPlot})
+                          Spikes: SideSpikesPlot})
 
 options = Store.options(backend='matplotlib')
 

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
@@ -1047,7 +1047,7 @@ def update_handles(self, axis, element, key, ranges=None):
             paths.set_array(cs)
 
 
-class MarginalRugPlot(SpikesPlot):
+class SideSpikesPlot(SpikesPlot):
 
     aspect = param.Parameter(default='auto', doc="""
         Aspect ratios on SideHistogramPlot should be determined by the