Merge pull request #8307 from TomAugspurger/pie-nan

VIS: Hide labels for NaN/zeros in boxplt [WIP]

Author: Tom Augspurger

pandas/tests/test_graphics.py

@@ -637,6 +637,13 @@ def test_pie_series(self):
         ax = _check_plot_works(series.plot, kind='pie')
         self._check_text_labels(ax.texts, series.index)
 
+    def test_pie_nan(self):
+        s = Series([1, np.nan, 1, 1])
+        ax = s.plot(kind='pie', legend=True)
+        expected = ['0', '', '2', '3']
+        result = [x.get_text() for x in ax.texts]
+        self.assertEqual(result, expected)
+
     @slow
     def test_hist_df_kwargs(self):
         df = DataFrame(np.random.randn(10, 2))
@@ -2782,6 +2789,22 @@ def test_pie_df(self):
             self._check_text_labels(ax.texts, labels)
             self._check_colors(ax.patches, facecolors=color_args)
 
+    def test_pie_df_nan(self):
+        df = DataFrame(np.random.rand(4, 4))
+        for i in range(4):
+            df.iloc[i, i] = np.nan
+        fig, axes = self.plt.subplots(ncols=4)
+        df.plot(kind='pie', subplots=True, ax=axes, legend=True)
+
+        base_expected = ['0', '1', '2', '3']
+        for i, ax in enumerate(axes):
+            expected = list(base_expected)  # copy
+            expected[i] = ''
+            result = [x.get_text() for x in ax.texts]
+            self.assertEqual(result, expected)
+            # legend labels
+            self.assertEqual([x.get_text() for x in ax.get_legend().get_texts()],
+                              base_expected)
     def test_errorbar_plot(self):
         d = {'x': np.arange(12), 'y': np.arange(12, 0, -1)}
         df = DataFrame(d)

pandas/tools/plotting.py

@@ -2047,10 +2047,20 @@ def _make_plot(self):
 
             kwds = self.kwds.copy()
 
+            def blank_labeler(label, value):
+                if value == 0:
+                    return ''
+                else:
+                    return label
+
             idx = [com.pprint_thing(v) for v in self.data.index]
             labels = kwds.pop('labels', idx)
             # labels is used for each wedge's labels
-            results = ax.pie(y, labels=labels, **kwds)
+            # Blank out labels for values of 0 so they don't overlap
+            # with nonzero wedges
+            blabels = [blank_labeler(label, value) for
+                       label, value in zip(labels, y)]
+            results = ax.pie(y, labels=blabels, **kwds)
 
             if kwds.get('autopct', None) is not None:
                 patches, texts, autotexts = results