diff --git a/lib/iris/palette.py b/lib/iris/palette.py index 5d8e1c010a..a9bfcc3f03 100644 --- a/lib/iris/palette.py +++ b/lib/iris/palette.py @@ -175,24 +175,30 @@ def __init__(self, pivot, *args, **kwargs): def __repr__(self): return '%s(%r)' % (self.__class__.__name__, self.pivot) + def _update(self, val, update_min=True, update_max=True): + # Update both _vmin and _vmax from given value. + val_diff = numpy.abs(val - self.pivot) + vmin_diff = numpy.abs(self._vmin - self.pivot) if self._vmin else 0.0 + vmax_diff = numpy.abs(self._vmax - self.pivot) if self._vmax else 0.0 + diff = max(val_diff, vmin_diff, vmax_diff) + + if update_min: + self._vmin = self.pivot - diff + if update_max: + self._vmax = self.pivot + diff + def _get_vmin(self): return getattr(self, '_vmin') def _set_vmin(self, val): if val is None: self._vmin = None + elif self._vmax is None: + # Don't set _vmax, it'll stop matplotlib from giving us one. + self._update(val, update_max=False) else: - vmax = self._vmax or self.pivot - - if numpy.abs(vmax - self.pivot) > numpy.abs(val - self.pivot): - if vmax == self.pivot: - self._vmin = self.pivot - else: - self._vmin = self.pivot - numpy.abs(vmax - self.pivot) - self._vmax = vmax - else: - self._vmin = val - self._vmax = self.pivot + numpy.abs(val - self.pivot) + # Set both _vmin and _vmax from value + self._update(val) vmin = property(_get_vmin, _set_vmin) @@ -202,18 +208,12 @@ def _get_vmax(self): def _set_vmax(self, val): if val is None: self._vmax = None + elif self._vmin is None: + # Don't set _vmin, it'll stop matplotlib from giving us one. + self._update(val, update_min=False) else: - vmin = self._vmin or self.pivot - - if numpy.abs(vmin - self.pivot) > numpy.abs(val - self.pivot): - if vmin == self.pivot: - self._vmax = self.pivot - else: - self._vmax = self.pivot + numpy.abs(vmin - self.pivot) - self._vmin = vmin - else: - self._vmin = self.pivot - numpy.abs(val - self.pivot) - self._vmax = val + # Set both _vmin and _vmax from value + self._update(val) vmax = property(_get_vmax, _set_vmax) diff --git a/lib/iris/plot.py b/lib/iris/plot.py index 68d1213e6e..6023aa1740 100644 --- a/lib/iris/plot.py +++ b/lib/iris/plot.py @@ -675,7 +675,10 @@ def outline(cube, coords=None): the plot and the second element is the vertical axis of the plot. """ - return _draw_2d_from_bounds('pcolormesh', cube, facecolors='none', edgecolors='k', antialiased=True, coords=coords) + result = _draw_2d_from_bounds('pcolormesh', cube, facecolors='none', edgecolors='k', antialiased=True, coords=coords) + # set the _is_stroked property to get a single color grid. See https://github.com/matplotlib/matplotlib/issues/1302 + result._is_stroked = False + return result @iris.palette.auto_palette diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index 7e18be8093..d064aaf44c 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -44,11 +44,8 @@ import zlib import matplotlib -matplotlib.use('agg') - import matplotlib.testing.compare as mcompare import matplotlib.pyplot as plt - import numpy import iris.cube @@ -57,7 +54,7 @@ import iris.util -_RESULT_PATH = os.path.join(iris.config.ROOT_PATH, 'tests', 'results') +_RESULT_PATH = os.path.join(os.path.dirname(__file__), 'results') """Basepath for test results.""" @@ -73,6 +70,15 @@ logger = logging.getLogger('tests') +# Whether to display matplotlib output to the screen. +_DISPLAY_FIGURES = False + +if '-d' in sys.argv: + sys.argv.remove('-d') + plt.switch_backend('tkagg') + _DISPLAY_FIGURES = True + + def main(): """A wrapper for unittest.main() which adds iris.test specific options to the help (-h) output.""" if '-h' in sys.argv or '--help' in sys.argv: @@ -86,6 +92,9 @@ def main(): sys.stdout = stdout lines = buff.getvalue().split('\n') lines.insert(9, 'Iris-specific options:') + lines.insert(10, ' -d Display matplotlib figures (uses tkagg).') + lines.insert(11, ' NOTE: To compare results of failing tests, ') + lines.insert(12, ' use idiff.py instead') lines.insert(13, ' --data-files-used Save a list of files used to a temporary file') print '\n'.join(lines) else: @@ -155,7 +164,7 @@ def assertCDL(self, netcdf_filename, reference_filename): # Ingest the CDL for comparison, excluding first line. with open(cdl_filename, 'r') as cdl_file: - cdl = ''.join(cdl_file.readlines()[1:]) + cdl = ''.join(cdl_file.readlines()[1:]) os.remove(cdl_filename) reference_path = get_result_path(reference_filename) @@ -355,7 +364,12 @@ def check_graphic(self, tol=0): err = mcompare.compare_images(expected_fname, result_fname, tol=tol) - assert not err, 'Image comparison failed. Message: %s' % err + if _DISPLAY_FIGURES: + if err: + print 'Image comparison would have failed. Message: %s' % err + plt.show() + else: + assert not err, 'Image comparison failed. Message: %s' % err finally: plt.close() diff --git a/lib/iris/tests/idiff.py b/lib/iris/tests/idiff.py old mode 100644 new mode 100755 index 2543f1e6a3..e962a64453 --- a/lib/iris/tests/idiff.py +++ b/lib/iris/tests/idiff.py @@ -22,110 +22,65 @@ """ -import multiprocessing -import optparse -import os import os.path import shutil -import matplotlib.cm as cm import matplotlib.pyplot as plt +import matplotlib.image as mimg +import matplotlib.widgets as mwidget -DIFF_DIR = 'diff_images' - - -class Difference(object): - def __init__(self, name, message): - self.name = name - self.message = message - - def __str__(self): - return "%s\n %s" % (self.name, self.message) - - -def compare_files(dir_path1, dir_path2, name): - result = None +def diff_viewer(expected_fname, result_fname, diff_fname): - path1 = os.path.join(dir_path1, name) - path2 = os.path.join(dir_path2, name) + plt.figure(figsize=(16, 16)) + plt.suptitle(os.path.basename(expected_fname)) + ax = plt.subplot(221) + ax.imshow(mimg.imread(expected_fname)) + ax = plt.subplot(222, sharex=ax, sharey=ax) + ax.imshow(mimg.imread(result_fname)) + ax = plt.subplot(223, sharex=ax, sharey=ax) + ax.imshow(mimg.imread(diff_fname)) - if not os.path.isfile(path1) or not os.path.isfile(path2): - result = Difference(name, 'missing file') - else: - image1 = plt.imread(path1) - image2 = plt.imread(path2) - if image1.shape != image2.shape: - result = Difference(name, "shape: %s -> %s" % (image1.shape, image2.shape)) - else: - diff = (image1 != image2).any(axis=2) - if diff.any(): - diff_path = os.path.join(DIFF_DIR, name) - diff_path = os.path.realpath(diff_path) - plt.figure(figsize=reversed(diff.shape), dpi=1) - plt.figimage(diff, cmap=cm.gray) - plt.savefig(diff_path, dpi=1) - result = Difference(name, "diff: %s" % diff_path) - return result - - -def map_compare_files(args): - return compare_files(*args) - + def accept(event): + # removes the expected result, and move the most recent result in + print 'ACCEPTED NEW FILE: %s' % (os.path.basename(expected_fname), ) + os.remove(expected_fname) + shutil.copy2(result_fname, expected_fname) + os.remove(diff_fname) + plt.close() + + def reject(event): + print 'REJECTED: %s' % (os.path.basename(expected_fname), ) + plt.close() + + ax_accept = plt.axes([0.7, 0.05, 0.1, 0.075]) + ax_reject = plt.axes([0.81, 0.05, 0.1, 0.075]) + bnext = mwidget.Button(ax_accept, 'Accept change') + bnext.on_clicked(accept) + bprev = mwidget.Button(ax_reject, 'Reject') + bprev.on_clicked(reject) + + plt.show() -def compare_dirs(dir_path1, dir_path2): - if not os.path.isdir(dir_path1) or not os.path.isdir(dir_path2): - raise ValueError('Can only compare directories') - # Prepare the results directory - if os.path.isdir(DIFF_DIR): - shutil.rmtree(DIFF_DIR) - os.makedirs(DIFF_DIR) - - pool = multiprocessing.Pool() - names = set(name for name in os.listdir(dir_path1)) - names = names.union(name for name in os.listdir(dir_path2)) - args = [(dir_path1, dir_path2, name) for name in names if name.endswith('.png')] - diffs = pool.map(map_compare_files, args) - for diff in diffs: - if diff is not None: - print diff - pass - pool.close() - pool.join() +def step_over_diffs(): + import iris.tests + image_dir = os.path.join(os.path.dirname(iris.tests.__file__), + 'results', 'visual_tests', + ) + diff_dir = os.path.join(os.path.dirname(iris.tests.__file__), + 'result_image_comparison', + ) -def step_over_diffs(d_path1, d_path2): - import matplotlib.pyplot as plt - import matplotlib.image as mimg + for expected_fname in os.listdir(image_dir): + expected_fname = os.path.join(image_dir, expected_fname) + result_fname = os.path.join(diff_dir, 'result-' + os.path.basename(expected_fname)) + diff_fname = result_fname[:-4] + '-failed-diff.png' - for fname in os.listdir(DIFF_DIR): - print fname - plt.figure(figsize=(16, 16)) - plt.suptitle(fname) - ax = plt.subplot(221) - plt.imshow(mimg.imread(os.path.join(d_path2, fname))) - ax = plt.subplot(222, sharex=ax, sharey=ax) - plt.imshow(mimg.imread(os.path.join(d_path1, fname))) - ax = plt.subplot(223, sharex=ax, sharey=ax) - plt.imshow(mimg.imread(os.path.join(DIFF_DIR, fname))) - plt.show() + # if the test failed, there will be a diff file + if os.path.exists(diff_fname): + diff_viewer(expected_fname, result_fname, diff_fname) if __name__ == '__main__': - usage = "usage: %prog [options] " - description = "Compare directories of PNG images, producing black and white mask images of the differences." \ - " Designed to compare image output from different branches, created with 'python test_thing.py -sf'." \ - " Example: python idiff.py /lib/iris_tests/image_results /lib/iris_tests/image_results" - parser = optparse.OptionParser(usage=usage, description=description) - parser.add_option('-o', '--output', dest='output', help='output directory', metavar='DIR') - parser.add_option('-n', dest='compute_diffs', action="store_false", help='Enable flag to disable diff creation, simply do other things instead (such as view pre computed diffs.)') - parser.add_option('-v', dest='view_diffs', action="store_true", help='view diffs') - (options, args) = parser.parse_args() - if len(args) != 2: - parser.error('Incorrect number of arguments') - if options.output: - DIFF_DIR = options.output - if options.compute_diffs != False: - compare_dirs(*args) - if options.view_diffs: - step_over_diffs(*args) + step_over_diffs() \ No newline at end of file diff --git a/lib/iris/tests/results/visual_tests/test_COP_1d_plot.TestCOP1DPlot.test_COP_1d_plot.0.png b/lib/iris/tests/results/visual_tests/test_COP_1d_plot.TestCOP1DPlot.test_COP_1d_plot.0.png index 5c488e694c..c98fe5bf72 100644 Binary files a/lib/iris/tests/results/visual_tests/test_COP_1d_plot.TestCOP1DPlot.test_COP_1d_plot.0.png and b/lib/iris/tests/results/visual_tests/test_COP_1d_plot.TestCOP1DPlot.test_COP_1d_plot.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_COP_maps.TestCOPMaps.test_cop_maps.0.png b/lib/iris/tests/results/visual_tests/test_COP_maps.TestCOPMaps.test_cop_maps.0.png index e170c63e95..2443c4a1e1 100644 Binary files a/lib/iris/tests/results/visual_tests/test_COP_maps.TestCOPMaps.test_cop_maps.0.png and b/lib/iris/tests/results/visual_tests/test_COP_maps.TestCOPMaps.test_cop_maps.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_auto.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_auto.0.png index 4fe5df5c2b..d34d4d6c7f 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_auto.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_auto.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_default.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_default.0.png index 06b28b6f75..0f1e84a74c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_default.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_default.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.0.png index 52ebd8325d..1d56e600cb 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.1.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.1.png index eff7259717..b6ae6a2383 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.1.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.2.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.2.png index 9680c58d1a..eaca968b72 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.2.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.3.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.3.png index e46bd6d662..b00c6fc13e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.3.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_cmap_override.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_auto.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_auto.0.png index aa010a711e..c41b5ae134 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_auto.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_auto.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_default.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_default.0.png index 7703056499..1a21897b61 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_default.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_default.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_override.0.png b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_override.0.png index 37c3b14b73..74555384e3 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_override.0.png and b/lib/iris/tests/results/visual_tests/test_cmap_norm.TestCmapNorm.test_norm_override.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_cross_section.TestCrossSection.test_cross_section.0.png b/lib/iris/tests/results/visual_tests/test_cross_section.TestCrossSection.test_cross_section.0.png index af43ddd459..59043d07cd 100644 Binary files a/lib/iris/tests/results/visual_tests/test_cross_section.TestCrossSection.test_cross_section.0.png and b/lib/iris/tests/results/visual_tests/test_cross_section.TestCrossSection.test_cross_section.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_custom_file_loading.TestCustomFileLoading.test_global_map.0.png b/lib/iris/tests/results/visual_tests/test_custom_file_loading.TestCustomFileLoading.test_global_map.0.png index 33de5f602b..c630ea258a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_custom_file_loading.TestCustomFileLoading.test_global_map.0.png and b/lib/iris/tests/results/visual_tests/test_custom_file_loading.TestCustomFileLoading.test_global_map.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_deriving_phenomena.TestDerivingPhenomena.test_deriving_phenomena.0.png b/lib/iris/tests/results/visual_tests/test_deriving_phenomena.TestDerivingPhenomena.test_deriving_phenomena.0.png index efd6c2c48d..3ae8f4d596 100644 Binary files a/lib/iris/tests/results/visual_tests/test_deriving_phenomena.TestDerivingPhenomena.test_deriving_phenomena.0.png and b/lib/iris/tests/results/visual_tests/test_deriving_phenomena.TestDerivingPhenomena.test_deriving_phenomena.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_global_map.TestGlobalMap.test_global_map.0.png b/lib/iris/tests/results/visual_tests/test_global_map.TestGlobalMap.test_global_map.0.png index e6800328c5..b6c3668a6e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_global_map.TestGlobalMap.test_global_map.0.png and b/lib/iris/tests/results/visual_tests/test_global_map.TestGlobalMap.test_global_map.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.0.png index 3e90ddb76f..4f9cf1635d 100644 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.0.png and b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.1.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.1.png index 6bb175a445..d0fd8645e3 100644 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.1.png and b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.2.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.2.png index 28cc994e03..ae76b194e6 100644 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.2.png and b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.3.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.3.png index 5dd652cbc1..a18c2b39dd 100644 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.3.png and b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_ij_directions.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_y_fastest.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_y_fastest.0.png index 9f591b7472..684bcb03ce 100644 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_y_fastest.0.png and b/lib/iris/tests/results/visual_tests/test_grib_load.TestGribLoad.test_y_fastest.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_hovmoller.TestGlobalMap.test_hovmoller.0.png b/lib/iris/tests/results/visual_tests/test_hovmoller.TestGlobalMap.test_hovmoller.0.png index a7a77b7ac4..a5aab3a920 100644 Binary files a/lib/iris/tests/results/visual_tests/test_hovmoller.TestGlobalMap.test_hovmoller.0.png and b/lib/iris/tests/results/visual_tests/test_hovmoller.TestGlobalMap.test_hovmoller.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_lagged_ensemble.TestLaggedEnsemble.test_lagged_ensemble.0.png b/lib/iris/tests/results/visual_tests/test_lagged_ensemble.TestLaggedEnsemble.test_lagged_ensemble.0.png index 8950c045fc..a10fa34f21 100644 Binary files a/lib/iris/tests/results/visual_tests/test_lagged_ensemble.TestLaggedEnsemble.test_lagged_ensemble.0.png and b/lib/iris/tests/results/visual_tests/test_lagged_ensemble.TestLaggedEnsemble.test_lagged_ensemble.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_lineplot_with_legend.TestLineplotWithLegend.test_lineplot_with_legend.0.png b/lib/iris/tests/results/visual_tests/test_lineplot_with_legend.TestLineplotWithLegend.test_lineplot_with_legend.0.png index 6414f37e4a..8dc3bbaa3f 100644 Binary files a/lib/iris/tests/results/visual_tests/test_lineplot_with_legend.TestLineplotWithLegend.test_lineplot_with_legend.0.png and b/lib/iris/tests/results/visual_tests/test_lineplot_with_legend.TestLineplotWithLegend.test_lineplot_with_legend.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_contourf.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_contourf.0.png index a128f78ce0..b0e054f87e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_contourf.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_contourf.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_pcolor.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_pcolor.0.png index 1a8543928f..08d0708393 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_pcolor.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_pcolor.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_unmappable.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_unmappable.0.png index 360d064317..0c81793545 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_unmappable.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestBasic.test_unmappable.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_grid.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_grid.0.png index 295c331193..48fa896410 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_grid.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_grid.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_pcolormesh.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_pcolormesh.0.png index 6a781c7411..1218fe652e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_pcolormesh.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestBoundedCube.test_pcolormesh.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_grid.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_grid.0.png index 10cfe3306a..d9768f8551 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_grid.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_grid.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_outline.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_outline.0.png index 8154f2584a..1c980f7c53 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_outline.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_outline.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_pcolormesh.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_pcolormesh.0.png index 23c253362b..c6fef18ad7 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_pcolormesh.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_pcolormesh.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_scatter.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_scatter.0.png index 6543139162..ff5d5ec4d8 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_scatter.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLimitedAreaCube.test_scatter.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.0.png index 5a443efa44..75602c337a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.1.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.1.png index ddfc1e66d9..cc1aa407e0 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.1.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_keywords.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.0.png index 7b09b17473..33551a57d7 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.1.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.1.png index 5a443efa44..75602c337a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.1.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.2.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.2.png index 546e189294..674664e239 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.2.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_params.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_simple.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_simple.0.png index 8c7f63409e..fc70b38d6d 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_simple.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestLowLevel.test_simple.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestMappingSubRegion.test_simple.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestMappingSubRegion.test_simple.0.png index 273261a342..fed5179af0 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestMappingSubRegion.test_simple.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestMappingSubRegion.test_simple.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_mapping.TestUnmappable.test_simple.0.png b/lib/iris/tests/results/visual_tests/test_mapping.TestUnmappable.test_simple.0.png index cdf9fd6d3d..3f46e95a9a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_mapping.TestUnmappable.test_simple.0.png and b/lib/iris/tests/results/visual_tests/test_mapping.TestUnmappable.test_simple.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_nimrod.TestGribLoad.test_load.0.png b/lib/iris/tests/results/visual_tests/test_nimrod.TestGribLoad.test_load.0.png index 297ffc4c3d..826cef739b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_nimrod.TestGribLoad.test_load.0.png and b/lib/iris/tests/results/visual_tests/test_nimrod.TestGribLoad.test_load.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tx.0.png index bd5fba698d..8d8144167b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_ty.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_ty.0.png index 6e8ee48464..917c5807c8 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_ty.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_ty.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tz.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tz.0.png index d5cb8f5bc8..b03b26f126 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tz.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_tz.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_yx.0.png index 55c83922bd..fe8bef6d9d 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zx.0.png index e924aaed82..0fd6f3120c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zy.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zy.0.png index 03167fc589..b8a9611d34 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zy.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContour.test_zy.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tx.0.png index ea362eed91..504f1bcdc5 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_ty.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_ty.0.png index 75aadb5f91..19c2133b73 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_ty.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_ty.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tz.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tz.0.png index a7dd4db7a7..30bcf9e0a6 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tz.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_tz.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_yx.0.png index f88dc3cb51..2c8370f0b2 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zx.0.png index 31f4f3b3f4..a0a1707078 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zy.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zy.0.png index d86f6e7d8e..626dbfd23a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zy.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestContourf.test_zy.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_ontop.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_ontop.0.png index 314d524961..80b3823603 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_ontop.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_ontop.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_underneath.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_underneath.0.png index 46fa8f3dea..c20e3afa64 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_underneath.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestFillContinents.test_fillcontinents_underneath.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.0.png index 45652b88e8..0b40452576 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.1.png index 021c20f37a..3b30e94401 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.2.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.2.png index 45652b88e8..0b40452576 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.2.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_bounds.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.0.png index ab59067672..3a210f660a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.1.png index 6669e1c746..cf679d05ba 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_orography.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.0.png index af43ddd459..59043d07cd 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.1.png index 8688d0af4e..bc063bfe6c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.2.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.2.png index 09fff8606a..324dd95778 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.2.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.3.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.3.png index af43ddd459..59043d07cd 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.3.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.4.png b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.4.png index 0d6b02e1ea..d45c21ff7a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.4.png and b/lib/iris/tests/results/visual_tests/test_plot.TestHybridHeight.test_points.4.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.0.png index de0e7d9954..406c95bbe8 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.1.png index 2b1a733915..6a8a0371ae 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_u.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.0.png index 88aa300e27..a78e30f874 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.1.png index f7a6b33586..e068284b5b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_no_v.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.0.png index d1c5d2d8cc..706851aae7 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.1.png index 101dc29df6..63dbec1cff 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestMissingCoord.test_none.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tx.0.png index 7e15fb3d3a..29f6dbaa7e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_ty.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_ty.0.png index 956a017bb8..8622ee4088 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_ty.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_ty.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tz.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tz.0.png index 12b8f97b42..8446f1cc02 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tz.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_tz.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_yx.0.png index f24a6c653b..6455fa6124 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zx.0.png index f125b18a32..bce14142a1 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zy.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zy.0.png index 859be893dc..74ef63c138 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zy.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolor.test_zy.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tx.0.png index 0b54f1d786..12dc6ec423 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_ty.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_ty.0.png index 27ade70012..df72586c71 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_ty.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_ty.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tz.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tz.0.png index 77748085ad..3407df85d4 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tz.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_tz.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_yx.0.png index 7070d9e455..ffeaca6304 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zx.0.png index 2d87c3f432..5bd609b39d 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zy.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zy.0.png index 6df3881c08..7263803ce3 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zy.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPcolormesh.test_zy.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_t_dates.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_t_dates.0.png index 0e092a01ee..26db294ec5 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_t_dates.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_t_dates.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_y.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_y.0.png index 579b167fb2..fb8f51b7d9 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_y.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_y.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_z.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_z.0.png index 66460d2100..ef5a3f5c4e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_z.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlot.test_z.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_non_cube_coordinate.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_non_cube_coordinate.0.png index 96533cf5b3..61783cb58e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_non_cube_coordinate.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_non_cube_coordinate.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.0.png index 548c82498b..f9fa5fec80 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.1.png index 101b7b6057..a96357d5ee 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.2.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.2.png index 8541b04bbc..76e38719be 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.2.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.3.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.3.png index 9ebf590300..1772d70c3a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.3.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_tx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.0.png index d818c23ca6..1b6fcc6e20 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.1.png index a128f78ce0..b0e054f87e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.2.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.2.png index 8278ca87a1..93e6ae9eb8 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.2.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.3.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.3.png index 98c7998f4c..1422bb5525 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.3.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.5.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.5.png index 7177b634de..fddaf94793 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.5.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_yx.5.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.0.png index f19da1dc93..63cd34b2ce 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.1.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.1.png index 2f65179aba..cea71ae802 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.1.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.2.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.2.png index 3a6c60fae8..cc62db2a43 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.2.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.3.png b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.3.png index baeb47adeb..6fb355c1ae 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.3.png and b/lib/iris/tests/results/visual_tests/test_plot.TestPlotCoordinatesGiven.test_zx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_t_dates.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_t_dates.0.png index 9cea0fc2e5..48392d94e2 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_t_dates.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_t_dates.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_y.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_y.0.png index 952c8f3ee1..9e041e5659 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_y.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_y.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_z.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_z.0.png index 422ec85e5d..3698a2c599 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_z.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestQuickplotPlot.test_z.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_bounds.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_bounds.0.png index 7c14e64efa..c4e1e47f8a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_bounds.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_bounds.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_points.0.png b/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_points.0.png index 730a878098..fc3aa9f91b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_points.0.png and b/lib/iris/tests/results/visual_tests/test_plot.TestSimple.test_points.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_alignment.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_alignment.0.png index b2412cbb96..f0fc78832f 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_alignment.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_alignment.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.0.png index f3232798f0..c8b0fcfea8 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.1.png index 121826894d..f6e6d721d3 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contour.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.0.png index 776466b3a0..3463290647 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.1.png index 121826894d..f6e6d721d3 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.2.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.2.png index fef4237bd7..88307bdf1c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.2.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf_nameless.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf_nameless.0.png index 4f604c3e0c..89505af148 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf_nameless.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_contourf_nameless.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.0.png index 8d78055308..ceb40f5a24 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.1.png index dd32d68691..7df34dfcc0 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_map.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolor.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolor.0.png index 261ca98134..ebe135260a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolor.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolor.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolormesh.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolormesh.0.png index c4b430f399..a0e1e0be2c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolormesh.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestLabels.test_pcolormesh.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_non_cube_coordinate.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_non_cube_coordinate.0.png index 7b9a0e40fd..b76ec0785e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_non_cube_coordinate.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_non_cube_coordinate.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.0.png index 8f48a2d0bb..435c39ef5a 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.1.png index 730a878098..fc3aa9f91b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.2.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.2.png index 0ef0f30c97..aae157eb1c 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.2.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.3.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.3.png index 1727768070..17e06c7f39 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.3.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_tx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.0.png index cf7e381e10..601181886f 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.1.png index 638f0232d8..028f308c6b 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.2.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.2.png index fd5321a0e2..ac0013ce32 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.2.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.3.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.3.png index 69773d2eb3..a4f5d2d097 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.3.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.5.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.5.png index 510d85abf0..5d58d56377 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.5.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_yx.5.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.0.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.0.png index 9804fee73c..fafbd4950e 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.0.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.1.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.1.png index f68213d35a..52704882bc 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.1.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.1.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.2.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.2.png index 0218350fcc..6f56ccb935 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.2.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.2.png differ diff --git a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.3.png b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.3.png index 933eda293e..48eb336430 100644 Binary files a/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.3.png and b/lib/iris/tests/results/visual_tests/test_quickplot.TestQuickplotCoordinatesGiven.test_zx.3.png differ diff --git a/lib/iris/tests/results/visual_tests/test_rotated_pole_mapping.TestRotatedPoleMapping.test_rotated_pole_mapping.0.png b/lib/iris/tests/results/visual_tests/test_rotated_pole_mapping.TestRotatedPoleMapping.test_rotated_pole_mapping.0.png index 7c1d510b76..2f6b2a5609 100644 Binary files a/lib/iris/tests/results/visual_tests/test_rotated_pole_mapping.TestRotatedPoleMapping.test_rotated_pole_mapping.0.png and b/lib/iris/tests/results/visual_tests/test_rotated_pole_mapping.TestRotatedPoleMapping.test_rotated_pole_mapping.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png index 3a8c24dfd6..5a6df5efab 100644 Binary files a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png and b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png differ diff --git a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png index 44926e8968..968c4ee5db 100644 Binary files a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png and b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png differ diff --git a/lib/iris/tests/test_mapping.py b/lib/iris/tests/test_mapping.py index d17ce17bc1..926316812c 100644 --- a/lib/iris/tests/test_mapping.py +++ b/lib/iris/tests/test_mapping.py @@ -185,7 +185,7 @@ def test_pcolormesh(self): self.check_graphic() def test_grid(self): - iplt.pcolormesh(self.cube, facecolor='none', edgecolors='#888888') + iplt.outline(self.cube) self.check_graphic() @@ -202,7 +202,9 @@ def test_pcolormesh(self): self.check_graphic() def test_grid(self): - iplt.pcolormesh(self.cube, facecolor='none', edgecolors='#888888') + iplt.pcolormesh(self.cube, facecolors='none', edgecolors='blue') + # the result is a graphic which has coloured edges. This is a mpl bug, see + # https://github.com/matplotlib/matplotlib/issues/1302 self.check_graphic() def test_outline(self):