##// END OF EJS Templates
use single WebSocket connection for all channels...
use single WebSocket connection for all channels multiplex on a 'channel' key in message, rather than separate websockets. Unlike zmq, there aren't different message patterns that require the channels to be separate. Reduces FD count by factor of 3 and connection complexity in js.

File last commit:

r19622:fcd15106
r19824:17ebfc54
Show More
widget_int.py
201 lines | 8.1 KiB | text/x-python | PythonLexer
Jonathan Frederic
Renamed *Widget to *,...
r17598 """Int class.
Jonathan Frederic
Cleaned up Python widget code.
r14283
Represents an unbounded int using a widget.
"""
#-----------------------------------------------------------------------------
# Copyright (c) 2013, the IPython Development Team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Sylvain Corlay
registering core widgets
r18531 from .widget import DOMWidget, register
Jonathan Frederic
Added bootstrap3 progress bar classes
r17729 from IPython.utils.traitlets import Unicode, CInt, Bool, CaselessStrEnum, Tuple
Jonathan Frederic
Renamed *Widget to *,...
r17598 from IPython.utils.warn import DeprecatedClass
Jonathan Frederic
Added int widget
r14266
Jonathan Frederic
Cleaned up Python widget code.
r14283 #-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------
Jonathan Frederic
Renamed *Widget to *,...
r17598 class _Int(DOMWidget):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Base class used to create widgets that represent an int."""
Jonathan Frederic
s/Int/CInt s/Float/CFloat
r14603 value = CInt(0, help="Int value", sync=True)
Jonathan Frederic
sync=True isntead of a keys list
r14588 disabled = Bool(False, help="Enable or disable user changes", sync=True)
description = Unicode(help="Description of the value this widget represents", sync=True)
Jonathan Frederic
Create base widget classes
r14670
Jason Goad
widget fix?
r19620 def __init__(self, value=None, **kwargs):
if value is not None:
kwargs['value'] = value
super(_Int, self).__init__(**kwargs)
Jonathan Frederic
Create base widget classes
r14670
Jonathan Frederic
Renamed *Widget to *,...
r17598 class _BoundedInt(_Int):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Base class used to create widgets that represent a int that is bounded
by a minium and maximum."""
Jonathan Frederic
Create base widget classes
r14670 step = CInt(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
max = CInt(100, help="Max value", sync=True)
min = CInt(0, help="Min value", sync=True)
def __init__(self, *pargs, **kwargs):
"""Constructor"""
Jason Goad
added value positional argument to applicable widgets
r19621 super(_BoundedInt, self).__init__(*pargs, **kwargs)
Jonathan Frederic
Fix bug in bounded int/float logic.
r17852 self.on_trait_change(self._validate_value, ['value'])
self.on_trait_change(self._handle_max_changed, ['max'])
self.on_trait_change(self._handle_min_changed, ['min'])
Jonathan Frederic
Create base widget classes
r14670
Jonathan Frederic
Fix bug in bounded int/float logic.
r17852 def _validate_value(self, name, old, new):
"""Validate value."""
Jonathan Frederic
Create base widget classes
r14670 if self.min > new or new > self.max:
self.value = min(max(new, self.min), self.max)
Jonathan Frederic
Fix bug in bounded int/float logic.
r17852 def _handle_max_changed(self, name, old, new):
"""Make sure the min is always <= the max."""
Jonathan Frederic
Fix infinite loop typo
r17967 if new < self.min:
raise ValueError("setting max < min")
Jonathan Frederic
Fix bug in bounded int/float logic.
r17852
def _handle_min_changed(self, name, old, new):
"""Make sure the max is always >= the min."""
Jonathan Frederic
Fix infinite loop typo
r17967 if new > self.max:
raise ValueError("setting min > max")
Jonathan Frederic
Create base widget classes
r14670
Sylvain Corlay
jupyter -> IPython
r18533 @register('IPython.IntText')
Jonathan Frederic
Renamed *Widget to *,...
r17598 class IntText(_Int):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Textbox widget that represents a int."""
Jonathan Frederic
s/view_name/_view_name
r14701 _view_name = Unicode('IntTextView', sync=True)
Jonathan Frederic
Create base widget classes
r14670
Sylvain Corlay
jupyter -> IPython
r18533 @register('IPython.BoundedIntText')
Jonathan Frederic
Renamed *Widget to *,...
r17598 class BoundedIntText(_BoundedInt):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Textbox widget that represents a int bounded by a minimum and maximum value."""
Jonathan Frederic
s/view_name/_view_name
r14701 _view_name = Unicode('IntTextView', sync=True)
Jonathan Frederic
Create base widget classes
r14670
Sylvain Corlay
jupyter -> IPython
r18533 @register('IPython.IntSlider')
Jonathan Frederic
Renamed *Widget to *,...
r17598 class IntSlider(_BoundedInt):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Slider widget that represents a int bounded by a minimum and maximum value."""
Jonathan Frederic
s/view_name/_view_name
r14701 _view_name = Unicode('IntSliderView', sync=True)
Jonathan Frederic
Added bootstrap3 progress bar classes
r17729 orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
default_value='horizontal', allow_none=False,
Jonathan Frederic
Create base widget classes
r14670 help="Vertical or horizontal.", sync=True)
Gordon Ball
Change `range` trait to `_range`
r17703 _range = Bool(False, help="Display a range selector", sync=True)
MinRK
set readout=True as default on SliderWidgets
r15159 readout = Bool(True, help="Display the current value of the slider next to it.", sync=True)
Jonathan Frederic
Partial implementation of styles
r17723 slider_color = Unicode(sync=True)
Jonathan Frederic
Create base widget classes
r14670
Sylvain Corlay
jupyter -> IPython
r18533 @register('IPython.IntProgress')
Jonathan Frederic
Renamed *Widget to *,...
r17598 class IntProgress(_BoundedInt):
Jonathan Frederic
Added some doc strings on the widgets....
r17602 """Progress bar that represents a int bounded by a minimum and maximum value."""
Jonathan Frederic
s/view_name/_view_name
r14701 _view_name = Unicode('ProgressView', sync=True)
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059
Jonathan Frederic
Added bootstrap3 progress bar classes
r17729 bar_style = CaselessStrEnum(
values=['success', 'info', 'warning', 'danger', ''],
default_value='', allow_none=True, sync=True, help="""Use a
predefined styling for the progess bar.""")
Gordon Ball
Merge master
r17698 class _IntRange(_Int):
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 value = Tuple(CInt, CInt, default_value=(0, 1), help="Tuple of (lower, upper) bounds", sync=True)
lower = CInt(0, help="Lower bound", sync=False)
upper = CInt(1, help="Upper bound", sync=False)
def __init__(self, *pargs, **kwargs):
value_given = 'value' in kwargs
Gordon Ball
Clean up validation in __init__
r17705 lower_given = 'lower' in kwargs
upper_given = 'upper' in kwargs
if value_given and (lower_given or upper_given):
raise ValueError("Cannot specify both 'value' and 'lower'/'upper' for range widget")
if lower_given != upper_given:
raise ValueError("Must specify both 'lower' and 'upper' for range widget")
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682
Thomas Kluyver
Fix copy-pasted super() call
r19622 super(_IntRange, self).__init__(*pargs, **kwargs)
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682
# ensure the traits match, preferring whichever (if any) was given in kwargs
if value_given:
self.lower, self.upper = self.value
else:
self.value = (self.lower, self.upper)
self.on_trait_change(self._validate, ['value', 'upper', 'lower'])
def _validate(self, name, old, new):
if name == 'value':
self.lower, self.upper = min(new), max(new)
elif name == 'lower':
self.value = (new, self.value[1])
elif name == 'upper':
self.value = (self.value[0], new)
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059
Gordon Ball
Merge master
r17698 class _BoundedIntRange(_IntRange):
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059 step = CInt(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
max = CInt(100, help="Max value", sync=True)
min = CInt(0, help="Min value", sync=True)
def __init__(self, *pargs, **kwargs):
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 any_value_given = 'value' in kwargs or 'upper' in kwargs or 'lower' in kwargs
Gordon Ball
Merge master
r17698 _IntRange.__init__(self, *pargs, **kwargs)
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682
# ensure a minimal amount of sanity
if self.min > self.max:
raise ValueError("min must be <= max")
Gordon Ball
Clean up validation in __init__
r17705 if any_value_given:
# if a value was given, clamp it within (min, max)
self._validate("value", None, self.value)
else:
# otherwise, set it to 25-75% to avoid the handles overlapping
Gordon Ball
Default to 25-75% of min-max if no value is set instead of 0-1
r17591 self.value = (0.75*self.min + 0.25*self.max,
0.25*self.min + 0.75*self.max)
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 # callback already set for 'value', 'lower', 'upper'
self.on_trait_change(self._validate, ['min', 'max'])
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059
def _validate(self, name, old, new):
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 if name == "min":
if new > self.max:
raise ValueError("setting min > max")
elif name == "max":
if new < self.min:
raise ValueError("setting max < min")
low, high = self.value
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059 if name == "value":
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 low, high = min(new), max(new)
elif name == "upper":
if new < self.lower:
raise ValueError("setting upper < lower")
high = new
elif name == "lower":
if new > self.upper:
raise ValueError("setting lower > upper")
low = new
low = max(self.min, min(low, self.max))
high = min(self.max, max(high, self.min))
# determine the order in which we should update the
# lower, upper traits to avoid a temporary inverted overlap
lower_first = high < self.lower
self.value = (low, high)
if lower_first:
self.lower = low
self.upper = high
Gordon Ball
Fix validate logic if min/max are changed
r17127 else:
Gordon Ball
Support both value tuple and upper, lower traits for both int and float widgets
r17682 self.upper = high
self.lower = low
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059
Sylvain Corlay
jupyter -> IPython
r18533 @register('IPython.IntRangeSlider')
Gordon Ball
Merge master
r17698 class IntRangeSlider(_BoundedIntRange):
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059 _view_name = Unicode('IntSliderView', sync=True)
Jonathan Frederic
Fixed rebase bugs and other bugs.
r17731 orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
default_value='horizontal', allow_none=False,
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059 help="Vertical or horizontal.", sync=True)
Gordon Ball
Change `range` trait to `_range`
r17703 _range = Bool(True, help="Display a range selector", sync=True)
Gordon Ball
Add initial implementation of 2-handle range sliders for integers.
r17059 readout = Bool(True, help="Display the current value of the slider next to it.", sync=True)
Jonathan Frederic
Address problems found in in-person review
r17947 slider_color = Unicode(sync=True)
Jonathan Frederic
Added some doc strings on the widgets....
r17602
# Remove in IPython 4.0
Jonathan Frederic
Renamed *Widget to *,...
r17598 IntTextWidget = DeprecatedClass(IntText, 'IntTextWidget')
BoundedIntTextWidget = DeprecatedClass(BoundedIntText, 'BoundedIntTextWidget')
IntSliderWidget = DeprecatedClass(IntSlider, 'IntSliderWidget')
IntProgressWidget = DeprecatedClass(IntProgress, 'IntProgressWidget')