Commit5cd702d

authored

Merge pull request#21033 from meeseeksmachine/auto-backport-of-pr-21017-on-v3.4.x

Backport PR#21017 on branch v3.4.x (FIX: Don't subslice lines if non-standard transform)

2 parentse48e4ac +083b381 commit5cd702dCopy full SHA for 5cd702d

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,8 @@ def recache(self, always=False):`
`677`	`677`	`self.axes.name=='rectilinear'and`
`678`	`678`	`self.axes.get_xscale()=='linear'and`
`679`	`679`	`self._markeveryisNoneand`
`680`		`-self.get_clip_on()):`
	`680`	`+self.get_clip_on()and`
	`681`	`+self.get_transform()==self.axes.transData):`
`681`	`682`	`self._subslice=True`
`682`	`683`	`nanmask=np.isnan(x)`
`683`	`684`	`ifnanmask.any():`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`frommatplotlib.markersimportMarkerStyle`
`17`	`17`	`frommatplotlib.pathimportPath`
`18`	`18`	`importmatplotlib.pyplotasplt`
	`19`	`+importmatplotlib.transformsasmtransforms`
`19`	`20`	`frommatplotlib.testing.decoratorsimportimage_comparison,check_figures_equal`
`20`	`21`
`21`	`22`
`@@ -131,6 +132,17 @@ def test_drawstyle_variants():`
`131`	`132`	`ax.set(xlim=(0,2),ylim=(0,2))`
`132`	`133`
`133`	`134`
	`135`	`+@check_figures_equal(extensions=('png',))`
	`136`	`+deftest_no_subslice_with_transform(fig_ref,fig_test):`
	`137`	`+ax=fig_ref.add_subplot()`
	`138`	`+x=np.arange(2000)`
	`139`	`+ax.plot(x+2000,x)`
	`140`	`+`
	`141`	`+ax=fig_test.add_subplot()`
	`142`	`+t=mtransforms.Affine2D().translate(2000.0,0.0)`
	`143`	`+ax.plot(x,x,transform=t+ax.transData)`
	`144`	`+`
	`145`	`+`
`134`	`146`	`deftest_valid_drawstyles():`
`135`	`147`	`line=mlines.Line2D([], [])`
`136`	`148`	`withpytest.raises(ValueError):`

Comments

(0)