8000 Fix inversion of 3d axis. · matplotlib/matplotlib@a7abfbb · GitHub
[go: up one dir, main page]
Skip to content

Commit a7abfbb

Browse files
anntzeranntzer
committed
Fix inversion of 3d axis.
... which was broken because 3d axises stored and accessed their viewlim info sometimes in xy_viewLim/zz_viewLim and sometimes in v_interval (and likewise for datalim), leading to out-of-sync info... Not deprecating d_interval/v_interval for now both because this needs to go to 3.1.1 to fix the breakage and because I think storing the info in axis attributes actually makes *more* sense than in viewLim/dataLim -- but fully switching to d_interval/v_interval needs bigger surgery.
1 parent 63d96d2 commit a7abfbb

File tree

2 files changed

+68
-83
lines changed

2 files changed
+68
-83
lines changed

‎lib/matplotlib/axis.py

Lines changed: 36 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,34 @@ def get_minpos(self):
18901890
raise NotImplementedError()
18911891

18921892

1893+
def _make_getset_interval(method_name, lim_name, attr_name):
1894+
"""
1895+
Helper to generate ``get_{data,view}_interval`` and
1896+
``set_{data,view}_interval`` implementations.
1897+
"""
1898+
1899+
def getter(self):
1900+
# docstring inherited.
1901+
return getattr(getattr(self.axes, lim_name), attr_name)
1902+
1903+
def setter(self, vmin, vmax, ignore=False):
1904+
# docstring inherited.
1905+
if ignore:
1906+
setattr(getattr(self.axes, lim_name), attr_name, (vmin, vmax))
1907+
else:
1908+
oldmin, oldmax = getter(self)
1909+
if oldmin < oldmax:
1910+
setter(self, min(vmin, oldmin), max(vmax, oldmax), ignore=True)
1911+
else:
1912+
setter(self, max(vmax, oldmax), min(vmin, oldmin), ignore=True)
1913+
self.stale = True
1914+
1915+
getter.__name__ = f"get_{method_name}_interval"
1916+
setter.__name__ = f"set_{method_name}_interval"
1917+
1918+
return getter, setter
1919+
1920+
18931921
class XAxis(Axis):
18941922
__name__ = 'xaxis'
18951923
axis_name = 'x'
@@ -2133,39 +2161,14 @@ def get_ticks_position(self):
21332161
"default": "default", "unknown": "unknown"}[
21342162
self._get_ticks_position()]
21352163

2136-
def get_view_interval(self):
2137-
# docstring inherited
2138-
return self.axes.viewLim.intervalx
2139-
2140-
def set_view_interval(self, vmin, vmax, ignore=False):
2141-
# docstring inherited
2142-
if ignore:
2143-
self.axes.viewLim.intervalx = vmin, vmax
2144-
else:
2145-
Vmin, Vmax = self.get_view_interval()
2146-
if Vmin < Vmax:
2147-
self.axes.viewLim.intervalx = (min(vmin, vmax, Vmin),
2148-
max(vmin, vmax, Vmax))
2149-
else:
2150-
self.axes.viewLim.intervalx = (max(vmin, vmax, Vmin),
2151-
min(vmin, vmax, Vmax))
2164+
get_view_interval, set_view_interval = _make_getset_interval(
2165+
"view", "viewLim", "intervalx")
2166+
get_data_interval, set_data_interval = _make_getset_interval(
2167+
"data", "dataLim&qu 8000 ot;, "intervalx")
21522168

21532169
def get_minpos(self):
21542170
return self.axes.dataLim.minposx
21552171

2156-
def get_data_interval(self):
2157-
# docstring inherited
2158-
return self.axes.dataLim.intervalx
2159-
2160-
def set_data_interval(self, vmin, vmax, ignore=False):
2161-
# docstring inherited
2162-
if ignore:
2163-
self.axes.dataLim.intervalx = vmin, vmax
2164-
else:
2165-
Vmin, Vmax = self.get_data_interval()
2166-
self.axes.dataLim.intervalx = min(vmin, Vmin), max(vmax, Vmax)
2167-
self.stale = True
2168-
21692172
def set_default_intervals(self):
21702173
# docstring inherited
21712174
xmin, xmax = 0., 1.
@@ -2460,40 +2463,14 @@ def get_ticks_position(self):
24602463
"default": "default", "unknown": "unknown"}[
24612464
self._get_ticks_position()]
24622465

