Merge pull request matplotlib#3165 from tacaswell/bug-restore-boxplot-defaults

Bug restore boxplot defaults

Author: mdboom

Diff for: lib/matplotlib/axes/_axes.py

@@ -39,6 +39,7 @@
 import matplotlib.transforms as mtrans
 from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
 from matplotlib.axes._base import _AxesBase
+from matplotlib.axes._base import _process_plot_format
 
 iterable = cbook.iterable
 is_string_like = cbook.is_string_like
@@ -2887,18 +2888,19 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
                 meanline=False, showmeans=False, showcaps=True,
                 showbox=True, showfliers=True, boxprops=None, labels=None,
                 flierprops=None, medianprops=None, meanprops=None,
-                manage_xticks=True):
+                capprops=None, whiskerprops=None, manage_xticks=True):
         """
         Make a box and whisker plot.
 
         Call signature::
 
-          boxplot(x, notch=False, sym='b+', vert=True, whis=1.5,
+          boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
                   positions=None, widths=None, patch_artist=False,
                   bootstrap=None, usermedians=None, conf_intervals=None,
                   meanline=False, showmeans=False, showcaps=True,
                   showbox=True, showfliers=True, boxprops=None, labels=None,
-                  flierprops=None, medianprops=None, meanprops=None)
+                  flierprops=None, medianprops=None, meanprops=None,
+                  capprops=None, whiskerprops=None, manage_xticks=True):
 
         Make a box and whisker plot for each column of *x* or each
         vector in sequence *x*.  The box extends from the lower to
@@ -2994,6 +2996,12 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
           boxprops : dict or None (default)
             If provided, will set the plotting style of the boxes
 
+          whiskerprops : dict or None (default)
+            If provided, will set the plotting style of the whiskers
+
+          capprops : dict or None (default)
+            If provided, will set the plotting style of the caps
+
           flierprops : dict or None (default)
             If provided, will set the plotting style of the fliers
 
@@ -3034,14 +3042,15 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
         """
         bxpstats = cbook.boxplot_stats(x, whis=whis, bootstrap=bootstrap,
                                        labels=labels)
-        if sym == 'b+' and flierprops is None:
-            flierprops = dict(linestyle='none', marker='+',
-                              markeredgecolor='blue')
+        if flierprops is None:
+            flierprops = dict(sym=sym)
+        else:
+            flierprops['sym'] = sym
 
         # replace medians if necessary:
         if usermedians is not None:
             if (len(np.ravel(usermedians)) != len(bxpstats) or
-                np.shape(usermedians)[0] != len(bxpstats)):
+                 np.shape(usermedians)[0] != len(bxpstats)):
                 medmsg = 'usermedians length not compatible with x'
                 raise ValueError(medmsg)
             else:
@@ -3073,24 +3082,27 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
                            boxprops=boxprops, flierprops=flierprops,
                            medianprops=medianprops, meanprops=meanprops,
                            meanline=meanline, showfliers=showfliers,
