Merge pull request #585 from ioam/seaborn_fixes

Fixed bugs in seaborn and pandas plotting interfaces
holoviz · Mar 30, 2016 · b344b9a · b344b9a
2 parents ad73056 + a0318c8
commit b344b9a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/doc/Tutorials/Pandas_Seaborn.ipynb b/doc/Tutorials/Pandas_Seaborn.ipynb
@@ -214,7 +214,7 @@
    },
    "outputs": [],
    "source": [
-    "%%opts TimeSeries [apply_databounds=True] (ci=95 color='indianred')\n",
+    "%%opts TimeSeries (ci=95 color='indianred')\n",
     "sine_stack"
    ]
   },

diff --git a/holoviews/plotting/mpl/pandas.py b/holoviews/plotting/mpl/pandas.py
@@ -70,7 +70,8 @@ def initialize_plot(self, ranges=None):
         element = self.hmap.last
         self._validate(element)
 
-        self._update_plot(element)
+        style = self._process_style(self.style[self.cyclic_index])
+        self._update_plot(axis, element, style)
         if 'fig' in self.handles and self.handles['fig'] != plt.gcf():
             self.handles['fig'] = plt.gcf()
 
@@ -122,7 +123,6 @@ def _validate(self, dfview):
 
 
     def _update_plot(self, axis, view, style):
-        style = self._process_style(style)
         if self.plot_type == 'scatter_matrix':
             pd.scatter_matrix(view.data, ax=axis, **style)
         elif self.plot_type == 'autocorrelation_plot':

diff --git a/holoviews/plotting/mpl/seaborn.py b/holoviews/plotting/mpl/seaborn.py
@@ -233,7 +233,9 @@ def initialize_plot(self, ranges=None):
         axis = self.handles['axis']
         self._validate(dfview)
 
-        self._update_plot(axis, dfview)
+        style = self._process_style(self.style[self.cyclic_index])
+
+        self._update_plot(axis, dfview, style)
         if 'fig' in self.handles and self.handles['fig'] != plt.gcf():
             self.handles['fig'] = plt.gcf()
 
@@ -269,8 +271,7 @@ def update_frame(self, key, ranges=None):
             self._finalize_axis(key, **(axis_kwargs if axis_kwargs else {}))
 
 
-    def _update_plot(self, axis, view):
-        style = self._process_style(self.style[self.cyclic_index])
+    def _update_plot(self, axis, view, style):
         if self.plot_type == 'factorplot':
             opts = dict(style, **({'hue': view.x2} if view.x2 else {}))
             sns.factorplot(x=view.x, y=view.y, data=view.data, **opts)
@@ -310,7 +311,7 @@ def _update_plot(self, axis, view):
                 plt.close(self.handles['fig'])
             self.handles['fig'] = plt.gcf()
         else:
-            super(SNSFramePlot, self)._update_plot(axis, view)
+            super(SNSFramePlot, self)._update_plot(axis, view, style)
 
 
 Store.register({TimeSeries: TimeSeriesPlot,