diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py index c39b6e082102..55d13b7a178c 100644 --- a/lib/matplotlib/testing/compare.py +++ b/lib/matplotlib/testing/compare.py @@ -8,8 +8,11 @@ import matplotlib from matplotlib.testing.noseclasses import ImageComparisonFailure -from matplotlib.testing import image_util +from matplotlib.testing import image_util, util from matplotlib import _png +from matplotlib import _get_configdir +from distutils import version +import hashlib import math import operator import os @@ -28,6 +31,15 @@ ] #----------------------------------------------------------------------- + +def make_test_filename(fname, purpose): + """ + Make a new filename by inserting `purpose` before the file's + extension. + """ + base, ext = os.path.splitext(fname) + return '%s-%s%s' % (base, purpose, ext) + def compare_float( expected, actual, relTol = None, absTol = None ): """Fail if the floating point values are not close enough, with the givem message. @@ -87,35 +99,68 @@ def compare_float( expected, actual, relTol = None, absTol = None ): # A dictionary that maps filename extensions to functions that map # parameters old and new to a list that can be passed to Popen to # convert files with that extension to png format. +def get_cache_dir(): + cache_dir = os.path.join(_get_configdir(), 'test_cache') + if not os.path.exists(cache_dir): + try: + os.makedirs(cache_dir) + except IOError: + return None + if not os.access(cache_dir, os.W_OK): + return None + return cache_dir + +def get_file_hash(path, block_size=2**20): + md5 = hashlib.md5() + with open(path, 'rb') as fd: + while True: + data = fd.read(block_size) + if not data: + break + md5.update(data) + return md5.hexdigest() + converter = { } def make_external_conversion_command(cmd): - def convert(*args): - cmdline = cmd(*args) - oldname, newname = args + def convert(old, new): + cmdline = cmd(old, new) pipe = subprocess.Popen(cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = pipe.communicate() errcode = pipe.wait() - if not os.path.exists(newname) or errcode: + if not os.path.exists(new) or errcode: msg = "Conversion command failed:\n%s\n" % ' '.join(cmdline) if stdout: msg += "Standard output:\n%s\n" % stdout if stderr: msg += "Standard error:\n%s\n" % stderr raise IOError(msg) + return convert if matplotlib.checkdep_ghostscript() is not None: - # FIXME: make checkdep_ghostscript return the command - if sys.platform == 'win32': - gs = 'gswin32c' - else: - gs = 'gs' - cmd = lambda old, new: \ - [gs, '-q', '-sDEVICE=png16m', '-dNOPAUSE', '-dBATCH', - '-sOutputFile=' + new, old] - converter['pdf'] = make_external_conversion_command(cmd) - converter['eps'] = make_external_conversion_command(cmd) + def make_ghostscript_conversion_command(): + # FIXME: make checkdep_ghostscript return the command + if sys.platform == 'win32': + gs = 'gswin32c' + else: + gs = 'gs' + cmd = [gs, '-q', '-sDEVICE=png16m', '-sOutputFile=-'] + + process = util.MiniExpect(cmd) + + def do_convert(old, new): + process.expect("GS>") + process.sendline("(%s) run" % old) + with open(new, 'wb') as fd: + process.expect(">>showpage, press to continue<<", fd) + process.sendline('') + + return do_convert + + converter['pdf'] = make_ghostscript_conversion_command() + converter['eps'] = make_ghostscript_conversion_command() + if matplotlib.checkdep_inkscape() is not None: cmd = lambda old, new: \ @@ -127,7 +172,7 @@ def comparable_formats(): on this system.''' return ['png'] + converter.keys() -def convert(filename): +def convert(filename, cache): ''' Convert the named file into a png file. Returns the name of the created file. @@ -138,11 +183,29 @@ def convert(filename): newname = base + '_' + extension + '.png' if not os.path.exists(filename): raise IOError("'%s' does not exist" % filename) + # Only convert the file if the destination doesn't already exist or # is out of date. if (not os.path.exists(newname) or os.stat(newname).st_mtime < os.stat(filename).st_mtime): + if cache: + cache_dir = get_cache_dir() + else: + cache_dir = None + + if cache_dir is not None: + hash = get_file_hash(filename) + new_ext = os.path.splitext(newname)[1] + cached_file = os.path.join(cache_dir, hash + new_ext) + if os.path.exists(cached_file): + shutil.copyfile(cached_file, newname) + return newname + converter[extension](filename, newname) + + if cache_dir is not None: + shutil.copyfile(newname, cached_file) + return newname verifiers = { } @@ -206,8 +269,8 @@ def compare_images( expected, actual, tol, in_decorator=False ): # Convert the image to png extension = expected.split('.')[-1] if extension != 'png': - actual = convert(actual) - expected = convert(expected) + actual = convert(actual, False) + expected = convert(expected, True) # open the image files and remove the alpha channel (if it exists) expectedImage = _png.read_png_int( expected ) @@ -216,24 +279,42 @@ def compare_images( expected, actual, tol, in_decorator=False ): actualImage, expectedImage = crop_to_same(actual, actualImage, expected, expectedImage) # normalize the images - expectedImage = image_util.autocontrast( expectedImage, 2 ) - actualImage = image_util.autocontrast( actualImage, 2 ) + # expectedImage = image_util.autocontrast( expectedImage, 2 ) + # actualImage = image_util.autocontrast( actualImage, 2 ) # compare the resulting image histogram functions - rms = 0 - bins = np.arange(257) - for i in xrange(0, 3): - h1p = expectedImage[:,:,i] - h2p = actualImage[:,:,i] + expected_version = version.LooseVersion("1.6") + found_version = version.LooseVersion(np.__version__) + + # On Numpy 1.6, we can use bincount with minlength, which is much faster than + # using histogram + if found_version >= expected_version: + rms = 0 + + for i in xrange(0, 3): + h1p = expectedImage[:,:,i] + h2p = actualImage[:,:,i] + + h1h = np.bincount(h1p.ravel(), minlength=256) + h2h = np.bincount(h2p.ravel(), minlength=256) + + rms += np.sum(np.power((h1h-h2h), 2)) + else: + rms = 0 + ns = np.arange(257) + + for i in xrange(0, 3): + h1p = expectedImage[:,:,i] + h2p = actualImage[:,:,i] + + h1h = np.histogram(h1p, bins=bins)[0] + h2h = np.histogram(h2p, bins=bins)[0] - h1h = np.histogram(h1p, bins=bins)[0] - h2h = np.histogram(h2p, bins=bins)[0] + rms += np.sum(np.power((h1h-h2h), 2)) - rms += np.sum(np.power((h1h-h2h), 2)) rms = np.sqrt(rms / (256 * 3)) - diff_image = os.path.join(os.path.dirname(actual), - 'failed-diff-'+os.path.basename(actual)) + diff_image = make_test_filename(actual, 'failed-diff') if ( (rms / 10000.0) <= tol ): if os.path.exists(diff_image): diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py index 80eee961045f..ac1203355a16 100644 --- a/lib/matplotlib/testing/decorators.py +++ b/lib/matplotlib/testing/decorators.py @@ -6,10 +6,12 @@ import matplotlib import matplotlib.tests import matplotlib.units +from matplotlib import ticker from matplotlib import pyplot as plt from matplotlib import ft2font import numpy as np -from matplotlib.testing.compare import comparable_formats, compare_images +from matplotlib.testing.compare import comparable_formats, compare_images, \ + make_test_filename import warnings def knownfailureif(fail_condition, msg=None, known_exception_class=None ): @@ -98,6 +100,16 @@ def setup_class(cls): cls._func() + @staticmethod + def remove_text(figure): + figure.suptitle("") + for ax in figure.get_axes(): + ax.set_title("") + ax.xaxis.set_major_formatter(ticker.NullFormatter()) + ax.xaxis.set_minor_formatter(ticker.NullFormatter()) + ax.yaxis.set_major_formatter(ticker.NullFormatter()) + ax.yaxis.set_minor_formatter(ticker.NullFormatter()) + def test(self): baseline_dir, result_dir = _image_directories(self._func) @@ -114,7 +126,8 @@ def test(self): orig_expected_fname = os.path.join(baseline_dir, baseline) + '.' + extension if extension == 'eps' and not os.path.exists(orig_expected_fname): orig_expected_fname = os.path.join(baseline_dir, baseline) + '.pdf' - expected_fname = os.path.join(result_dir, 'expected-' + os.path.basename(orig_expected_fname)) + expected_fname = make_test_filename(os.path.join( + result_dir, os.path.basename(orig_expected_fname)), 'expected') actual_fname = os.path.join(result_dir, baseline) + '.' + extension if os.path.exists(orig_expected_fname): shutil.copyfile(orig_expected_fname, expected_fname) @@ -126,9 +139,13 @@ def test(self): will_fail, fail_msg, known_exception_class=ImageComparisonFailure) def do_test(): + if self._remove_text: + self.remove_text(figure) + figure.savefig(actual_fname) - err = compare_images(expected_fname, actual_fname, self._tol, in_decorator=True) + err = compare_images(expected_fname, actual_fname, + self._tol, in_decorator=True) try: if not os.path.exists(expected_fname): @@ -148,7 +165,8 @@ def do_test(): yield (do_test,) -def image_comparison(baseline_images=None, extensions=None, tol=1e-3, freetype_version=None): +def image_comparison(baseline_images=None, extensions=None, tol=1e-3, + freetype_version=None, remove_text=False): """ call signature:: @@ -176,6 +194,11 @@ def image_comparison(baseline_images=None, extensions=None, tol=1e-3, freetype_v *freetype_version*: str or tuple The expected freetype version or range of versions for this test to pass. + + *remove_text*: bool + Remove the title and tick text from the figure before + comparison. This does not remove other, more deliberate, + text, such as legends and annotations. """ if baseline_images is None: @@ -207,7 +230,8 @@ def compare_images_decorator(func): '_baseline_images': baseline_images, '_extensions': extensions, '_tol': tol, - '_freetype_version': freetype_version}) + '_freetype_version': freetype_version, + '_remove_text': remove_text}) return new_class return compare_images_decorator @@ -239,4 +263,3 @@ def _image_directories(func): os.makedirs(result_dir) return baseline_dir, result_dir - diff --git a/lib/matplotlib/testing/util.py b/lib/matplotlib/testing/util.py new file mode 100644 index 000000000000..f2ce692c99d9 --- /dev/null +++ b/lib/matplotlib/testing/util.py @@ -0,0 +1,67 @@ +import subprocess + + +class MiniExpect: + """ + This is a very basic version of pexpect, providing only the + functionality necessary for the testing framework, built on top of + `subprocess` rather than directly on lower-level calls. + """ + def __init__(self, args): + """ + Start the subprocess so it may start accepting commands. + + *args* is a list of commandline arguments to pass to + `subprocess.Popen`. + """ + self._name = args[0] + self._process = subprocess.Popen( + args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + + def check_alive(self): + """ + Raises a RuntimeError if the process is no longer alive. + """ + returncode = self._process.poll() + if returncode is not None: + raise RuntimeError("%s unexpectedly quit" % self._name) + + def sendline(self, line): + """ + Send a line to the process. + """ + self.check_alive() + stdin = self._process.stdin + stdin.write(line) + stdin.write('\n') + stdin.flush() + + def expect(self, s, output=None): + """ + Wait for the string *s* to appear in the child process's output. + + *output* (optional) is a writable file object where all of the + content preceding *s* will be written. + """ + self.check_alive() + read = self._process.stdout.read + pos = 0 + buf = '' + while True: + char = read(1) + if not char: + raise IOError("Unexpected end-of-file") + elif char == s[pos]: + buf += char + pos += 1 + if pos == len(s): + return + else: + if output is not None: + output.write(buf) + output.write(char) + buf = '' + pos = 0 diff --git a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.pdf b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.pdf index c39a68966fae..17b203395bac 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png index 98571c1cd6da..a575eda981b8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png and b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.svg b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.svg index 09802e00329a..2933b6d1dbbc 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/arc_ellipse.svg @@ -1,823 +1,1226 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.pdf b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.pdf index af3918cd31bc..12aea621a9fa 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png index a9b5a4048f48..b2aa7bbc182e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png and b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.svg b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.svg index 8713b5d0eb40..c3b2cf2171ba 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.svg @@ -55,42 +55,6 @@ L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0. - - - - - - - - - - - - @@ -103,39 +67,6 @@ z - - - - - - - - - - - @@ -148,35 +79,6 @@ Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/> - - - - - - - - - - - @@ -189,44 +91,6 @@ z - - - - - - - - - - - @@ -239,52 +103,6 @@ Q48.4844 72.75 52.5938 71.2969" id="BitstreamVeraSans-Roman-36"/> - - - - - - - - - - - @@ -297,30 +115,6 @@ Q18.3125 60.0625 18.3125 54.3906" id="BitstreamVeraSans-Roman-38"/> - - - - - - - - - - - @@ -345,14 +139,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -365,14 +151,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -385,14 +163,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -405,14 +175,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -425,14 +187,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -445,14 +199,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - @@ -465,74 +211,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - - - - - - - - - - - - - - - - - @@ -583,14 +261,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -603,14 +273,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -623,14 +285,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -643,14 +297,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -663,14 +309,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -683,14 +321,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -705,14 +335,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -725,14 +347,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -745,14 +359,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -765,14 +371,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -785,14 +383,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -805,14 +395,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -825,26 +407,6 @@ L518.4 69.375" style="fill:none;stroke:#0000ff;"/> - - - - - - - - - - - - - - - - - - - - @@ -895,14 +457,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -915,14 +469,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -935,14 +481,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -955,14 +493,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -975,14 +505,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -995,14 +517,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1017,14 +531,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1037,41 +543,6 @@ L274.909 319.672" style="fill:none;stroke:#0000ff;"/> - - - - - - - - - - - @@ -1084,14 +555,6 @@ z - - - - - - - - @@ -1104,14 +567,6 @@ z - - - - - - - - @@ -1124,14 +579,6 @@ z - - - - - - - - @@ -1144,26 +591,6 @@ z - - - - - - - - - - - - - - - - - - - - @@ -1214,14 +641,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1234,14 +653,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1254,14 +665,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1274,14 +677,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1294,14 +689,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1314,14 +701,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1336,14 +715,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1356,14 +727,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1376,14 +739,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1396,14 +751,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1416,14 +763,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - @@ -1436,26 +775,6 @@ L518.4 325.328" style="fill:none;stroke:#0000ff;"/> - - - - - - - - - - - - - - - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf index 5cc9d76f7591..5591d12d336f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png index 4137c115af15..48028b7f69f1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png and b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg index c66c882bd66b..551113b03d69 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg @@ -1,763 +1,1344 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf index e2a2fa5a8b26..c031443c82cb 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png index 4373f1fd4133..0d60bc5b95e7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png and b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg index c172938378c1..d8e7a009119c 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg @@ -2,35 +2,35 @@ - - - + + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - - - - + + + + - - - - + + + + - - - - +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + - - - + + - - - - +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + - - - - - - - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - - - - + + + + - - - - - - - - + + + + + - - - - - - - + + + + - - - - - - - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - - - - - - - + + + + - - + - - - + - - - + - - - + - - + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf index 91ac11b2f0ab..f716ef9bd50f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow.png index a1dffc5e75fe..5c4f6a7fc6ef 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow.png and b/lib/matplotlib/tests/baseline_images/test_axes/imshow.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg b/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg index 23d175a354ed..4de9bafa6e51 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg @@ -1,1191 +1,206 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf index f7e7f5f12e17..7263a4bf200a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg index eaa445738284..e9718e2c1ec8 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg @@ -1,1353 +1,878 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.pdf b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.pdf index 4225d4e83a69..d71ca36d21ec 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png index 26a822ddc41f..0ca7f9a752e5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png and b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.svg b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.svg index a3e7e75577b8..d953204d8756 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/marker_edges.svg @@ -41,19 +41,19 @@ C-6.70975 -3.89685 -7.5 -1.98902 -7.5 0 C-7.5 1.98902 -6.70975 3.89685 -5.3033 5.3033 C-3.89685 6.70975 -1.98902 7.5 0 7.5 z -" id="m1b62efbc54"/> +" id="m177790f257"/> - - - - - - - - - - + + + + + + + + + + @@ -69,19 +69,19 @@ C-6.70975 -3.89685 -7.5 -1.98902 -7.5 0 C-7.5 1.98902 -6.70975 3.89685 -5.3033 5.3033 C-3.89685 6.70975 -1.98902 7.5 0 7.5 z -" id="m1b62efbc54"/> +" id="mb8327c6d48" style="stroke:#ff0000;stroke-linecap:butt;"/> - - - - - - - - - - + + + + + + + + + + @@ -97,23 +97,249 @@ C-6.70975 -3.89685 -7.5 -1.98902 -7.5 0 C-7.5 1.98902 -6.70975 3.89685 -5.3033 5.3033 C-3.89685 6.70975 -1.98902 7.5 0 7.5 z -" id="m1b62efbc54"/> +" id="m757cc98a9b" style="stroke:#0000ff;stroke-linecap:butt;stroke-width:2;"/> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - +" id="m0f54036a79" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,109 +154,109 @@ L2.54558 0 L2.44249e-16 -4.24264 L-2.54558 -8.88178e-16 z -" id="m016d603646"/> +" id="m29be9c3875" style="stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,19 +267,19 @@ L3 3 L3 -3 L-3 -3 z -" id="mbfa5fcfaff"/> +" id="m4f1de7e098" style="stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - + + + + + + + + + + @@ -293,14 +288,14 @@ z M-3 0 L3 0 M0 3 -L0 -3" id="mba139cba6e"/> +L0 -3" id="m28bd70cc20" style="stroke:#00bfbf;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - + + + + + @@ -309,318 +304,80 @@ L0 -3" id="mba139cba6e"/> +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + @@ -631,223 +388,80 @@ z +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + @@ -883,198 +497,165 @@ L262.157 139.266 z " style="fill:#ffffff;stroke:#000000;"/> - - - - - - - - - + - - - - - + + - + +L45.4062 8.20312 +Q42.5781 3.32812 38.25 0.953125 +Q33.9375 -1.42188 27.875 -1.42188 +Q17.9688 -1.42188 11.7344 6.48438 +Q5.51562 14.4062 5.51562 27.2969 +Q5.51562 40.1875 11.7344 48.0938 +Q17.9688 56 27.875 56 +Q33.9375 56 38.25 53.625 +Q42.5781 51.2656 45.4062 46.3906 +M14.7969 27.2969 +Q14.7969 17.3906 18.875 11.75 +Q22.9531 6.10938 30.0781 6.10938 +Q37.2031 6.10938 41.2969 11.75 +Q45.4062 17.3906 45.4062 27.2969 +Q45.4062 37.2031 41.2969 42.8438 +Q37.2031 48.4844 30.0781 48.4844 +Q22.9531 48.4844 18.875 42.8438 +Q14.7969 37.2031 14.7969 27.2969" id="BitstreamVeraSans-Roman-64"/> +L45.3125 8.40625 +Q42.0469 3.42188 37.7188 1 +Q33.4062 -1.42188 27.6875 -1.42188 +Q18.2656 -1.42188 13.375 4.4375 +Q8.5 10.2969 8.5 21.5781" id="BitstreamVeraSans-Roman-75"/> +L43.2188 8.29688 +Q40.1406 3.32812 35.5469 0.953125 +Q30.9531 -1.42188 24.3125 -1.42188 +Q15.9219 -1.42188 10.9531 3.29688 +Q6 8.01562 6 15.9219 +Q6 25.1406 12.1719 29.8281 +Q18.3594 34.5156 30.6094 34.5156 +L43.2188 34.5156 +L43.2188 35.4062 +Q43.2188 41.6094 39.1406 45 +Q35.0625 48.3906 27.6875 48.3906 +Q23 48.3906 18.5469 47.2656 +Q14.1094 46.1406 10.0156 43.8906 +L10.0156 52.2031 +Q14.9375 54.1094 19.5781 55.0469 +Q24.2188 56 28.6094 56 +Q40.4844 56 46.3438 49.8438 +Q52.2031 43.7031 52.2031 31.2031" id="BitstreamVeraSans-Roman-61"/> - + @@ -1084,102 +665,79 @@ Q52.2031 -43.7031 52.2031 -31.2031" id="BitstreamVeraSans-Roman-61"/> - - - - - - - - - + - - - - - + + - + +L9.07812 54.6875 +L18.1094 54.6875 +L18.1094 46.1875 +Q21.1875 51.2188 25.4844 53.6094 +Q29.7812 56 35.6875 56 +Q41.6562 56 45.8281 52.9688 +Q50 49.9531 52 44.1875" id="BitstreamVeraSans-Roman-6d"/> - + @@ -1190,68 +748,78 @@ z - - - - - - - - - + - - - - - + + - + + + - + @@ -1267,131 +835,137 @@ z - - - - - - - - - + - - - - - + + - + +L9.07812 54.6875 +L18.1094 54.6875 +L18.1094 46.1875 +Q21.3438 51.125 25.7031 53.5625 +Q30.0781 56 35.7969 56 +Q45.2188 56 50.0469 50.1719 +Q54.8906 44.3438 54.8906 33.0156" id="BitstreamVeraSans-Roman-6e"/> +M44.2812 53.0781 +L44.2812 44.5781 +Q40.4844 46.5312 36.375 47.5 +Q32.2812 48.4844 27.875 48.4844 +Q21.1875 48.4844 17.8438 46.4375 +Q14.5 44.3906 14.5 40.2812 +Q14.5 37.1562 16.8906 35.375 +Q19.2812 33.5938 26.5156 31.9844 +L29.5938 31.2969 +Q39.1562 29.25 43.1875 25.5156 +Q47.2188 21.7812 47.2188 15.0938 +Q47.2188 7.46875 41.1875 3.01562 +Q35.1562 -1.42188 24.6094 -1.42188 +Q20.2188 -1.42188 15.4531 -0.5625 +Q10.6875 0.296875 5.42188 2 +L5.42188 11.2812 +Q10.4062 8.6875 15.2344 7.39062 +Q20.0625 6.10938 24.8125 6.10938 +Q31.1562 6.10938 34.5625 8.28125 +Q37.9844 10.4531 37.9844 14.4062 +Q37.9844 18.0625 35.5156 20.0156 +Q33.0625 21.9688 24.7031 23.7812 +L21.5781 24.5156 +Q13.2344 26.2656 9.51562 29.9062 +Q5.8125 33.5469 5.8125 39.8906 +Q5.8125 47.6094 11.2812 51.7969 +Q16.75 56 26.8125 56 +Q31.7812 56 36.1719 55.2656 +Q40.5781 54.5469 44.2812 53.0781" id="BitstreamVeraSans-Roman-73"/> + - + @@ -1424,4 +998,9 @@ Q40.5781 -54.5469 44.2812 -53.0781" id="BitstreamVeraSans-Roman-73"/> + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf index e1c3819973bd..ebd5d9a4db2d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png index 98a52fec841a..b9cda949a3e1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg index 2e5f7f168b08..485563ed4c9d 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg @@ -29,11 +29,6 @@ z " style="fill:#ffffff;"/> - - - - - +" id="m0f54036a79" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -361,109 +356,109 @@ L2.54558 0 L2.44249e-16 -4.24264 L-2.54558 -8.88178e-16 z -" id="m53557f14a9"/> +" id="m29be9c3875" style="stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -575,19 +570,19 @@ L3 3 L3 -3 L-3 -3 z -" id="m63986abc5f"/> +" id="m4f1de7e098" style="stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - + + + + + + + + + + @@ -697,14 +692,14 @@ L518.4 342.668" style="fill:none;stroke:#00bfbf;"/> M-3 0 L3 0 M0 3 -L0 -3" id="m042afd644e"/> +L0 -3" id="m28bd70cc20" style="stroke:#00bfbf;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - + + + + + @@ -713,318 +708,80 @@ L0 -3" id="m042afd644e"/> +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + @@ -1035,223 +792,80 @@ z +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + @@ -1293,26 +907,12 @@ M272.237 62.0617 L292.397 62.0617" style="fill:none;stroke:#0000ff;"/> - - - - - + + - + - - - - - + + - + @@ -1575,21 +1166,12 @@ M272.237 104.335 L292.397 104.335" style="fill:none;stroke:#ff0000;"/> - - - - - + + - + + + - - - - - + + - + + @@ -1785,4 +1418,9 @@ Q40.5781 54.5469 44.2812 53.0781" id="BitstreamVeraSans-Roman-73"/> + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.pdf b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.pdf index a4c22df11864..e054f2307750 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png index 7ba381b9eca4..e66dbbe4b3dc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png and b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.svg b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.svg index 261067c368a8..dbb708adca4a 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.svg @@ -2,39 +2,34 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + - - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - - + + + + - - - - + + + + - - - - +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + - - - + + - - - - +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - + + + + - - - - - - - - + + + + + - - - - - - - + + + + - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - + + + + - - - - - - - - + + + + + - - - - - - - + + + + - - - - - + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - - - + + + + - - + - - - + - - - + - - - + - - - - - - + + + + - - + + - - - - - - - - - - - - - - - +L43.2188 8.29688 +Q40.1406 3.32812 35.5469 0.953125 +Q30.9531 -1.42188 24.3125 -1.42188 +Q15.9219 -1.42188 10.9531 3.29688 +Q6 8.01562 6 15.9219 +Q6 25.1406 12.1719 29.8281 +Q18.3594 34.5156 30.6094 34.5156 +L43.2188 34.5156 +L43.2188 35.4062 +Q43.2188 41.6094 39.1406 45 +Q35.0625 48.3906 27.6875 48.3906 +Q23 48.3906 18.5469 47.2656 +Q14.1094 46.1406 10.0156 43.8906 +L10.0156 52.2031 +Q14.9375 54.1094 19.5781 55.0469 +Q24.2188 56 28.6094 56 +Q40.4844 56 46.3438 49.8438 +Q52.2031 43.7031 52.2031 31.2031" id="BitstreamVeraSans-Roman-61"/> + + + + + + + + + + + + - + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.pdf b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.pdf index 12df119ad92e..1d5e5bbe8117 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.png b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.png index d455bb40fea0..bea77c2b3fe8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.png and b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.svg b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.svg index 9ba8d8431b47..c82b4c8212e6 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/polar_coords.svg @@ -1,347 +1,447 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf index 604364f3f8ac..bb28e0efc080 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png index 570ea8669d5b..2bbdf9950063 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png and b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg index 108078e35cd1..ff37081b95a2 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg @@ -1,50 +1,264 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.pdf b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.pdf index b88255960cba..78ac31d39fa0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.png b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.png index bcd8a1da63df..b0368d9e6ff5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.png and b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.svg b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.svg index 06a88000a39f..de55e81169b5 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/symlog2.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/symlog2.svg @@ -77,80 +77,6 @@ L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0. - - - - - - - - - - - - - - - @@ -168,15 +94,6 @@ L226.695 43.2" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - - - @@ -194,12 +111,6 @@ L295.2 43.2" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - @@ -217,14 +128,6 @@ L363.705 43.2" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - - @@ -242,14 +145,6 @@ L518.4 43.2" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - - - @@ -349,51 +244,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - - - - @@ -411,35 +261,6 @@ L518.4 92.8552" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - - - - @@ -457,14 +278,6 @@ L518.4 82.9241" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -482,12 +295,6 @@ L518.4 72.9931" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -505,13 +312,6 @@ L518.4 63.0621" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -529,13 +329,6 @@ L518.4 53.131" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - @@ -553,13 +346,6 @@ L518.4 43.2" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - - @@ -649,15 +435,6 @@ L72 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - - - - @@ -675,15 +452,6 @@ L151.428 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -701,15 +469,6 @@ L251.073 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -727,12 +486,6 @@ L295.2 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -750,14 +503,6 @@ L339.327 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - @@ -775,14 +520,6 @@ L438.972 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - @@ -800,14 +537,6 @@ L518.4 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -911,14 +640,6 @@ L518.4 174.29" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - - @@ -936,14 +657,6 @@ L518.4 164.359" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -961,14 +674,6 @@ L518.4 154.428" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -986,12 +691,6 @@ L518.4 144.497" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -1009,13 +708,6 @@ L518.4 134.566" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1033,13 +725,6 @@ L518.4 124.634" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1057,13 +742,6 @@ L518.4 114.703" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1155,15 +833,6 @@ L72 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - - - - @@ -1181,15 +850,6 @@ L143.743 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -1207,15 +867,6 @@ L215.486 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -1233,12 +884,6 @@ L295.2 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -1256,14 +901,6 @@ L374.914 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - @@ -1281,14 +918,6 @@ L446.657 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - @@ -1306,14 +935,6 @@ L518.4 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -1417,14 +1038,6 @@ L518.4 245.793" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -1442,14 +1055,6 @@ L518.4 235.862" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -1467,14 +1072,6 @@ L518.4 225.931" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -1492,12 +1089,6 @@ L518.4 216" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;s - - - - - - @@ -1515,13 +1106,6 @@ L518.4 206.069" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1539,13 +1123,6 @@ L518.4 196.138" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1563,13 +1140,6 @@ L518.4 186.207" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -1665,15 +1235,6 @@ L72 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;s - - - - - - - - - @@ -1691,15 +1252,6 @@ L126.292 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - - @@ -1717,15 +1269,6 @@ L180.584 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - - @@ -1743,16 +1286,6 @@ L234.876 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - - - @@ -1770,12 +1303,6 @@ L295.2 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - @@ -1793,15 +1320,6 @@ L355.524 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - - @@ -1819,14 +1337,6 @@ L409.816 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - @@ -1844,14 +1354,6 @@ L464.108 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - @@ -1869,14 +1371,6 @@ L518.4 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - - @@ -2004,14 +1498,6 @@ L518.4 317.297" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -2029,14 +1515,6 @@ L518.4 307.366" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -2054,14 +1532,6 @@ L518.4 297.434" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -2079,12 +1549,6 @@ L518.4 287.503" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -2102,13 +1566,6 @@ L518.4 277.572" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -2126,13 +1583,6 @@ L518.4 267.641" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - @@ -2150,13 +1600,6 @@ L518.4 257.71" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - @@ -2273,15 +1716,6 @@ L72 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000; - - - - - - - - - @@ -2299,15 +1733,6 @@ L115.67 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - - @@ -2325,15 +1750,6 @@ L159.339 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -2351,16 +1767,6 @@ L203.009 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - - @@ -2378,16 +1784,6 @@ L246.678 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - - @@ -2405,12 +1801,6 @@ L295.2 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - @@ -2428,15 +1818,6 @@ L343.722 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -2454,15 +1835,6 @@ L387.391 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - - @@ -2480,14 +1852,6 @@ L431.061 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00 - - - - - - - - @@ -2505,14 +1869,6 @@ L474.73 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000 - - - - - - - - @@ -2530,14 +1886,6 @@ L518.4 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - @@ -2689,25 +2037,6 @@ L518.4 388.8" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000 - - - - - - - - - - - - - @@ -2725,43 +2054,6 @@ L518.4 373.903" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - - - - - - @@ -2779,15 +2071,6 @@ L518.4 359.007" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - - @@ -2805,15 +2088,6 @@ L518.4 344.11" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.00000 - - - - - - - - - @@ -2831,15 +2105,6 @@ L518.4 329.214" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.0000 - - - - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-con.png index 5ac8700be090..8ee17e8684d8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-img.png index 1e4bc882702c..ce74d8c30c69 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-con.png index 052b88350f1a..c6c62283694c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-img.png index 813cc0a89388..ddbff7bc7f18 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-con.png index 3fe98a4cba37..27f27567b8a7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-img.png index e7d56afeba11..4be8fb5527ce 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cliff-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-con.png index b7a5637bd3d5..de046e63bdaf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-img.png index 6c16c142146d..6c4f6044e67d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-con.png index 9d1319179414..6b1649024628 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-img.png index 5fa92f6320bc..888c8161c96a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-con.png index 96e36b0c3f60..994645e1911d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-img.png index a1e39491254e..2e3a8caf6fe6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cloverleaf-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-con.png index 8a54eb536903..cc71d0662e71 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-img.png index a0a7cd6447f1..83e25c49f5f4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-con.png index 0e2964717332..55433e819930 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-img.png index 6b987c0c1d62..5aaa1ddfe8c5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-con.png index 229dfd89637c..a5e65166cd99 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-img.png index abd80399b068..09b17d320dd8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/cosine_peak-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-con.png index 07924c1a961e..deaa6aeeda58 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-img.png index 3a63605152b7..f585196e1928 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-con.png index 0b7bdb6911ad..2f0a85b8a13c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-img.png index 1e55fb151e87..a813f46553c8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-con.png index 2f5d72a4726d..32c5c8e5a8f6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-img.png index 45a1de7e1947..7110aacf8def 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/exponential-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-con.png index fa8087ebbc66..15b2deceae27 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-img.png index 77f7461a1286..205e925af0a3 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-con.png index 51f189e9a668..a58174e5d92f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-img.png index 28b712bc42b5..94871001c2e6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-con.png index 46f73d52157b..91226d564371 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-img.png index 8f527f83bd6f..8ce3bc06f58b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gauss-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-con.png index af5a14f56eca..9557c9ec90bb 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-img.png index 580cb0e2cc10..7dc863c35f8c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-con.png index 9871b1d1fd38..c61a1b40ca5b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-img.png index f0dc695391d7..0af13fa4f8af 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-con.png index d7ea8e51bbb6..c73124cfa2a9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-img.png index 0a8af4706d96..82f23f75b39e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/gentle-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-con.png index e6ea1241b61e..eb6108b947e8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-img.png index fe44b649aa09..f4fc5d078ede 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-con.png index f2cb127ca011..f719472d89c4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-img.png index 38d23b6f2ece..3976918523c9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-con.png index 66f71b3200d4..2ca50bf64dab 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-img.png index 0923640bf55b..24c6cec03331 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/saddle-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-con.png index f56f63b46dc9..24dc62f8fa81 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-img.png index f788c67082b4..fbb409459c33 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-con.png index db1fa45f0640..638f79693769 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-img.png index 63d799bcee33..fa642d733424 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-con.png index 84c58c1834e1..0aaaeb8f081e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-img.png index dd9733e1333d..36c430700a0a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/sphere-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-con.png index d4c4148cd58e..b3a74ef67d15 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-img.png index 14d979be4189..620f114741ab 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-con.png index 800619a994f8..4325712f2a18 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-img.png index 5b31b80491f6..811cbc86d15b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-con.png index 7ce04b8c5ff4..8a7aeadbd9e2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-img.png index 37108d4b843c..1013b5f5b3a1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/steep-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-con.png index fe7df8cf6ac5..80f732a94c09 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-img.png index 1682904c3ad2..4452f636608e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-lin-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-con.png index 8cf63295f0e6..fabb633924eb 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-img.png index 3f313f2d0579..e2f9871f3434 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-nn-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-con.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-con.png index f470969115cd..839eafa61971 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-con.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-con.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-img.png b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-img.png index 5c53aa4de7ff..b8677faa3676 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-img.png and b/lib/matplotlib/tests/baseline_images/test_delaunay/trig-ref-img.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.svg b/lib/matplotlib/tests/baseline_images/test_image/imshow.svg index 796b6a53c980..7d72eee81827 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/imshow.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/imshow.svg @@ -32,8 +32,198 @@ z - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABHNCSVQICAgIfAhkiAAAABtJREFUCJljvrVU8T+v6L0GhoZ/DP//JXv8BwBPvwlIEKcPcwAAAABJRU5ErkJggg==" y="-0.5"/> @@ -40,185 +38,68 @@ CJljvrVU8T+v6L0GhoZ/DP//JXv8BwBPvwlIEKcPcwAAAABJRU5ErkJggg== +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - - - - + - + - - - - - - - - - + @@ -229,109 +110,68 @@ z +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + @@ -356,207 +196,6 @@ L274.909 317.455" style="fill:none;stroke:#000000;"/> M72 317.455 L72 114.545" style="fill:none;stroke:#000000;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -570,119 +209,66 @@ z +iVBORw0KGgoAAAANSUhEUgAAAMwAAADLCAYAAAAiJ3xKAAAABHNCSVQICAgIfAhkiAAAAldJREFUeJzt1UERwkAABMEEJXGDEXyAFD4xggAEYOYQkHzmdVDVrWA/U7t+9m0s/Jzn6z17AicuswfAPxEMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAYCwUAgGAgEA4FgIBAMBIKBQDAQCAaC9T6WMXsER4/bdfYETngYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEX/HUCgtErBocAAAAAElFTkSuQmCC" y="114.454545455"/> - + - - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + @@ -691,101 +277,60 @@ EAwEgoFAMBAIBgLBQCAYCAQDgWAgEAwEX/HUCgtErBocAAAAAElFTkSuQmCC - + - - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + - + - - - - - - - - - + @@ -810,64 +355,6 @@ L518.4 317.455" style="fill:none;stroke:#000000;"/> M315.491 317.455 L315.491 114.545" style="fill:none;stroke:#000000;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.pdf b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.pdf index 288890bd3b5a..a90701c7fea7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.pdf and b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.png b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.png index a7355054fe17..c5f9f43091b4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.png and b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg index ca229e402658..7e6b1a4ef423 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg @@ -16,7 +16,7 @@ L576 432 L576 0 L0 0 z -" style="fill:#ffffff;stroke:#ffffff;"/> +" style="fill:#ffffff;"/> @@ -41,114 +41,109 @@ C-2.6839 -1.55874 -3 -0.795609 -3 0 C-3 0.795609 -2.6839 1.55874 -2.12132 2.12132 C-1.55874 2.6839 -0.795609 3 0 3 z -" id="m1a9f33571b"/> - - - - - +" id="m0f54036a79" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164,109 +159,109 @@ C-2.6839 -1.55874 -3 -0.795609 -3 0 C-3 0.795609 -2.6839 1.55874 -2.12132 2.12132 C-1.55874 2.6839 -0.795609 3 0 3 z -" id="m1a9f33571b"/> +" id="m365dd9364a" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275,323 +270,80 @@ z +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - + @@ -602,212 +354,92 @@ z +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - + @@ -845,60 +477,60 @@ z - - - - - + + - + + - + @@ -906,37 +538,23 @@ z - - - - - + + - + - + @@ -946,4 +564,9 @@ z + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf index b43d8b815af0..a6837e4879a2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf and b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.png b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.png index f8e6f88aae09..b566c4775b1a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.png and b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg index e515b9c7b670..a88e1886f240 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg @@ -16,7 +16,7 @@ L576 432 L576 0 L0 0 z -" style="fill:#ffffff;stroke:#ffffff;"/> +" style="fill:#ffffff;"/> @@ -29,11 +29,6 @@ z " style="fill:#ffffff;"/> - - - - - +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L0 4" id="mdad270ee8e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - + @@ -2166,172 +1918,80 @@ z +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - - - - + @@ -2376,53 +2036,53 @@ L256.649 57.0217 z " style="fill:#bf00bf;stroke:#000000;"/> - + +L45.3125 8.40625 +Q42.0469 3.42188 37.7188 1 +Q33.4062 -1.42188 27.6875 -1.42188 +Q18.2656 -1.42188 13.375 4.4375 +Q8.5 10.2969 8.5 21.5781" id="BitstreamVeraSans-Roman-75"/> +M18.1094 8.20312 +L18.1094 -20.7969 +L9.07812 -20.7969 +L9.07812 54.6875 +L18.1094 54.6875 +L18.1094 46.3906 +Q20.9531 51.2656 25.2656 53.625 +Q29.5938 56 35.5938 56 +Q45.5625 56 51.7812 48.0938 +Q58.0156 40.1875 58.0156 27.2969 +Q58.0156 14.4062 51.7812 6.48438 +Q45.5625 -1.42188 35.5938 -1.42188 +Q29.5938 -1.42188 25.2656 0.953125 +Q20.9531 3.32812 18.1094 8.20312 +M48.6875 27.2969 +Q48.6875 37.2031 44.6094 42.8438 +Q40.5312 48.4844 33.4062 48.4844 +Q26.2656 48.4844 22.1875 42.8438 +Q18.1094 37.2031 18.1094 27.2969 +Q18.1094 17.3906 22.1875 11.75 +Q26.2656 6.10938 33.4062 6.10938 +Q40.5312 6.10938 44.6094 11.75 +Q48.6875 17.3906 48.6875 27.2969" id="BitstreamVeraSans-Roman-70"/> - + @@ -2436,88 +2096,88 @@ L256.649 78.1582 z " style="fill:#008000;stroke:#000000;"/> - + +L9.07812 54.6875 +L18.1094 54.6875 +L18.1094 46.1875 +Q21.3438 51.125 25.7031 53.5625 +Q30.0781 56 35.7969 56 +Q45.2188 56 50.0469 50.1719 +Q54.8906 44.3438 54.8906 33.0156" id="BitstreamVeraSans-Roman-6e"/> +L45.4062 8.20312 +Q42.5781 3.32812 38.25 0.953125 +Q33.9375 -1.42188 27.875 -1.42188 +Q17.9688 -1.42188 11.7344 6.48438 +Q5.51562 14.4062 5.51562 27.2969 +Q5.51562 40.1875 11.7344 48.0938 +Q17.9688 56 27.875 56 +Q33.9375 56 38.25 53.625 +Q42.5781 51.2656 45.4062 46.3906 +M14.7969 27.2969 +Q14.7969 17.3906 18.875 11.75 +Q22.9531 6.10938 30.0781 6.10938 +Q37.2031 6.10938 41.2969 11.75 +Q45.4062 17.3906 45.4062 27.2969 +Q45.4062 37.2031 41.2969 42.8438 +Q37.2031 48.4844 30.0781 48.4844 +Q22.9531 48.4844 18.875 42.8438 +Q14.7969 37.2031 14.7969 27.2969" id="BitstreamVeraSans-Roman-64"/> +M30.6094 48.3906 +Q23.3906 48.3906 19.1875 42.75 +Q14.9844 37.1094 14.9844 27.2969 +Q14.9844 17.4844 19.1562 11.8438 +Q23.3438 6.20312 30.6094 6.20312 +Q37.7969 6.20312 41.9844 11.8594 +Q46.1875 17.5312 46.1875 27.2969 +Q46.1875 37.0156 41.9844 42.7031 +Q37.7969 48.3906 30.6094 48.3906 +M30.6094 56 +Q42.3281 56 49.0156 48.375 +Q55.7188 40.7656 55.7188 27.2969 +Q55.7188 13.875 49.0156 6.21875 +Q42.3281 -1.42188 30.6094 -1.42188 +Q18.8438 -1.42188 12.1719 6.21875 +Q5.51562 13.875 5.51562 27.2969 +Q5.51562 40.7656 12.1719 48.375 +Q18.8438 56 30.6094 56" id="BitstreamVeraSans-Roman-6f"/> - + @@ -2527,4 +2187,9 @@ z + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.pdf b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.pdf index 040278eebf6e..c334678a9f0a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.pdf and b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.png b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.png index 0ee06929b7f4..c64121c1edfc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.png and b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.svg b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.svg index a434483f809e..2f394b761d94 100644 --- a/lib/matplotlib/tests/baseline_images/test_simplification/clipping.svg +++ b/lib/matplotlib/tests/baseline_images/test_simplification/clipping.svg @@ -1,49 +1,252 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.pdf b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.pdf index 80194e91ceae..e7db66b14b4c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.pdf and b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png index 44dcbce6b1d9..696e5d15e149 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png and b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.svg b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.svg index dc25c951cbf6..c208921be5c6 100644 --- a/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.svg +++ b/lib/matplotlib/tests/baseline_images/test_simplification/clipping_diamond.svg @@ -1,48 +1,214 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf index 125b9b791cb6..6c64eb9ddfa4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf and b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png index c1e459078078..388cad1a839c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png and b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg index b539f8df9067..33bffc375266 100644 --- a/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg +++ b/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg @@ -51,8 +51,222 @@ L487.018 388.8 L489.926 388.8 L489.926 388.8" style="fill:none;stroke:#0000ff;"/> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - @@ -155,53 +71,6 @@ z - - - - - - - - - - - - @@ -214,42 +83,6 @@ Q18.3125 60.0625 18.3125 54.3906" id="BitstreamVeraSans-Roman-38"/> - - - - - - - - - - - - @@ -262,40 +95,6 @@ z - - - - - - - - - - - - @@ -308,15 +107,6 @@ Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/> - - - - - - - - - @@ -341,15 +131,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - @@ -362,15 +143,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - @@ -383,15 +155,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - @@ -404,15 +167,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - @@ -425,15 +179,6 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0 - - - - - - - - - diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.pdf b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.pdf index 540150335554..f81935b6efda 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.pdf and b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.png b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.png index 1393fca44d60..5fd1a7af36b7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.png and b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.svg b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.svg index 520acd652bff..f50ec831f71c 100644 --- a/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.svg +++ b/lib/matplotlib/tests/baseline_images/test_simplification/para_equal_perp.svg @@ -1,296 +1,416 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index b8c31f1bac68..1b3f0e969f8f 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -62,7 +62,7 @@ def test_formatter_large_small(): y = [500000001, 500000002] ax.plot(x, y) -@image_comparison(baseline_images=["autoscale_tiny_range"]) +@image_comparison(baseline_images=["autoscale_tiny_range"], remove_text=True) def test_autoscale_tiny_range(): # github pull #904 fig, ax = plt.subplots(2, 2) @@ -71,7 +71,8 @@ def test_autoscale_tiny_range(): y1 = 10**(-11 - i) ax[i].plot([0, 1], [1, 1 + y1]) -@image_comparison(baseline_images=['offset_points']) +@image_comparison(baseline_images=['offset_points'], + remove_text=True) def test_basic_annotate(): # Setup some data t = np.arange( 0.0, 5.0, 0.01 ) @@ -119,7 +120,8 @@ def test_polar_annotations(): ) #-------------------------------------------------------------------- -@image_comparison(baseline_images=['polar_coords']) +@image_comparison(baseline_images=['polar_coords'], + remove_text=True) def test_polar_coord_annotations(): # You can also use polar notation on a catesian axes. Here the # native coordinate system ('data') is cartesian, so you need to @@ -380,7 +382,8 @@ def test_axhspan_epoch(): ax.set_ylim( t0 - 5.0*dt, tf + 5.0*dt ) -@image_comparison(baseline_images=['hexbin_extent']) +@image_comparison(baseline_images=['hexbin_extent'], + remove_text=True) def test_hexbin_extent(): # this test exposes sf bug 2856228 fig = plt.figure() @@ -405,7 +408,8 @@ def test_nonfinite_limits(): ax = fig.add_subplot(111) ax.plot(x, y) -@image_comparison(baseline_images=['imshow']) +@image_comparison(baseline_images=['imshow'], + remove_text=True) def test_imshow(): #Create a NxN image N=100 @@ -446,7 +450,8 @@ def test_imshow_clip(): #Plot the image clipped by the contour ax.imshow(r, clip_path=clip_path) -@image_comparison(baseline_images=['polycollection_joinstyle']) +@image_comparison(baseline_images=['polycollection_joinstyle'], + remove_text=True) def test_polycollection_joinstyle(): # Bug #2890979 reported by Matthew West @@ -459,10 +464,9 @@ def test_polycollection_joinstyle(): ax.add_collection(c) ax.set_xbound(0, 3) ax.set_ybound(0, 3) - ax.set_xticks([]) - ax.set_yticks([]) -@image_comparison(baseline_images=['fill_between_interpolate'], tol=1e-2) +@image_comparison(baseline_images=['fill_between_interpolate'], + tol=1e-2, remove_text=True) def test_fill_between_interpolate(): x = np.arange(0.0, 2, 0.02) y1 = np.sin(2*np.pi*x) @@ -493,7 +497,8 @@ def test_symlog(): ax.set_xscale=('linear') ax.set_ylim(-1,10000000) -@image_comparison(baseline_images=['symlog2']) +@image_comparison(baseline_images=['symlog2'], + remove_text=True) def test_symlog2(): # Numbers from -50 to 50, with 0.1 as step x = np.arange(-50,50, 0.001) @@ -530,7 +535,8 @@ def test_symlog2(): ax.grid(True) ax.set_ylim(-0.1, 0.1) -@image_comparison(baseline_images=['pcolormesh'], tol=0.02) +@image_comparison(baseline_images=['pcolormesh'], tol=0.02, + remove_text=True) def test_pcolormesh(): n = 12 x = np.linspace(-1.5,1.5,n) @@ -548,21 +554,12 @@ def test_pcolormesh(): fig = plt.figure() ax = fig.add_subplot(131) ax.pcolormesh(Qx,Qz,Z, lw=0.5, edgecolors='k') - ax.set_title('lw=0.5') - ax.set_xticks([]) - ax.set_yticks([]) ax = fig.add_subplot(132) ax.pcolormesh(Qx,Qz,Z, lw=2, edgecolors=['b', 'w']) - ax.set_title('lw=2') - ax.set_xticks([]) - ax.set_yticks([]) ax = fig.add_subplot(133) ax.pcolormesh(Qx,Qz,Z, shading="gouraud") - ax.set_title('gouraud') - ax.set_xticks([]) - ax.set_yticks([]) @image_comparison(baseline_images=['canonical']) @@ -572,7 +569,7 @@ def test_canonical(): @image_comparison(baseline_images=['arc_ellipse'], - freetype_version=('2.4.5', '2.4.9')) + remove_text=True) def test_arc_ellipse(): from matplotlib import patches xcenter, ycenter = 0.38, 0.52 @@ -619,7 +616,8 @@ def test_units_strings(): ax = fig.add_subplot(111) ax.plot(Id, pout) -@image_comparison(baseline_images=['markevery']) +@image_comparison(baseline_images=['markevery'], + remove_text=True) def test_markevery(): x = np.linspace(0, 10, 100) y = np.sin(x) * np.sqrt(x/10 + 0.5) @@ -634,7 +632,7 @@ def test_markevery(): ax.legend() @image_comparison(baseline_images=['markevery_line'], - freetype_version=('2.4.5', '2.4.9')) + remove_text=True) def test_markevery_line(): x = np.linspace(0, 10, 100) y = np.sin(x) * np.sqrt(x/10 + 0.5) @@ -648,7 +646,8 @@ def test_markevery_line(): ax.plot(x, y, '-+', markevery=(5, 20), label='mark every 5 starting at 10') ax.legend() -@image_comparison(baseline_images=['marker_edges']) +@image_comparison(baseline_images=['marker_edges'], + remove_text=True) def test_marker_edges(): x = np.linspace(0, 1, 10) fig = plt.figure() @@ -656,18 +655,15 @@ def test_marker_edges(): ax.plot(x, np.sin(x), 'y.', ms=30.0, mew=0, mec='r') ax.plot(x+0.1, np.sin(x), 'y.', ms=30.0, mew=1, mec='r') ax.plot(x+0.2, np.sin(x), 'y.', ms=30.0, mew=2, mec='b') - ax.set_xticks([]) - ax.set_yticks([]) -@image_comparison(baseline_images=['hist_log']) +@image_comparison(baseline_images=['hist_log'], + remove_text=True) def test_hist_log(): data0 = np.linspace(0,1,200)**3 data = np.r_[1-data0, 1+data0] fig = plt.figure() ax = fig.add_subplot(111) ax.hist(data, fill=False, log=True) - ax.set_xticks([]) - ax.set_yticks([]) @image_comparison(baseline_images=['contour_hatching']) def test_contour_hatching(): diff --git a/lib/matplotlib/tests/test_delaunay.py b/lib/matplotlib/tests/test_delaunay.py index 629816127f13..720fe5fe918b 100644 --- a/lib/matplotlib/tests/test_delaunay.py +++ b/lib/matplotlib/tests/test_delaunay.py @@ -168,7 +168,8 @@ def make_test(func): # We only generate PNGs to save disk space -- we just assume # that any backend differences are caught by other tests. @image_comparison(filenames, extensions=['png'], - freetype_version=('2.4.5', '2.4.9')) + freetype_version=('2.4.5', '2.4.9'), + remove_text=True) def reference_test(): nnt.plot(func, interp=False, plotter='imshow') nnt.plot(func, interp=True, plotter='imshow') diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 15d3c41e0420..4556013bc4cb 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -36,7 +36,8 @@ def test_image_interps(): ax3.imshow(X, interpolation='bicubic') ax3.set_ylabel('bicubic') -@image_comparison(baseline_images=['interp_nearest_vs_none'], extensions=['pdf', 'svg']) +@image_comparison(baseline_images=['interp_nearest_vs_none'], + extensions=['pdf', 'svg'], remove_text=True) def test_interp_nearest_vs_none(): 'Test the effect of "nearest" and "none" interpolation' # Setting dpi to something really small makes the difference very @@ -138,7 +139,7 @@ def test_image_clip(): im = ax.imshow(d, extent=(-pi,pi,-pi/2,pi/2)) -@image_comparison(baseline_images=['imshow'], tol=1.5e-3) +@image_comparison(baseline_images=['imshow'], tol=1.5e-3, remove_text=True) def test_imshow(): import numpy as np import matplotlib.pyplot as plt @@ -149,21 +150,15 @@ def test_imshow(): ax.imshow(arr, interpolation="bilinear", extent=(1,2,1,2)) ax.set_xlim(0,3) ax.set_ylim(0,3) - ax.set_xticks([]) - ax.set_yticks([]) -@image_comparison(baseline_images=['no_interpolation_origin']) +@image_comparison(baseline_images=['no_interpolation_origin'], remove_text=True) def test_no_interpolation_origin(): fig = plt.figure() ax = fig.add_subplot(211) ax.imshow(np.arange(100).reshape((2, 50)), origin="lower", interpolation='none') - ax.set_xticks([]) - ax.set_yticks([]) ax = fig.add_subplot(212) ax.imshow(np.arange(100).reshape((2, 50)), interpolation='none') - ax.set_xticks([]) - ax.set_yticks([]) if __name__=='__main__': import nose diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index c15c43ef33f3..92acc26fece6 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -5,7 +5,7 @@ from nose.tools import assert_raises from numpy.testing import assert_array_equal -@image_comparison(baseline_images=['legend_auto1'], tol=1.5e-3) +@image_comparison(baseline_images=['legend_auto1'], tol=1.5e-3, remove_text=True) def test_legend_auto1(): 'Test automatic legend placement' fig = plt.figure() @@ -15,7 +15,7 @@ def test_legend_auto1(): ax.plot(x, x-50, 'o', label='y=-1') ax.legend(loc=0) -@image_comparison(baseline_images=['legend_auto2']) +@image_comparison(baseline_images=['legend_auto2'], remove_text=True) def test_legend_auto2(): 'Test automatic legend placement' fig = plt.figure() @@ -24,4 +24,3 @@ def test_legend_auto2(): b1 = ax.bar(x, x, color='m') b2 = ax.bar(x, x[::-1], color='g') ax.legend([b1[0], b2[0]], ['up', 'down'], loc=0) - diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py index eb1156146b83..03a5d84597a7 100644 --- a/lib/matplotlib/tests/test_simplification.py +++ b/lib/matplotlib/tests/test_simplification.py @@ -18,7 +18,7 @@ # NOTE: All of these tests assume that path.simplify is set to True # (the default) -@image_comparison(baseline_images=['clipping']) +@image_comparison(baseline_images=['clipping'], remove_text=True) def test_clipping(): t = np.arange(0.0, 2.0, 0.01) s = np.sin(2*pi*t) @@ -27,10 +27,8 @@ def test_clipping(): ax = fig.add_subplot(111) ax.plot(t, s, linewidth=1.0) ax.set_ylim((-0.20, -0.28)) - ax.set_xticks([]) - ax.set_yticks([]) -@image_comparison(baseline_images=['overflow'], tol=1e-2) +@image_comparison(baseline_images=['overflow'], tol=1e-2, remove_text=True) def test_overflow(): x = np.array([1.0,2.0,3.0,2.0e5]) y = np.arange(len(x)) @@ -39,10 +37,8 @@ def test_overflow(): ax = fig.add_subplot(111) ax.plot(x,y) ax.set_xlim(xmin=2,xmax=6) - ax.set_xticks([]) - ax.set_yticks([]) -@image_comparison(baseline_images=['clipping_diamond']) +@image_comparison(baseline_images=['clipping_diamond'], remove_text=True) def test_diamond(): x = np.array([0.0, 1.0, 0.0, -1.0, 0.0]) y = np.array([1.0, 0.0, -1.0, 0.0, 1.0]) @@ -52,8 +48,6 @@ def test_diamond(): ax.plot(x, y) ax.set_xlim(xmin=-0.6, xmax=0.6) ax.set_ylim(ymin=-0.6, ymax=0.6) - ax.set_xticks([]) - ax.set_yticks([]) @cleanup def test_noise(): @@ -63,8 +57,6 @@ def test_noise(): fig = plt.figure() ax = fig.add_subplot(111) p1 = ax.plot(x, solid_joinstyle='round', linewidth=2.0) - ax.set_xticks([]) - ax.set_yticks([]) path = p1[0].get_path() transform = p1[0].get_transform() @@ -81,8 +73,6 @@ def test_sine_plus_noise(): fig = plt.figure() ax = fig.add_subplot(111) p1 = ax.plot(x, solid_joinstyle='round', linewidth=2.0) - ax.set_xticks([]) - ax.set_yticks([]) path = p1[0].get_path() transform = p1[0].get_transform() @@ -91,7 +81,7 @@ def test_sine_plus_noise(): assert len(simplified) == 876 -@image_comparison(baseline_images=['simplify_curve']) +@image_comparison(baseline_images=['simplify_curve'], remove_text=True) def test_simplify_curve(): pp1 = patches.PathPatch( Path([(0, 0), (1, 0), (1, 1), (nan, 1), (0, 0), (2, 0), (2, 2), (0, 0)], @@ -101,12 +91,10 @@ def test_simplify_curve(): fig = plt.figure() ax = fig.add_subplot(111) ax.add_patch(pp1) - ax.set_xticks([]) - ax.set_yticks([]) ax.set_xlim((0, 2)) ax.set_ylim((0, 2)) -@image_comparison(baseline_images=['hatch_simplify']) +@image_comparison(baseline_images=['hatch_simplify'], remove_text=True) def test_hatch(): fig = plt.figure() ax = fig.add_subplot(111) @@ -114,14 +102,12 @@ def test_hatch(): ax.set_xlim((0.45, 0.55)) ax.set_ylim((0.45, 0.55)) -@image_comparison(baseline_images=['fft_peaks']) +@image_comparison(baseline_images=['fft_peaks'], remove_text=True) def test_fft_peaks(): fig = plt.figure() t = arange(65536) ax = fig.add_subplot(111) p1 = ax.plot(abs(fft(sin(2*pi*.01*t)*blackman(len(t))))) - ax.set_xticks([]) - ax.set_yticks([]) path = p1[0].get_path() transform = p1[0].get_transform() @@ -186,7 +172,7 @@ def test_throw_rendering_complexity_exceeded(): finally: rcParams['path.simplify'] = True -@image_comparison(baseline_images=['clipper_edge']) +@image_comparison(baseline_images=['clipper_edge'], remove_text=True) def test_clipper(): dat = (0, 1, 0, 2, 0, 3, 0, 4, 0, 5) fig = plt.figure(figsize=(2, 1)) @@ -195,15 +181,13 @@ def test_clipper(): ax = fig.add_axes((0, 0, 1.0, 1.0), ylim = (0, 5), autoscale_on = False) ax.plot(dat) ax.xaxis.set_major_locator(plt.MultipleLocator(1)) - ax.xaxis.set_major_formatter(plt.NullFormatter()) ax.yaxis.set_major_locator(plt.MultipleLocator(1)) - ax.yaxis.set_major_formatter(plt.NullFormatter()) ax.xaxis.set_ticks_position('bottom') ax.yaxis.set_ticks_position('left') ax.set_xlim(5, 9) -@image_comparison(baseline_images=['para_equal_perp']) +@image_comparison(baseline_images=['para_equal_perp'], remove_text=True) def test_para_equal_perp(): x = np.array([0, 1, 2, 1, 0, -1, 0, 1] + [1] * 128) y = np.array([1, 1, 2, 1, 0, -1, 0, 0] + [0] * 128)