+                           capprops=capprops, whiskerprops=whiskerprops,
                            manage_xticks=manage_xticks)
         return artists
 
     def bxp(self, bxpstats, positions=None, widths=None, vert=True,
             patch_artist=False, shownotches=False, showmeans=False,
             showcaps=True, showbox=True, showfliers=True,
-            boxprops=None, flierprops=None, medianprops=None,
-            meanprops=None, meanline=False, manage_xticks=True):
+            boxprops=None, whiskerprops=None, flierprops=None,
+            medianprops=None, capprops=None, meanprops=None,
+            meanline=False, manage_xticks=True):
         """
         Drawing function for box and whisker plots.
 
         Call signature::
 
-          bxp(bxpstats, positions=None, widths=None, vert=True,
+          bxp(self, bxpstats, positions=None, widths=None, vert=True,
               patch_artist=False, shownotches=False, showmeans=False,
               showcaps=True, showbox=True, showfliers=True,
-              boxprops=None, flierprops=None, medianprops=None,
-              meanprops=None, meanline=False, manage_xticks=True)
+              boxprops=None, whiskerprops=None, flierprops=None,
+              medianprops=None, capprops=None, meanprops=None,
+              meanline=False, manage_xticks=True):
 
         Make a box and whisker plot for each column of *x* or each
         vector in sequence *x*.  The box extends from the lower to
@@ -3136,14 +3148,14 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
             If True produces boxes with the Patch artist
 
           shownotches : bool, default = False
-            If False (default), produces a rectangular box plot.
-            If True, will produce a notched box plot
+             If False (default), produces a rectangular box plot.
+             If True, will produce a notched box plot
 
           showmeans : bool, default = False
             If True, will toggle one the rendering of the means
 
           showcaps  : bool, default = True
-            If True, will toggle one the rendering of the caps
+            If True will toggle one the rendering of the caps
 
           showbox  : bool, default = True
             If True, will toggle one the rendering of box
@@ -3154,8 +3166,14 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           boxprops : dict or None (default)
             If provided, will set the plotting style of the boxes
 
+          whiskerprops : dict or None (default)
+            If provided, will set the plotting style of the whiskers
+
+          capprops : dict or None (default)
+            If provided, will set the plotting style of the caps
+
           flierprops : dict or None (default)
-            If provided, will set the plotting style of the fliers
+            If provided will set the plotting style of the fliers
 
           medianprops : dict or None (default)
             If provided, will set the plotting style of the medians
@@ -3219,37 +3237,58 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
             final_boxprops = dict(linestyle='solid', edgecolor='black',
                                   facecolor='white', linewidth=1)
         else:
-            final_boxprops = dict(linestyle='-', color='black', linewidth=1)
+            final_boxprops = dict(linestyle='-', color='blue')
 
         if boxprops is not None:
             final_boxprops.update(boxprops)
 
         # other (cap, whisker) properties
-        if patch_artist:
-            otherprops = dict(
-                linestyle=linestyle_map[final_boxprops['linestyle']],
-                color=final_boxprops['edgecolor'],
-                linewidth=final_boxprops.get('linewidth', 1)
-            )
-        else:
-            otherprops = dict(linestyle=final_boxprops['linestyle'],
-                              color=final_boxprops['color'],
-                              linewidth=final_boxprops.get('linewidth', 1))
+        final_whiskerprops = dict(
+            linestyle='--',
+            color='blue',
+        )
 
-        # flier (outlier) properties
+        final_capprops = dict(
+            linestyle='-',
+            color='black',
+        )
+
+        if capprops is not None:
+            final_capprops.update(capprops)
+
+        if whiskerprops is not None:
+            final_whiskerprops.update(whiskerprops)
+
+        # set up the default flier properties
         final_flierprops = dict(linestyle='none', marker='+',
-                                markeredgecolor='blue')
+                    markeredgecolor='b',
+                    markerfacecolor='none')
+        # flier (outlier) properties
         if flierprops is not None:
+            sym = flierprops.pop('sym', None)
+
+            # watch inverted logic, checks for non-default
+            # value of `sym`
+            if not (sym == '' or (sym is None)):
+                # process the symbol string
+                # discarded linestyle
+                _, marker, color = _process_plot_format(sym)
+                flierprops['marker'] = marker
+                flierprops['color'] = color
+                # assume that if color is passed in the user want
+                # filled symbol
+                flierprops['markeredgecolor'] = color
+                flierprops['markerfacecolor'] = color
             final_flierprops.update(flierprops)
 
         # median line properties
-        final_medianprops = dict(linestyle='-', color='blue')
+        final_medianprops = dict(linestyle='-', color='red')
         if medianprops is not None:
             final_medianprops.update(medianprops)
 
         # mean (line or point) properties
         if meanline:
-            final_meanprops = dict(linestyle='--', color='red')
+            final_meanprops = dict(linestyle='--', color='black')
         else:
             final_meanprops = dict(linestyle='none', markerfacecolor='red',
                                    marker='s')
@@ -3317,11 +3356,9 @@ def dopatch(xs, ys, **kwargs):
         if not self._hold:
             self.cla()
         holdStatus = self._hold
-
         for pos, width, stats in zip(positions, widths, bxpstats):
             # try to find a new label
             datalabels.append(stats.get('label', pos))
-
             # fliers coords
             flier_x = np.ones(len(stats['fliers'])) * pos
             flier_y = stats['fliers']
@@ -3369,13 +3406,17 @@ def dopatch(xs, ys, **kwargs):
                     boxes.extend(doplot(box_x, box_y, **final_boxprops))
 
             # draw the whiskers
-            whiskers.extend(doplot(whisker_x, whiskerlo_y, **otherprops))
-            whiskers.extend(doplot(whisker_x, whiskerhi_y, **otherprops))
+            whiskers.extend(doplot(
+                whisker_x, whiskerlo_y, **final_whiskerprops
+            ))
+            whiskers.extend(doplot(
+                whisker_x, whiskerhi_y, **final_whiskerprops
+            ))
 
             # maybe draw the caps:
             if showcaps:
-                caps.extend(doplot(cap_x, cap_lo, **otherprops))
-                caps.extend(doplot(cap_x, cap_hi, **otherprops))
+                caps.extend(doplot(cap_x, cap_lo, **final_capprops))
+                caps.extend(doplot(cap_x, cap_hi, **final_capprops))
 
             # draw the medians
             medians.extend(doplot(med_x, med_y, **final_medianprops))
@@ -3394,7 +3435,9 @@ def dopatch(xs, ys, **kwargs):
 
             # maybe draw the fliers
             if showfliers:
-                fliers.extend(doplot(flier_x, flier_y, **final_flierprops))
+                fliers.extend(doplot(
+                    flier_x, flier_y, **final_flierprops
+                ))
 
         # fix our axes/ticks up a little
         if vert:

Diff for: lib/matplotlib/cbook.py

@@ -1948,7 +1948,7 @@ def _compute_conf_interval(data, med, iqr, bootstrap):
 
     ncols = len(X)
     if labels is None:
-        labels = [str(i) for i in range(ncols)]
+        labels = [str(i) for i in range(1, ncols+1)]
     elif len(labels) != ncols:
         raise ValueError("Dimensions of labels and X must be compatible")