Skip to content

Backport PR #12268 on branch v3.0.x (FIX: remove unnecessary self in super_-calls, fixes #12265) #12338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2018
Merged

Backport PR #12268 on branch v3.0.x (FIX: remove unnecessary self in super_-calls, fixes #12265) #12338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/mpl_toolkits/axes_grid1/parasite_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ def _pcolor(self, super_pcolor, *XYC, **kwargs):
X, Y, C = XYC

if "transform" in kwargs:
mesh = super_pcolor(self, X, Y, C, **kwargs)
mesh = super_pcolor(X, Y, C, **kwargs)
else:
orig_shape = X.shape
xyt = np.column_stack([X.flat, Y.flat])
wxy = self.transAux.transform(xyt)
gx = wxy[:, 0].reshape(orig_shape)
gy = wxy[:, 1].reshape(orig_shape)
mesh = super_pcolor(self, gx, gy, C, **kwargs)
mesh = super_pcolor(gx, gy, C, **kwargs)
mesh.set_transform(self._parent_axes.transData)

return mesh
Expand All @@ -140,14 +140,14 @@ def _contour(self, super_contour, *XYCL, **kwargs):
CL = XYCL[2:]

if "transform" in kwargs:
cont = super_contour(self, X, Y, *CL, **kwargs)
cont = super_contour(X, Y, *CL, **kwargs)
else:
orig_shape = X.shape
xyt = np.column_stack([X.flat, Y.flat])
wxy = self.transAux.transform(xyt)
gx = wxy[:, 0].reshape(orig_shape)
gy = wxy[:, 1].reshape(orig_shape)
cont = super_contour(self, gx, gy, *CL, **kwargs)
cont = super_contour(gx, gy, *CL, **kwargs)
for c in cont.collections:
c.set_transform(self._parent_axes.transData)

Expand Down
Binary file added ...sts/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions lib/mpl_toolkits/tests/test_axisartist_axislines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import numpy as np
import matplotlib.pyplot as plt
from matplotlib.testing.decorators import image_comparison
from matplotlib.transforms import IdentityTransform

from mpl_toolkits.axisartist.axislines import SubplotZero, Subplot
from mpl_toolkits.axisartist import SubplotHost, ParasiteAxesAuxTrans

from mpl_toolkits.axisartist import Axes

Expand Down Expand Up @@ -53,3 +55,35 @@ def test_Axes():
ax.set_xscale('log')

plt.show()


@image_comparison(baseline_images=['ParasiteAxesAuxTrans_meshplot'],
extensions=['png'], remove_text=True, style='default',
tol=0.075)
def test_ParasiteAxesAuxTrans():

data = np.ones((6, 6))
data[2, 2] = 2
data[0, :] = 0
data[-2, :] = 0
data[:, 0] = 0
data[:, -2] = 0
x = np.arange(6)
y = np.arange(6)
xx, yy = np.meshgrid(x, y)

funcnames = ['pcolor', 'pcolormesh', 'contourf']

fig = plt.figure()
for i, name in enumerate(funcnames):

ax1 = SubplotHost(fig, 1, 3, i+1)
fig.add_subplot(ax1)

ax2 = ParasiteAxesAuxTrans(ax1, IdentityTransform())
ax1.parasites.append(ax2)
getattr(ax2, name)(xx, yy, data)
ax1.set_xlim((0, 5))
ax1.set_ylim((0, 5))

ax2.contour(xx, yy, data, colors='k')