Skip to content

Commit 382bbdf

Browse files
committed
Merge remote-tracking branch 'upstream/v1.2.x'
Conflicts: lib/matplotlib/tests/baseline_images/test_axes/polar_axes.pdf lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png lib/matplotlib/tests/baseline_images/test_axes/polar_axes.svg lib/matplotlib/tests/baseline_images/test_axes/single_point.pdf lib/matplotlib/tests/baseline_images/test_axes/single_point.png lib/matplotlib/tests/baseline_images/test_axes/single_point.svg lib/matplotlib/tests/test_axes.py src/_backend_agg.cpp
2 parents 8ab4af4 + d904908 commit 382bbdf

File tree

15 files changed

+415
-102
lines changed

15 files changed

+415
-102
lines changed

examples/api/custom_scale_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def __init__(self, thresh):
110110
mtransforms.Transform.__init__(self)
111111
self.thresh = thresh
112112

113-
def transform(self, a):
113+
def transform_non_affine(self, a):
114114
"""
115115
This transform takes an Nx1 ``numpy`` array and returns a
116116
transformed copy. Since the range of the Mercator scale
@@ -144,7 +144,7 @@ def __init__(self, thresh):
144144
mtransforms.Transform.__init__(self)
145145
self.thresh = thresh
146146

147-
def transform(self, a):
147+
def transform_non_affine(self, a):
148148
return np.arctan(np.sinh(a))
149149

150150
def inverted(self):

lib/matplotlib/axis.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ def _get_gridline(self):
413413
linestyle=rcParams['grid.linestyle'],
414414
linewidth=rcParams['grid.linewidth'],
415415
alpha=rcParams['grid.alpha'],
416+
markersize=0
416417
)
417418
l.set_transform(self.axes.get_xaxis_transform(which='grid'))
418419
l.get_path()._interpolation_steps = GRIDLINE_INTERPOLATION_STEPS
@@ -551,6 +552,7 @@ def _get_gridline(self):
551552
linestyle=rcParams['grid.linestyle'],
552553
linewidth=rcParams['grid.linewidth'],
553554
alpha=rcParams['grid.alpha'],
555+
markersize=0
554556
)
555557

556558
l.set_transform(self.axes.get_yaxis_transform(which='grid'))

lib/matplotlib/backend_bases.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ def _iter_collection(self, gc, master_transform, all_transforms,
383383
xp, yp = transform.transform_point((0, 0))
384384
xo = -(xp - xo)
385385
yo = -(yp - yo)
386+
if not (np.isfinite(xo) and np.isfinite(yo)):
387+
continue
386388
if Nfacecolors:
387389
rgbFace = facecolors[i % Nfacecolors]
388390
if Nedgecolors:

lib/matplotlib/markers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def set_marker(self, marker):
221221
self._marker_function = self._set_tuple_marker
222222
elif isinstance(marker, np.ndarray):
223223
self._marker_function = self._set_vertices
224-
elif marker in self.markers:
224+
elif not isinstance(marker, list) and marker in self.markers:
225225
self._marker_function = getattr(
226226
self, '_set_' + self.markers[marker])
227227
elif is_string_like(marker) and is_math_text(marker):
Binary file not shown.

lib/matplotlib/tests/baseline_images/test_axes/polar_axes.svg

Lines changed: 34 additions & 29 deletions
Loading
Binary file not shown.

0 commit comments

Comments
 (0)