Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f39813c

Browse filesBrowse files
authored
Merge pull request #9539 from matplotlib/auto-backport-of-pr-9363
Backport PR #9363 on branch v2.1.x
2 parents 75707d6 + 4b872b1 commit f39813c
Copy full SHA for f39813c

File tree

Expand file treeCollapse file tree

1 file changed

+13
-12
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+13
-12
lines changed

‎lib/matplotlib/axes/_base.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+13-12Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3803,7 +3803,7 @@ def format_deltas(key, dx, dy):
38033803
dy = dy / abs(dy) * abs(dx)
38043804
else:
38053805
dx = dx / abs(dx) * abs(dy)
3806-
return (dx, dy)
3806+
return dx, dy
38073807

38083808
p = self._pan_start
38093809
dx = x - p.x
@@ -3812,29 +3812,30 @@ def format_deltas(key, dx, dy):
38123812
return
38133813
if button == 1:
38143814
dx, dy = format_deltas(key, dx, dy)
3815-
result = p.bbox.translated(-dx, -dy) \
3816-
.transformed(p.trans_inverse)
3815+
result = p.bbox.translated(-dx, -dy).transformed(p.trans_inverse)
38173816
elif button == 3:
38183817
try:
3819-
dx = -dx / float(self.bbox.width)
3820-
dy = -dy / float(self.bbox.height)
3818+
dx = -dx / self.bbox.width
3819+
dy = -dy / self.bbox.height
38213820
dx, dy = format_deltas(key, dx, dy)
38223821
if self.get_aspect() != 'auto':
3823-
dx = 0.5 * (dx + dy)
3824-
dy = dx
3825-
3822+
dx = dy = 0.5 * (dx + dy)
38263823
alpha = np.power(10.0, (dx, dy))
38273824
start = np.array([p.x, p.y])
38283825
oldpoints = p.lim.transformed(p.trans)
38293826
newpoints = start + alpha * (oldpoints - start)
3830-
result = mtransforms.Bbox(newpoints) \
3831-
.transformed(p.trans_inverse)
3827+
result = (mtransforms.Bbox(newpoints)
3828+
.transformed(p.trans_inverse))
38323829
except OverflowError:
38333830
warnings.warn('Overflow while panning')
38343831
return
38353832

3836-
self.set_xlim(*result.intervalx)
3837-
self.set_ylim(*result.intervaly)
3833+
valid = np.isfinite(result.transformed(p.trans))
3834+
points = result.get_points().astype(object)
3835+
# Just ignore invalid limits (typically, underflow in log-scale).
3836+
points[~valid] = None
3837+
self.set_xlim(points[:, 0])
3838+
self.set_ylim(points[:, 1])
38383839

38393840
@cbook.deprecated("2.1")
38403841
def get_cursor_props(self):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.