NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitc8e7643

committed

indicate_inset transform support

1 parent84464dd commitc8e7643Copy full SHA for c8e7643

File tree

4 files changed

+39

-3

lines changed

lib/matplotlib
- axes
  - _axes.py
- inset.py
- tests
  - baseline_images/test_inset
    - zoom_inset_transform.png
  - test_inset.py

4 files changed

+39

-3

lines changed

`‎lib/matplotlib/axes/_axes.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ def indicate_inset(self, bounds=None, inset_ax=None, *, transform=None,`
`440`	`440`
`441`	`441`	transform : `.Transform`
`442`	`442`	`Transform for the rectangle coordinates. Defaults to`
`443`		- ``ax.transAxes``, i.e. the units of rect are in Axes-relative
	`443`	+ ``ax.transData``, i.e. the units of rect are intheAxes' data
`444`	`444`	`coordinates.`
`445`	`445`
`446`	`446`	facecolor : :mpltype:`color`, default: 'none'

`‎lib/matplotlib/inset.py`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ def __init__(self, bounds=None, inset_ax=None, zorder=None, **kwargs):`
`59`	`59`	`x,y,width,height=bounds`
`60`	`60`
`61`	`61`	`self._rectangle=Rectangle((x,y),width,height,clip_on=False,**kwargs)`
	`62`	`+self._rect_trans=kwargs['transform']`
`62`	`63`
`63`	`64`	`# Connector positions cannot be calculated till the artist has been added`
`64`	`65`	`# to an axes, so just make an empty list for now.`
`@@ -152,6 +153,10 @@ def _update_connectors(self):`
`152`	`153`	`width=self._rectangle.get_width()`
`153`	`154`	`height=self._rectangle.get_height()`
`154`	`155`
	`156`	`+ifhasattr(self._rect_trans,'_as_mpl_transform'):`
	`157`	`+self._rect_trans=self._rect_trans._as_mpl_transform(self.axes)`
	`158`	`+self.rectangle.axes=self.axes`
	`159`	`+`
`155`	`160`	`existing_connectors=self._connectorsor [None]*4`
`156`	`161`
`157`	`162`	`# connect the inset_axes to the rectangle`
`@@ -171,7 +176,7 @@ def _update_connectors(self):`
`171`	`176`	`# parent artist.`
`172`	`177`	`p=ConnectionPatch(`
`173`	`178`	`xyA=xy_inset_ax,coordsA=self._inset_ax.transAxes,`
`174`		`-xyB=xy_data,coordsB=self.axes.transData,`
	`179`	`+xyB=xy_data,coordsB=self._rect_trans,`
`175`	`180`	`arrowstyle="-",`
`176`	`181`	`edgecolor=self._edgecolor,alpha=self.get_alpha(),`
`177`	`182`	`linestyle=self._linestyle,linewidth=self._linewidth)`
`@@ -182,7 +187,7 @@ def _update_connectors(self):`
`182`	`187`	`existing.xy1=xy_inset_ax`
`183`	`188`	`existing.xy2=xy_data`
`184`	`189`	`existing.coords1=self._inset_ax.transAxes`
`185`		`-existing.coords2=self.axes.transData`
	`190`	`+existing.coords2=self._rect_trans`
`186`	`191`
`187`	`192`	`ifexistingisNone:`
`188`	`193`	`# decide which two of the lines to keep visible....`

`‎lib/matplotlib/tests/baseline_images/test_inset/zoom_inset_transform.png`

15.3 KB

`‎lib/matplotlib/tests/test_inset.py`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`importmatplotlib.colorsasmcolors`
`6`	`6`	`importmatplotlib.pyplotasplt`
	`7`	`+importmatplotlib.transformsasmtransforms`
`7`	`8`	`frommatplotlib.testing.decoratorsimportimage_comparison,check_figures_equal`
`8`	`9`
`9`	`10`
`@@ -104,3 +105,33 @@ def test_zoom_inset_connector_styles():`
`104`	`105`	`# Make one visible connector a different style`
`105`	`106`	`indicator.connectors[1].set_linestyle('dashed')`
`106`	`107`	`indicator.connectors[1].set_color('blue')`
	`108`	`+`
	`109`	`+`
	`110`	`+@image_comparison(['zoom_inset_transform.png'],remove_text=True,style='mpl20')`
	`111`	`+deftest_zoom_inset_transform():`
	`112`	`+fig,ax=plt.subplots()`
	`113`	`+`
	`114`	`+ax_ins=ax.inset_axes([0.2,0.2,0.3,0.15])`
	`115`	`+ax_ins.set_ylim([0.3,0.6])`
	`116`	`+ax_ins.set_xlim([0.5,0.9])`
	`117`	`+`
	`118`	`+tr=mtransforms.Affine2D().rotate_deg(30)`
	`119`	`+indicator=ax.indicate_inset_zoom(ax_ins,transform=tr+ax.transData)`
	`120`	`+forconninindicator.connectors:`
	`121`	`+conn.set_visible(True)`
	`122`	`+`
	`123`	`+`
	`124`	`+deftest_zoom_inset_external_transform():`
	`125`	`+# Smoke test that an external transform that requires an axes (i.e.`
	`126`	`+# Cartopy) will work.`
	`127`	`+classFussyDataTr:`
	`128`	`+def_as_mpl_transform(self,axes=None):`
	`129`	`+ifaxesisNone:`
	`130`	`+raiseValueError("I am a fussy transform that requires an axes")`
	`131`	`+returnaxes.transData`
	`132`	`+`
	`133`	`+fig,ax=plt.subplots()`
	`134`	`+ax_ins=ax.inset_axes([0.2,0.2,0.3,0.15])`
	`135`	`+ax.indicate_inset_zoom(ax_ins,transform=FussyDataTr())`
	`136`	`+`
	`137`	`+fig.draw_without_rendering()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc8e7643

File tree

4 files changed

4 files changed

`‎lib/matplotlib/axes/_axes.py`

`‎lib/matplotlib/inset.py`

`‎lib/matplotlib/tests/baseline_images/test_inset/zoom_inset_transform.png`

`‎lib/matplotlib/tests/test_inset.py`

0 commit comments