Commitd29e9dc

committed

Fix TransformedBbox.{,full_}contains.

... by checking whether the inverse-transformed the query point is inthe untransformed bbox.

1 parent10e8bf1 commitd29e9dcCopy full SHA for d29e9dc

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`
`@@ -744,3 +745,14 @@ def test_scale_swapping(fig_test, fig_ref):`
`744`	`745`	`ax.plot(x,np.exp(-(x*2)/2)/np.sqrt(2np.pi))`
`745`	`746`	`fig.canvas.draw()`
`746`	`747`	`ax.set_yscale('linear')`
	`748`	`+`
	`749`	`+`
	`750`	`+deftest_transformedbbox_contains():`
	`751`	`+bb=TransformedBbox(Bbox.unit(),Affine2D().rotate_deg(30))`
	`752`	`+assertbb.contains(.8,.5)`
	`753`	`+assertbb.contains(-.4,.85)`
	`754`	`+assertnotbb.contains(.9,.5)`
	`755`	`+bb=TransformedBbox(Bbox.unit(),Affine2D().translate(.25,.5))`
	`756`	`+assertbb.contains(1.25,1.5)`
	`757`	`+assertnotbb.fully_contains(1.25,1.5)`
	`758`	`+assertnotbb.fully_contains(.1,.1)`

Lines changed: 8 additions & 0 deletions

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

Comments

(0)