NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commita622508

committed

Use axes=self as an extra args in parasite_axes

Right now parasite_axes just use self._parent_axes._get_lines as self._get_lines, but it can't update the axes unit when there are twin axes. Therefore, we need to provide axes=self as an extra args to handle this. We also need to change the callees to use axes in kwargs when provided.Add a unit test for missing unit in twin axesThis test creates a plot with twin axes where both axes have units. It then checks whether units are appended correctly on the respective axes. The code base without the modification fails the unit test whereas the modification makes it pass the unit test.t:q`

1 parentc603cc6 commita622508Copy full SHA for a622508

File tree

4 files changed

+51

-7

lines changed

lib
- matplotlib/axes
  - _base.py
- mpl_toolkits
  - axes_grid1
    - parasite_axes.py
  - tests
    - baseline_images/test_axes_grid1
      - twin_axes_both_with_units.png
    - test_axes_grid1.py

4 files changed

+51

-7

lines changed

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

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,9 @@ def set_prop_cycle(self, cycler):`
`239`	`239`	`self._prop_keys=cycler.keys# This should make a copy`
`240`	`240`
`241`	`241`	`def__call__(self,args,data=None,*kwargs):`
`242`		`-self.axes._process_unit_info(kwargs=kwargs)`
	`242`	`+# use the axes from kwargs if provided`
	`243`	`+axes=kwargs.get("axes",self.axes)`
	`244`	`+axes._process_unit_info(kwargs=kwargs)`
`243`	`245`
`244`	`246`	`forpos_onlyin"xy":`
`245`	`247`	`ifpos_onlyinkwargs:`
`@@ -488,10 +490,12 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):`
`488`	`490`	`else:`
`489`	`491`	`x,y=index_of(xy[-1])`
`490`	`492`
`491`		`-ifself.axes.xaxisisnotNone:`
`492`		`-self.axes.xaxis.update_units(x)`
`493`		`-ifself.axes.yaxisisnotNone:`
`494`		`-self.axes.yaxis.update_units(y)`
	`493`	`+# use the axes from kwargs if provided when updating units`
	`494`	`+axes=kwargs.get("axes",self.axes)`
	`495`	`+ifaxes.xaxisisnotNone:`
	`496`	`+axes.xaxis.update_units(x)`
	`497`	`+ifaxes.yaxisisnotNone:`
	`498`	`+axes.yaxis.update_units(y)`
`495`	`499`
`496`	`500`	`ifx.shape[0]!=y.shape[0]:`
`497`	`501`	`raiseValueError(f"x and y must have same first dimension, but "`

`‎lib/mpl_toolkits/axes_grid1/parasite_axes.py`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`frommatplotlib.axesimportsubplot_class_factory`
`6`	`6`	`frommatplotlib.transformsimportBbox`
`7`	`7`	`from .mpl_axesimportAxes`
	`8`	`+importfunctools`
`8`	`9`
`9`	`10`
`10`	`11`	`classParasiteAxesBase:`
`@@ -20,7 +21,8 @@ def __init__(self, parent_axes, aux_transform=None,`
`20`	`21`	`defcla(self):`
`21`	`22`	`super().cla()`
`22`	`23`	`martist.setp(self.get_children(),visible=False)`
`23`		`-self._get_lines=self._parent_axes._get_lines`
	`24`	`+self._get_lines=functools.partial(`
	`25`	`+self._parent_axes._get_lines,axes=self)`
`24`	`26`
`25`	`27`	`@_api.deprecated("3.5")`
`26`	`28`	`defget_images_artists(self):`

`‎lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/twin_axes_both_with_units.png`

27.4 KB

`‎lib/mpl_toolkits/tests/test_axes_grid1.py`

Lines changed: 39 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`frommpl_toolkits.axes_grid1.inset_locatorimport (`
`22`	`22`	`zoomed_inset_axes,mark_inset,inset_axes,BboxConnectorPatch)`
`23`	`23`	`importmpl_toolkits.axes_grid1.mpl_axes`
`24`		`-`
	`24`	`+importmatplotlib.unitsasunits`
	`25`	`+importmatplotlib.tickerasticker`
`25`	`26`	`importpytest`
`26`	`27`
`27`	`28`	`importnumpyasnp`
`@@ -84,6 +85,43 @@ def test_twin_axes_empty_and_removed():`
`84`	`85`	`plt.subplots_adjust(wspace=0.5,hspace=1)`
`85`	`86`
`86`	`87`
	`88`	`+@image_comparison(['twin_axes_both_with_units.png'])`
	`89`	`+deftest_twin_axes_both_with_units():`
	`90`	`+mpl.rcParams.update(`
	`91`	`+ {"font.size":8,"xtick.labelsize":8,"ytick.labelsize":8})`
	`92`	`+classTestUnit:`
	`93`	`+def__init__(self,val):`
	`94`	`+self._val=val`
	`95`	`+`
	`96`	`+classUnitA(TestUnit):`
	`97`	`+fmt="%0.1f Unit A"`
	`98`	`+classUnitB(TestUnit):`
	`99`	`+fmt="%0.1f Unit B"`
	`100`	`+`
	`101`	`+classUnitConverter(units.ConversionInterface):`
	`102`	`+@staticmethod`
	`103`	`+defconvert(value,unit,axis):`
	`104`	`+return [x._valforxinvalue]`
	`105`	`+`
	`106`	`+@staticmethod`
	`107`	`+defaxisinfo(unit,axis):`
	`108`	`+returnunits.AxisInfo(majfmt=ticker.FormatStrFormatter(unit.fmt))`
	`109`	`+`
	`110`	`+@staticmethod`
	`111`	`+defdefault_units(x,axis):`
	`112`	`+returnx[0].__class__`
	`113`	`+`
	`114`	`+units.registry[UnitA]=UnitConverter()`
	`115`	`+units.registry[UnitB]=UnitConverter()`
	`116`	`+`
	`117`	`+host=host_subplot(111)`
	`118`	`+`
	`119`	`+p1,=host.plot([0,1,2], [UnitA(x)forxin (0,1,2)])`
	`120`	`+par1=host.twinx()`
	`121`	`+par1.axis["right"].major_ticklabels.set_visible(True)`
	`122`	`+p2,=par1.plot([0,1,2], [UnitB(x)forxin (0,2,2)])`
	`123`	`+`
	`124`	`+`
`87`	`125`	`deftest_axesgrid_colorbar_log_smoketest():`
`88`	`126`	`fig=plt.figure()`
`89`	`127`	`grid=AxesGrid(fig,111,# modified to be only subplot`

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!

Commita622508

File tree

4 files changed

4 files changed

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

`‎lib/mpl_toolkits/axes_grid1/parasite_axes.py`

`‎lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/twin_axes_both_with_units.png`

`‎lib/mpl_toolkits/tests/test_axes_grid1.py`

0 commit comments