From c6d184cd00752294fad49ced380ad9393778ea97 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 14 Feb 2017 22:25:03 +0000 Subject: [PATCH 1/5] Set fill to True if a facecolor is passed --- lib/mpl_toolkits/axes_grid1/inset_locator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py index eecee9d7fab2..2a0021ed8eef 100644 --- a/lib/mpl_toolkits/axes_grid1/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py @@ -312,7 +312,8 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs): raise ValueError("transform should not be set") kwargs["transform"] = IdentityTransform() - Patch.__init__(self, fill=False, **kwargs) + fill = 'fc' in kwargs + Patch.__init__(self, fill=fill, **kwargs) self.bbox1 = bbox1 self.bbox2 = bbox2 self.loc1 = loc1 From 471597b16f4065e6a4e2e2d694f0894f60480d08 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 14 Feb 2017 22:27:49 +0000 Subject: [PATCH 2/5] PEP8 inset_locator.py --- lib/mpl_toolkits/axes_grid1/inset_locator.py | 8 ++++---- pytest.ini | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py index 2a0021ed8eef..e16043f80e8e 100644 --- a/lib/mpl_toolkits/axes_grid1/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py @@ -331,10 +331,10 @@ def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs): """ Connect two bboxes with a quadrilateral. - The quadrilateral is specified by two lines that start and end at corners - of the bboxes. The four sides of the quadrilateral are defined by the two - lines given, the line between the two corners specified in *bbox1* and the - line between the two corners specified in *bbox2*. + The quadrilateral is specified by two lines that start and end at + corners of the bboxes. The four sides of the quadrilateral are defined + by the two lines given, the line between the two corners specified in + *bbox1* and the line between the two corners specified in *bbox2*. Parameters ---------- diff --git a/pytest.ini b/pytest.ini index d9132bfa6002..6397a869259e 100644 --- a/pytest.ini +++ b/pytest.ini @@ -77,7 +77,6 @@ pep8ignore = mpl_toolkits/axes_grid1/axes_rgb.py E231 E501 mpl_toolkits/axes_grid1/axes_size.py E225 E261 E302 E303 E501 mpl_toolkits/axes_grid1/colorbar.py E225 E231 E261 E262 E302 E303 E501 E701 - mpl_toolkits/axes_grid1/inset_locator.py E501 mpl_toolkits/axes_grid1/mpl_axes.py E302 E303 E501 E502 mpl_toolkits/axes_grid1/parasite_axes.py E225 E231 E302 E303 E402 E501 E502 mpl_toolkits/axisartist/__init__.py E501 From 7c1ad7552f737d326a3fec402fe579377fe30aa1 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 14 Feb 2017 22:50:28 +0000 Subject: [PATCH 3/5] Add BboxConnectorPatch test@ --- .../test_axes_grid1/BboxConnectorPatch.pdf | Bin 0 -> 1435 bytes .../test_axes_grid1/BboxConnectorPatch.png | Bin 0 -> 10077 bytes .../test_axes_grid1/BboxConnectorPatch.svg | 162 ++++++++++++++++++ lib/mpl_toolkits/tests/test_axes_grid1.py | 20 ++- 4 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.pdf create mode 100644 lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.png create mode 100644 lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.svg diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.pdf b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.pdf new file mode 100644 index 0000000000000000000000000000000000000000..42dcb00dc3125816104dd54fe5ae0c368b9e6445 GIT binary patch literal 1435 zcmY!laB$t4Qr zV8ap4F*E=Qz&zlXmzQ5s4738M-x=tX)I1>15@LXRQGRKG0?3=r!3z2=sb!hTsX^{Q ztAV_bqQt!7g2bZKyyQxl&mro87U}z@rer2MAdST(MX8CoTorR_Cm+l^WWdw*zK+Yjv2(78Z~p?%sb$TwWi!f>dU&ULHkicK z>zVkq-QdgoWF4P#+)uLnzz)}TYuWUggW+@UPuO^UBkS@kenl&0rRbDrF zJYG@U`!sQvS4mZZWpH&qmyfSV&7MEpJ8L($pZ)&4YV#}c9d>tflL|k5Nk5wP?7#hC z2Jf%)`c?lhG&b+70i|zfC__^^IP^i$WNcy%OZ}j<4UIWO8U!VNSadoXLeiKcPz;)f z5V=G@IZ?q76rK8xMlfZDxRoKL7*Hm{uosjyFa$vv1Va#%r(rI1&MyU~SD>}tnJJ*W z0?t7}prj1R@{m#h;X6Yl%?QzoqSQ1l0|i54E(17FFf%nZHdRPdfQuOdod^O7c`z|U z14CeNp^6z;7y}bJx|k`@UNkXFQ%rT1=2+BO0^&CRm{-99LXOgMTwa?sYT#Y)H5$FUjZCw!0aECpAQOaa8VGPS(OS5Fi3VzEGhv9 Qp`n4L8JDW6tG^o;02zC@V*mgE literal 0 HcmV?d00001 diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/BboxConnectorPatch.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b3949271eca6cdd3b13916b162c43d4364f09a GIT binary patch literal 10077 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 H + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py index 9ae16faf270f..1def697ab40f 100644 --- a/lib/mpl_toolkits/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/tests/test_axes_grid1.py @@ -7,10 +7,13 @@ import matplotlib.pyplot as plt from matplotlib.testing.decorators import image_comparison +from matplotlib.transforms import Bbox, TransformedBbox,\ + blended_transform_factory from mpl_toolkits.axes_grid1 import host_subplot from mpl_toolkits.axes_grid1 import make_axes_locatable from mpl_toolkits.axes_grid1 import AxesGrid -from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes, mark_inset +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes,\ + mark_inset, BboxConnectorPatch from mpl_toolkits.axes_grid1.anchored_artists import AnchoredSizeBar from matplotlib.colors import LogNorm @@ -19,6 +22,21 @@ import numpy as np +@image_comparison(baseline_images=['BboxConnectorPatch'], style='default', + remove_text=True) +def test_BboxConnectorPatch(): + # Simple image test for a BboxConnectorPatch + fig, ax = plt.subplots() + trans1 = blended_transform_factory(ax.transData, ax.transData) + bbox1 = Bbox([[0.1, 0.1], [0.4, 0.4]]) + bbox1 = TransformedBbox(bbox1, trans1) + bbox2 = Bbox([[0.5, 0.5], [0.9, 0.9]]) + bbox2 = TransformedBbox(bbox2, trans1) + p = BboxConnectorPatch(bbox1, bbox2, + loc1a=3, loc2a=2, loc1b=4, loc2b=3, ec="r", fc="b") + ax.add_patch(p) + + @image_comparison(baseline_images=['divider_append_axes']) def test_divider_append_axes(): From 4b7a02d0c383f44fcace1077524d4c0672cedb94 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 15 Feb 2017 09:26:15 +0000 Subject: [PATCH 4/5] PEP8 text_axes_grid1.py --- lib/mpl_toolkits/tests/test_axes_grid1.py | 12 ++++++------ pytest.ini | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py index 1def697ab40f..43044eb772b4 100644 --- a/lib/mpl_toolkits/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/tests/test_axes_grid1.py @@ -86,16 +86,16 @@ def test_twin_axes_empty_and_removed(): matplotlib.rcParams.update({"font.size": 8}) matplotlib.rcParams.update({"xtick.labelsize": 8}) matplotlib.rcParams.update({"ytick.labelsize": 8}) - generators = [ "twinx", "twiny", "twin" ] - modifiers = [ "", "host invisible", "twin removed", "twin invisible", - "twin removed\nhost invisible" ] + generators = ["twinx", "twiny", "twin"] + modifiers = ["", "host invisible", "twin removed", "twin invisible", + "twin removed\nhost invisible"] # Unmodified host subplot at the beginning for reference h = host_subplot(len(modifiers)+1, len(generators), 2) h.text(0.5, 0.5, "host_subplot", horizontalalignment="center", - verticalalignment="center") + verticalalignment="center") # Host subplots with various modifications (twin*, visibility) applied for i, (mod, gen) in enumerate(product(modifiers, generators), - len(generators)+1): + len(generators)+1): h = host_subplot(len(modifiers)+1, len(generators), i) t = getattr(h, gen)() if "twin invisible" in mod: @@ -105,7 +105,7 @@ def test_twin_axes_empty_and_removed(): if "host invisible" in mod: h.axis[:].set_visible(False) h.text(0.5, 0.5, gen + ("\n" + mod if mod else ""), - horizontalalignment="center", verticalalignment="center") + horizontalalignment="center", verticalalignment="center") plt.subplots_adjust(wspace=0.5, hspace=1) diff --git a/pytest.ini b/pytest.ini index 6397a869259e..ac3fc00b67bc 100644 --- a/pytest.ini +++ b/pytest.ini @@ -96,7 +96,6 @@ pep8ignore = mpl_toolkits/mplot3d/axes3d.py E203 E225 E231 E271 E303 E402 E501 E502 E701 mpl_toolkits/mplot3d/axis3d.py E201 E202 E203 E222 E231 E302 E303 E501 E502 mpl_toolkits/mplot3d/proj3d.py E231 E302 E303 - mpl_toolkits/tests/test_axes_grid1.py E201 E202 mpl_toolkits/tests/test_mplot3d.py E231 E302 mpl_toolkits/__init__.py E261 mpl_toolkits/exceltools.py E201 E202 E225 E228 E302 E303 E501 E701 From b843f9c3ca728bc4f3e07b72111d0aefd132e2e7 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 21 Feb 2017 18:54:50 +0000 Subject: [PATCH 5/5] Check for facecolor and color --- lib/mpl_toolkits/axes_grid1/inset_locator.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py index e16043f80e8e..4d8d56057586 100644 --- a/lib/mpl_toolkits/axes_grid1/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py @@ -11,6 +11,7 @@ from matplotlib.path import Path from matplotlib.transforms import Bbox, BboxTransformTo from matplotlib.transforms import IdentityTransform, TransformedBbox +import matplotlib.cbook as cbook from . import axes_size as Size from .parasite_axes import HostAxes @@ -312,7 +313,9 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs): raise ValueError("transform should not be set") kwargs["transform"] = IdentityTransform() - fill = 'fc' in kwargs + _alias_map = {'color': ['c'], 'facecolor': ['fc']} + kwargs = cbook.normalize_kwargs(kwargs, _alias_map) + fill = ('color' in kwargs) or ('facecolor' in kwargs) Patch.__init__(self, fill=fill, **kwargs) self.bbox1 = bbox1 self.bbox2 = bbox2