2463-
def get_view_interval(self):
2464-
# docstring inherited
2465-
return self.axes.viewLim.intervaly
2466-
2467-
def set_view_interval(self, vmin, vmax, ignore=False):
2468-
# docstring inherited
2469-
if ignore:
2470-
self.axes.viewLim.intervaly = vmin, vmax
2471-
else:
2472-
Vmin, Vmax = self.get_view_interval()
2473-
if Vmin < Vmax:
2474-
self.axes.viewLim.intervaly = (min(vmin, vmax, Vmin),
2475-
max(vmin, vmax, Vmax))
2476-
else:
2477-
self.axes.viewLim.intervaly = (max(vmin, vmax, Vmin),
2478-
min(vmin, vmax, Vmax))
2479-
self.stale = True
2466+
get_view_interval, set_view_interval = _make_getset_interval(
2467+
"view", "viewLim", "intervaly")
2468+
get_data_interval, set_data_interval = _make_getset_interval(
2469+
"data", "dataLim", "intervaly")
24802470

24812471
def get_minpos(self):
24822472
return self.axes.dataLim.minposy
24832473

2484-
def get_data_interval(self):
2485-
# docstring inherited
2486-
return self.axes.dataLim.intervaly
2487-
2488-
def set_data_interval(self, vmin, vmax, ignore=False):
2489-
# docstring inherited
2490-
if ignore:
2491-
self.axes.dataLim.intervaly = vmin, vmax
2492-
else:
2493-
Vmin, Vmax = self.get_data_interval()
2494-
self.axes.dataLim.intervaly = min(vmin, Vmin), max(vmax, Vmax)
2495-
self.stale = True
2496-
24972474
def set_default_intervals(self):
24982475
# docstring inherited
24992476
ymin, ymax = 0., 1.

‎lib/mpl_toolkits/mplot3d/axis3d.py

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ def __init__(self, adir, v_intervalx, d_intervalx, axes, *args,
6868
rotate_label=None, **kwargs):
6969
# adir identifies which axes this is
7070
self.adir = adir
71-
# data and viewing intervals for this direction
72-
self.d_interval = d_intervalx
73-
self.v_interval = v_intervalx
7471

7572
# This is a temporary member variable.
7673
# Do not depend on this existing in future releases!
@@ -105,6 +102,10 @@ def __init__(self, adir, v_intervalx, d_intervalx, axes, *args,
105102
})
106103

107104
maxis.XAxis.__init__(self, axes, *args, **kwargs)
105+
106+
# data and viewing intervals for this direction
107+
self.d_interval = d_intervalx
108+
self.v_interval = v_intervalx
108109
self.set_rotate_label(rotate_label)
109110

110111
def init3d(self):
@@ -420,42 +421,49 @@ def draw(self, renderer):
420421
renderer.close_group('axis3d')
421422
self.stale = False
422423

423-
def get_view_interval(self):
424-
# docstring inherited
425-
return self.v_interval
426-
427-
def set_view_interval(self, vmin, vmax, ignore=False):
428-
# docstring inherited
429-
if ignore:
430-
self.v_interval = vmin, vmax
431-
else:
432-
Vmin, Vmax = self.get_view_interval()
433-
self.v_interval = min(vmin, Vmin), max(vmax, Vmax)
434-
435424
# TODO: Get this to work properly when mplot3d supports
436425
# the transforms framework.
437426
def get_tightbbox(self, renderer):
438427
# Currently returns None so that Axis.get_tightbbox
439428
# doesn't return junk info.
440429
return None
441430

431+
@property
432+
def d_interval(self):
433+
return self.get_data_interval()
434+
435+
@d_interval.setter
436+
def d_interval(self, minmax):
437+
return self.set_data_interval(*minmax)
438+
439+
@property
440+
def v_interval(self):
441+
return self.get_view_interval()
442+
443+
@d_interval.setter
444+
def v_interval(self, minmax):
445+
return self.set_view_interval(*minmax)
446+
442447

443448
# Use classes to look at different data limits
444449

445450

446451
class XAxis(Axis):
447-
def get_data_interval(self):
448-
# docstring inherited
449-
return self.axes.xy_dataLim.intervalx
452+
get_view_interval, set_view_interval = maxis._make_getset_interval(
453+
"view", "xy_viewLim", "intervalx")
454+
get_data_interval, set_data_interval = maxis._make_getset_interval(
455+
"data", "xy_dataLim", "intervalx")
450456

451457

452458
class YAxis(Axis):
453-
def get_data_interval(self):
454-
# docstring inherited
455-
return self.axes.xy_dataLim.intervaly
459+
get_view_interval, set_view_interval = maxis._make_getset_interval(
460+
"view", "xy_viewLim", "intervaly")
461+
get_data_interval, set_data_interval = maxis._make_getset_interval(
462+
"data", "xy_dataLim", "intervaly")
456463

457464

458465
class ZAxis(Axis):
459-
def get_data_interval(self):
460-
# docstring inherited
461-
return self.axes.zz_dataLim.intervalx
466+
get_view_interval, set_view_interval = maxis._make_getset_interval(
467+
"view", "zz_viewLim", "intervalx")
468+
get_data_interval, set_data_interval = maxis._make_getset_interval(
469+
"data", "zz_dataLim", "intervalx")

0 commit comments

Comments
 (0)
0