matplotlib
diff --git a/‎lib/matplotlib/artist.py
Copy file name to clipboardExpand all lines: lib/matplotlib/artist.py
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/matplotlib/artist.py
Copy file name to clipboardExpand all lines: lib/matplotlib/artist.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/matplotlib/axes.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes.py
+77-55Lines changed: 77 additions & 55 deletions b/‎lib/matplotlib/axes.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes.py
+77-55Lines changed: 77 additions & 55 deletions
diff --git a/‎lib/matplotlib/backends/backend_agg.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
+4-3Lines changed: 4 additions & 3 deletions b/‎lib/matplotlib/backends/backend_agg.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.png
Copy file name to clipboard
17 Bytes b/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.png
Copy file name to clipboard
17 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png
Copy file name to clipboard
-7 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png
Copy file name to clipboard
-7 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png
Copy file name to clipboard
57 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png
Copy file name to clipboard
57 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
Copy file name to clipboard
-68 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
Copy file name to clipboard
-68 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
Copy file name to clipboard
18 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
Copy file name to clipboard
18 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/boxplot.png
Copy file name to clipboard
-28 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/boxplot.png
Copy file name to clipboard
-28 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/canonical.png
Copy file name to clipboard
49 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/canonical.png
Copy file name to clipboard
49 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/const_xy.png
Copy file name to clipboard
82 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/const_xy.png
Copy file name to clipboard
82 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png
Copy file name to clipboard
468 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png
Copy file name to clipboard
468 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/contour_hatching.png
Copy file name to clipboard
-32 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/contour_hatching.png
Copy file name to clipboard
-32 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png
Copy file name to clipboard
22 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png
Copy file name to clipboard
22 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
Copy file name to clipboard
335 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
Copy file name to clipboard
335 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_zorder.png
Copy file name to clipboard
-71 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/errorbar_zorder.png
Copy file name to clipboard
-71 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/eventplot.png
Copy file name to clipboard
60 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/eventplot.png
Copy file name to clipboard
60 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png
Copy file name to clipboard
-112 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png
Copy file name to clipboard
-112 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
Copy file name to clipboard
237 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
Copy file name to clipboard
237 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.png
Copy file name to clipboard
-78 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.png
Copy file name to clipboard
-78 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png
Copy file name to clipboard
20 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png
Copy file name to clipboard
20 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png
Copy file name to clipboard
-25 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png
Copy file name to clipboard
-25 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png
Copy file name to clipboard
-24 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png
Copy file name to clipboard
-24 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
Copy file name to clipboard
-18 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
Copy file name to clipboard
-18 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
Copy file name to clipboard
-16 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
Copy file name to clipboard
-16 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png
Copy file name to clipboard
-49 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png
Copy file name to clipboard
-49 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png
Copy file name to clipboard
110 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png
Copy file name to clipboard
110 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist2d.png
Copy file name to clipboard
-12 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/hist2d.png
Copy file name to clipboard
-12 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png
Copy file name to clipboard
6 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png
Copy file name to clipboard
6 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_log.png
Copy file name to clipboard
-27 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_log.png
Copy file name to clipboard
-27 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_offset.png
Copy file name to clipboard
4.8 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_offset.png
Copy file name to clipboard
4.8 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.pdf
Copy file name to clipboard
11.3 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.pdf
Copy file name to clipboard
11.3 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
Copy file name to clipboard
22.5 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
Copy file name to clipboard
22.5 KB
@@ -240,7 +240,7 @@ def get_transform(self):
         instance used by this artist.
         """
         if self._transform is None:
-            self.set_transform(IdentityTransform())
+            self._transform = IdentityTransform()
         elif (not isinstance(self._transform, Transform)
               and hasattr(self._transform, '_as_mpl_transform')):
             self._transform = self._transform._as_mpl_transform(self.axes)
 
@@ -4921,11 +4921,10 @@ def make_iterable(x):
         if orientation == 'vertical':
             self._process_unit_info(xdata=left, ydata=height, kwargs=kwargs)
             if log:
-                self.set_yscale('log')
+                self.set_yscale('log', nonposy='clip')
             # size width and bottom according to length of left
             if _bottom is None:
                 if self.get_yscale() == 'log':
-                    bottom = [1e-100]
                     adjust_ylim = True
                 else:
                     bottom = [0]
@@ -4937,11 +4936,10 @@ def make_iterable(x):
         elif orientation == 'horizontal':
             self._process_unit_info(xdata=width, ydata=bottom, kwargs=kwargs)
             if log:
-                self.set_xscale('log')
+                self.set_xscale('log', nonposx='clip')
             # size left and height according to length of bottom
             if _left is None:
                 if self.get_xscale() == 'log':
-                    left = [1e-100]
                     adjust_xlim = True
                 else:
                     left = [0]
@@ -8218,6 +8216,11 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             raise ValueError(
                 "orientation kwarg %s is not recognized" % orientation)
 
+        if kwargs.get('width') is not None:
+            raise mplDeprecation(
+                'hist now uses the rwidth to give relative width '
+                'and not absolute width')
+
         if histtype == 'barstacked' and not stacked:
             stacked = True
 
@@ -8233,9 +8236,9 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             else:
                 raise ValueError("x must be 1D or 2D")
             if x.shape[1] < x.shape[0]:
-                warnings.warn('2D hist input should be nsamples x '
-                              'nvariables;\n this looks transposed '
-                              '(shape is %d x %d)' % x.shape[::-1])
+                warnings.warn(
+                    '2D hist input should be nsamples x nvariables;\n '
+                    'this looks transposed (shape is %d x %d)' % x.shape[::-1])
         else:
             # multiple hist with data of different length
             x = [np.asarray(xi) for xi in x]
@@ -8270,7 +8273,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                     raise ValueError(
                         'weights should have the same shape as x')
         else:
-            w = [None] * nx
+            w = [None]*nx
 
         # Save autoscale state for later restoration; turn autoscaling
         # off so we can do it all a single time at the end, instead
@@ -8285,7 +8288,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
 
         # Check whether bins or range are given explicitly. In that
         # case use those values for autoscaling.
-        binsgiven = (cbook.iterable(bins) or bin_range != None)
+        binsgiven = (cbook.iterable(bins) or bin_range is not None)
 
         # If bins are not specified either explicitly or via range,
         # we need to figure out the range required for all datasets,
@@ -8304,16 +8307,13 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         hist_kwargs = dict(range=bin_range)
 
         n = []
-        mlast = None
-        # reversed order is necessary so when stacking histogram, first
-        # dataset is on top if histogram isn't stacked, this doesn't make any
-        # difference
-        for i in reversed(xrange(nx)):
+        mlast = bottom
+        for i in xrange(nx):
             # this will automatically overwrite bins,
             # so that each histogram uses the same bins
             m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
             if mlast is None:
-                mlast = np.zeros(len(bins) - 1, m.dtype)
+                mlast = np.zeros(len(bins)-1, m.dtype)
             if normed:
                 db = np.diff(bins)
                 m = (m.astype(float) / db) / m.sum()
@@ -8322,8 +8322,6 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 mlast[:] = m
             n.append(m)
 
-
-
         if cumulative:
             slc = slice(None)
             if cbook.is_numlike(cumulative) and cumulative < 0:
@@ -8334,8 +8332,6 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             else:
                 n = [m[slc].cumsum()[slc] for m in n]
 
-        n.reverse()  # put them back in the right order
-
         patches = []
 
         if histtype.startswith('bar'):
@@ -8349,21 +8345,20 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 dr = 1.0
 
             if histtype == 'bar' and not stacked:
-                width = dr * totwidth / nx
+                width = dr*totwidth/nx
                 dw = width
 
                 if nx > 1:
-                    boffset = -0.5 * dr * totwidth * (1.0 - 1.0 / nx)
+                    boffset = -0.5*dr*totwidth*(1.0-1.0/nx)
                 else:
                     boffset = 0.0
                 stacked = False
             elif histtype == 'barstacked' or stacked:
-                width = dr * totwidth
+                width = dr*totwidth
                 boffset, dw = 0.0, 0.0
 
             if align == 'mid' or align == 'edge':
-                boffset += 0.5 * totwidth
-
+                boffset += 0.5*totwidth
             elif align == 'right':
                 boffset += totwidth
 
@@ -8373,31 +8368,34 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 _barfunc = self.bar
 
             for m, c in zip(n, color):
-                patch = _barfunc(bins[:-1] + boffset, m, width,
+                if bottom is None:
+                    bottom = np.zeros(len(m), np.float)
+                if stacked:
+                    height = m - bottom
+                else:
+                    height = m
+                patch = _barfunc(bins[:-1]+boffset, height, width,
                                  align='center', log=log,
                                  color=c, bottom=bottom)
                 patches.append(patch)
+                if stacked:
+                    bottom[:] = m
                 boffset += dw
 
         elif histtype.startswith('step'):
-            x = np.zeros(2 * len(bins), np.float)
-            y = np.zeros(2 * len(bins), np.float)
-
-            x[0::2], x[1::2] = bins, bins
-
-            minimum = np.min(n)
+            # these define the perimeter of the polygon
+            x = np.zeros(4 * len(bins) - 3, np.float)
+            y = np.zeros(4 * len(bins) - 3, np.float)
 
-            if align == 'left' or align == 'center':
-                x -= 0.5 * (bins[1] - bins[0])
-            elif align == 'right':
-                x += 0.5 * (bins[1] - bins[0])
+            x[0:2*len(bins)-1:2], x[1:2*len(bins)-1:2] = bins, bins[:-1]
+            x[2*len(bins)-1:] = x[1:2*len(bins)-1][::-1]
 
             if log:
                 if orientation == 'horizontal':
-                    self.set_xscale('log')
+                    self.set_xscale('log', nonposx='clip')
                     logbase = self.xaxis._scale.base
                 else:  # orientation == 'vertical'
-                    self.set_yscale('log')
+                    self.set_yscale('log', nonposy='clip')
                     logbase = self.yaxis._scale.base
 
                 # Setting a minimum of 0 results in problems for log plots
@@ -8407,47 +8405,71 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                     ndata = np.array(n)
                     minimum = (np.min(ndata[ndata>0])) / logbase
                 else:
-                    # For non-normed data, set the min to log base, again so
-                    # that there is 1 full tick-label unit for the lowest bin
+                    # For non-normed data, set the min to log base,
+                    # again so that there is 1 full tick-label unit
+                    # for the lowest bin
                     minimum = 1.0 / logbase
 
                 y[0], y[-1] = minimum, minimum
             else:
                 minimum = np.min(bins)
 
+            if align == 'left' or align == 'center':
+                x -= 0.5*(bins[1]-bins[0])
+            elif align == 'right':
+                x += 0.5*(bins[1]-bins[0])
+
             # If fill kwarg is set, it will be passed to the patch collection,
             # overriding this
             fill = (histtype == 'stepfilled')
 
-            for m, c in zip(n, color):
-                y[1:-1:2], y[2::2] = m, m
+            xvals, yvals = [], []
+            for m in n:
+                # starting point for drawing polygon
+                y[0] = y[-1]
+                # top of the previous polygon becomes the bottom
+                y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
+                # set the top of this polygon
+                y[1:2*len(bins)-1:2], y[2:2*len(bins):2] = m, m
                 if log:
                     y[y < minimum] = minimum
                 if orientation == 'horizontal':
                     x, y = y, x
 
+                xvals.append(x.copy())
+                yvals.append(y.copy())
+
+            # add patches in reverse order so that when stacking,
+            # items lower in the stack are plottted on top of
+            # items higher in the stack
+            for x, y, c in reversed(zip(xvals, yvals, color)):
                 if fill:
                     patches.append(self.fill(x, y,
-                        closed=False, facecolor=c))
+                                             closed=False,
+                                             facecolor=c))
                 else:
                     patches.append(self.fill(x, y,
-                        closed=False, edgecolor=c, fill=False))
+                                             closed=False, edgecolor=c,
+                                             fill=False))
+
+            # we return patches, so put it back in the expected order
+            patches.reverse()
 
             # adopted from adjust_x/ylim part of the bar method
             if orientation == 'horizontal':
-                xmin0 = max(_saved_bounds[0] * 0.9, minimum)
+                xmin0 = max(_saved_bounds[0]*0.9, minimum)
                 xmax = self.dataLim.intervalx[1]
                 for m in n:
-                    xmin = np.amin(m[m != 0])  # filter out the 0 height bins
-                xmin = max(xmin * 0.9, minimum)
+                    xmin = np.amin(m[m != 0]) # filter out the 0 height bins
+                xmin = max(xmin*0.9, minimum)
                 xmin = min(xmin0, xmin)
                 self.dataLim.intervalx = (xmin, xmax)
             elif orientation == 'vertical':
-                ymin0 = max(_saved_bounds[1] * 0.9, minimum)
+                ymin0 = max(_saved_bounds[1]*0.9, minimum)
                 ymax = self.dataLim.intervaly[1]
                 for m in n:
-                    ymin = np.amin(m[m != 0])  # filter out the 0 height bins
-                ymin = max(ymin * 0.9, minimum)
+                    ymin = np.amin(m[m != 0]) # filter out the 0 height bins
+                ymin = max(ymin*0.9, minimum)
                 ymin = min(ymin0, ymin)
                 self.dataLim.intervaly = (ymin, ymax)
 
@@ -8458,8 +8480,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         elif is_sequence_of_strings(label):
             labels = list(label)
         else:
-            raise ValueError('invalid label: must be string or sequence of '
-                             'strings')
+            raise ValueError(
+                'invalid label: must be string or sequence of strings')
 
         if len(labels) < nx:
             labels += [None] * (nx - len(labels))
@@ -8479,11 +8501,11 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
 
         if binsgiven:
             if orientation == 'vertical':
-                self.update_datalim([(bins[0], 0), (bins[-1], 0)],
-                                    updatey=False)
+                self.update_datalim(
+                    [(bins[0], 0), (bins[-1], 0)], updatey=False)
             else:
-                self.update_datalim([(0, bins[0]), (0, bins[-1])],
-                                    updatex=False)
+                self.update_datalim(
+                    [(0, bins[0]), (0, bins[-1])], updatex=False)
 
         self.set_autoscalex_on(_saved_autoscalex)
         self.set_autoscaley_on(_saved_autoscaley)
 
@@ -154,8 +154,8 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         ox, oy, width, height, descent, font_image, used_characters = \
             self.mathtext_parser.parse(s, self.dpi, prop)
 
-        x = int(x) + ox
-        y = int(y) - oy
+        x = np.round(x + ox)
+        y = np.round(y - oy)
         self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
@@ -179,7 +179,8 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         font.draw_glyphs_to_bitmap(antialiased=rcParams['text.antialiased'])
 
         #print x, y, int(x), int(y), s
-        self._renderer.draw_text_image(font.get_image(), int(x), int(y) + 1, angle, gc)
+        self._renderer.draw_text_image(
+            font.get_image(), np.round(x), np.round(y) + 1, angle, gc)
 
     def get_text_width_height_descent(self, s, prop, ismath):
         """