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

Commitfafc53c

authored

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

Backport PR#20662 on branch v3.4.x (Don't forget to disable autoscaling after interactive zoom.)

2 parentsd5de944 +10a2a40 commitfafc53cCopy full SHA for fafc53c

File tree

2 files changed

-11

lines changed

lib/matplotlib
- axes
  - _base.py
- tests
  - test_backend_bases.py

2 files changed

-11

lines changed

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

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -4130,33 +4130,24 @@ def _set_view_from_bbox(self, bbox, direction='in',`
`4130`	`4130`	`Whether this axis is twinned in the y-direction.`
`4131`	`4131`	`"""`
`4132`	`4132`	`iflen(bbox)==3:`
`4133`		`-Xmin,Xmax=self.get_xlim()`
`4134`		`-Ymin,Ymax=self.get_ylim()`
`4135`		`-`
`4136`	`4133`	`xp,yp,scl=bbox# Zooming code`
`4137`		`-`
`4138`	`4134`	`ifscl==0:# Should not happen`
`4139`	`4135`	`scl=1.`
`4140`		`-`
`4141`	`4136`	`ifscl>1:`
`4142`	`4137`	`direction='in'`
`4143`	`4138`	`else:`
`4144`	`4139`	`direction='out'`
`4145`	`4140`	`scl=1/scl`
`4146`		`-`
`4147`	`4141`	`# get the limits of the axes`
`4148`		`-tranD2C=self.transData.transform`
`4149`		`-xmin,ymin=tranD2C((Xmin,Ymin))`
`4150`		`-xmax,ymax=tranD2C((Xmax,Ymax))`
`4151`		`-`
	`4142`	`+ (xmin,ymin), (xmax,ymax)=self.transData.transform(`
	`4143`	`+np.transpose([self.get_xlim(),self.get_ylim()]))`
`4152`	`4144`	`# set the range`
`4153`	`4145`	`xwidth=xmax-xmin`
`4154`	`4146`	`ywidth=ymax-ymin`
`4155`	`4147`	`xcen= (xmax+xmin)*.5`
`4156`	`4148`	`ycen= (ymax+ymin)*.5`
`4157`	`4149`	`xzc= (xp*(scl-1)+xcen)/scl`
`4158`	`4150`	`yzc= (yp*(scl-1)+ycen)/scl`
`4159`		`-`
`4160`	`4151`	`bbox= [xzc-xwidth/2./scl,yzc-ywidth/2./scl,`
`4161`	`4152`	`xzc+xwidth/2./scl,yzc+ywidth/2./scl]`
`4162`	`4153`	`eliflen(bbox)!=4:`
`@@ -4209,8 +4200,10 @@ def _set_view_from_bbox(self, bbox, direction='in',`
`4209`	`4200`
`4210`	`4201`	`ifnottwinxandmode!="y":`
`4211`	`4202`	`self.set_xbound(new_xbound)`
	`4203`	`+self.set_autoscalex_on(False)`
`4212`	`4204`	`ifnottwinyandmode!="x":`
`4213`	`4205`	`self.set_ybound(new_ybound)`
	`4206`	`+self.set_autoscaley_on(False)`
`4214`	`4207`
`4215`	`4208`	`defstart_pan(self,x,y,button):`
`4216`	`4209`	`"""`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,8 @@ def test_interactive_zoom():`
`178`	`178`	`tb.zoom()`
`179`	`179`	`assertax.get_navigate_mode()isNone`
`180`	`180`
	`181`	`+assertnotax.get_autoscalex_on()andnotax.get_autoscaley_on()`
	`182`	`+`
`181`	`183`
`182`	`184`	`deftest_toolbar_zoompan():`
`183`	`185`	`expected_warning_regex= (`

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!

Commitfafc53c

File tree

2 files changed

2 files changed

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

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

0 commit comments