Commitc20e16e

authored

Merge pull request#25943 from meeseeksmachine/auto-backport-of-pr-25902-on-v3.7.x

Backport PR#25902 on branch v3.7.x (Fix TransformedBbox.{,full_}contains.)

2 parents6686227 +a9b4f01 commitc20e16eCopy full SHA for c20e16e

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`importmatplotlib.pyplotasplt`
`10`	`10`	`importmatplotlib.patchesasmpatches`
`11`	`11`	`importmatplotlib.transformsasmtransforms`
	`12`	`+frommatplotlib.transformsimportAffine2D,Bbox,TransformedBbox`
`12`	`13`	`frommatplotlib.pathimportPath`
`13`	`14`	`frommatplotlib.testing.decoratorsimportimage_comparison,check_figures_equal`
`14`	`15`
`@@ -755,3 +756,14 @@ def test_offset_copy_errors():`
`755`	`756`	`withpytest.raises(ValueError,`
`756`	`757`	`match='For units of inches or points a fig kwarg is needed'):`
`757`	`758`	`mtransforms.offset_copy(None,units='inches')`
	`759`	`+`
	`760`	`+`
	`761`	`+deftest_transformedbbox_contains():`
	`762`	`+bb=TransformedBbox(Bbox.unit(),Affine2D().rotate_deg(30))`
	`763`	`+assertbb.contains(.8,.5)`
	`764`	`+assertbb.contains(-.4,.85)`
	`765`	`+assertnotbb.contains(.9,.5)`
	`766`	`+bb=TransformedBbox(Bbox.unit(),Affine2D().translate(.25,.5))`
	`767`	`+assertbb.contains(1.25,1.5)`
	`768`	`+assertnotbb.fully_contains(1.25,1.5)`
	`769`	`+assertnotbb.fully_contains(.1,.1)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1144,6 +1144,14 @@ def get_points(self):`
`1144`	`1144`	`self._check(points)`
`1145`	`1145`	`returnpoints`
`1146`	`1146`
	`1147`	`+defcontains(self,x,y):`
	`1148`	`+# Docstring inherited.`
	`1149`	`+returnself._bbox.contains(*self._transform.inverted().transform((x,y)))`
	`1150`	`+`
	`1151`	`+deffully_contains(self,x,y):`
	`1152`	`+# Docstring inherited.`
	`1153`	`+returnself._bbox.fully_contains(*self._transform.inverted().transform((x,y)))`
	`1154`	`+`
`1147`	`1155`
`1148`	`1156`	`classLockableBbox(BboxBase):`
`1149`	`1157`	`"""`

Comments

(0)