Skip to content

Commit b7923c9

Browse files
committed
Bounds check returns value.
1 parent 278ac33 commit b7923c9

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

lib/matplotlib/widgets.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,17 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt='%1.2f',
334334
if slidermax is not None and not hasattr(slidermax, 'val'):
335335
raise ValueError("Argument slidermax ({}) has no 'val'"
336336
.format(type(slidermax)))
337-
337+
self.closedmin = closedmin
338+
self.closedmax = closedmax
339+
self.slidermin = slidermin
340+
self.slidermax = slidermax
341+
self.drag_active = False
338342
self.valmin = valmin
339343
self.valmax = valmax
344+
valinit = self._value_in_bounds(valinit)
340345
self.val = valinit
341346
self.valinit = valinit
342347
self.poly = ax.axvspan(valmin, valinit, 0, 1, **kwargs)
343-
344348
self.vline = ax.axvline(valinit, 0, 1, color='r', lw=1)
345349

346350
self.valfmt = valfmt
@@ -365,12 +369,7 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt='%1.2f',
365369
self.cnt = 0
366370
self.observers = {}
367371

368-
self.closedmin = closedmin
369-
self.closedmax = closedmax
370-
self.slidermin = slidermin
371-
self.slidermax = slidermax
372-
self.drag_active = False
373-
self._value_in_bounds(valinit)
372+
self.set_val(valinit)
374373

375374
def _value_in_bounds(self, val):
376375
""" Makes sure self.val is with given bounds."""
@@ -392,7 +391,7 @@ def _value_in_bounds(self, val):
392391
if not self.closedmax:
393392
return
394393
val = self.slidermax.val
395-
self.set_val(val)
394+
return val
396395

397396
def _update(self, event):
398397
"""update the slider position"""
@@ -416,7 +415,7 @@ def _update(self, event):
416415
event.canvas.release_mouse(self.ax)
417416
return
418417
val = event.xdata
419-
self._value_in_bounds(val)
418+
self.set_val(self._value_in_bounds(val))
420419

421420
def set_val(self, val):
422421
xy = self.poly.xy

0 commit comments

Comments
 (0)