8000 Merge pull request #14609 from anntzer/xybound · matplotlib/matplotlib@86778dc · GitHub
[go: up one dir, main page]
Skip to content

Commit 86778dc

Browse files
timhoffmtimhoffm
authored
Merge pull request #14609 from anntzer/xybound
Simplify implementation of set_{x,y}bound.
2 parents bb7e441 + a60ac1a commit 86778dc

File tree

2 files changed

+11
-35
lines changed

2 files changed

+11
-35
lines changed

‎lib/matplotlib/axes/_base.py

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,7 +3023,7 @@ def set_xbound(self, lower=None, upper=None):
30233023
Set the lower and upper numerical bounds of the x-axis.
30243024
30253025
This method will honor axes inversion regardless of parameter order.
3026-
It will not change the autoscaling setting (``Axes._autoscaleXon``).
3026+
It will not change the autoscaling setting (`.get_autoscalex_on()`).
30273027
30283028
Parameters
30293029
----------
@@ -3041,22 +3041,13 @@ def set_xbound(self, lower=None, upper=None):
30413041
lower, upper = lower
30423042

30433043
old_lower, old_upper = self.get_xbound()
3044-
30453044
if lower is None:
30463045
lower = old_lower
30473046
if upper is None:
30483047
upper = old_upper
30493048

3050-
if self.xaxis_inverted():
3051-
if lower < upper:
3052-
self.set_xlim(upper, lower, auto=None)
3053-
else:
3054-
self.set_xlim(lower, upper, auto=None)
3055-
else:
3056-
if lower < upper:
3057-
self.set_xlim(lower, upper, auto=None)
3058-
else:
3059-
self.set_xlim(upper, lower, auto=None)
3049+
self.set_xlim(sorted((lower, upper), reverse=self.xaxis_inverted()),
3050+
auto=None)
30603051

30613052
def get_xlim(self):
30623053
"""
@@ -3425,7 +3416,7 @@ def set_ybound(self, lower=None, upper=None):
34253416
Set the lower and upper numerical bounds of the y-axis.
34263417
34273418
This method will honor axes inversion regardless of parameter order.
3428-
It will not change the autoscaling setting (``Axes._autoscaleYon``).
3419+
It will not change the autoscaling setting (`.get_autoscaley_on()`).
34293420
34303421
Parameters
34313422
----------
@@ -3443,22 +3434,13 @@ def set_ybound(self, lower=None, upper=None):
34433434
lower, upper = lower
34443435

34453436
old_lower, old_upper = self.get_ybound()
3446-
34473437
if lower is None:
34483438
lower = old_lower
34493439
if upper is None:
34503440
upper = old_upper
34513441

3452-
if self.yaxis_inverted():
3453-
if lower < upper:
3454-
self.set_ylim(upper, lower, auto=None)
3455-
else:
3456-
self.set_ylim(lower, upper, auto=None)
3457-
else:
3458-
if lower < upper:
3459-
self.set_ylim(lower, upper, auto=None)
3460-
else:
3461-
self.set_ylim(upper, lower, auto=None)
3442+
self.set_ylim(sorted((lower, upper), reverse=self.yaxis_inverted()),
3443+
auto=None)
34623444

34633445
8000 def get_ylim(self):
34643446
"""

‎lib/mpl_toolkits/mplot3d/axes3d.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,29 +1381,23 @@ def get_zbound(self):
13811381
def set_zbound(self, lower=None, upper=None):
13821382
"""
13831383
Set the lower and upper numerical bounds of the z-axis.
1384+
13841385
This method will honor axes inversion regardless of parameter order.
1385-
It will not change the :attr:`_autoscaleZon` attribute.
1386+
It will not change the autoscaling setting (`.get_autoscalez_on()`).
13861387
13871388
.. versionadded :: 1.1.0
13881389
"""
13891390
if upper is None and np.iterable(lower):
13901391
lower, upper = lower
1392+
13911393
old_lower, old_upper = self.get_zbound()
13921394
if lower is None:
13931395
lower = old_lower
13941396
if upper is None:
13951397
upper = old_upper
13961398

1397-
if self.zaxis_inverted():
1398-
if lower < upper:
1399-
self.set_zlim(upper, lower, auto=None)
1400-
else:
1401-
self.set_zlim(lower, upper, auto=None)
1402-
else:
1403-
if lower < upper:
1404-
self.set_zlim(lower, upper, auto=None)
1405-
else:
1406-
self.set_zlim(upper, lower, auto=None)
1399+
self.set_zlim(sorted((lower, upper), reverse=self.zaxis_inverted()),
1400+
auto=None)
14071401

14081402
def text(self, x, y, z, s, zdir=None, **kwargs):
14091403
'''

0 commit comments

Comments
 (0)
0