Implement winput

vpython/vpython.py

@@ -15,8 +15,8 @@
 from ._vector_import_helper import (vector, mag, norm, dot, adjust_up,
                                     adjust_axis, object_rotate)
 
-# List of names that will be imported form this file with import *
-__all__ = ['Camera', 'GlowWidget', 'GSversion', 'Mouse', 'arrow', 'attach_arrow',
+# List of names that will be imported from this file with import *
+__all__ = ['Camera', 'GlowWidget', 'version', 'GSversion', 'Mouse', 'arrow', 'attach_arrow',
            'attach_trail', 'baseObj', 'box', 'bumpmaps', 'button',
            'canvas', 'checkbox', 'clock', 'color', 'combin', 'compound', 'cone', 'controls',
            'curve', 'curveMethods', 'cylinder', 'distant_light', 'ellipsoid',
@@ -25,7 +25,7 @@
            'local_light', 'menu', 'meta_canvas', 'points', 'pyramid',
            'quad', 'radio', 'ring', 'simple_sphere', 'sleep', 'slider', 'sphere',
            'standardAttributes', 'text', 'textures', 'triangle', 'vertex',
-           'wtext']
+           'wtext', 'winput']
 
 __p = platform.python_version()
 _ispython3 = (__p[0] == '3')
@@ -360,6 +360,9 @@ def handle_msg(self, msg):
                     obj._checked = evt['value']
                 elif evt['widget'] == 'radio':
                     obj._checked = evt['value']
+                elif evt['widget'] == 'winput':
+                    obj._text = evt['text']
+                    obj._number = evt['value']
                 # inspect the bound function and see what it's expecting
                 if _ispython3: # Python 3
                     a = signature(obj._bind)
@@ -3296,7 +3299,8 @@ class controls(baseObj):
                   'radio':['checked', 'text', 'disabled'],
                   'menu':['selected', 'choices', 'index', 'disabled'],
                   'slider':['vertical', 'min', 'max', 'step', 'value', 'length',
-                            'width', 'left', 'right', 'top', 'bottom', 'align', 'disabled']
+                            'width', 'left', 'right', 'top', 'bottom', 'align', 'disabled'],
+                  'winput':['width', 'height', 'text', 'type', 'disabled']
                 }
     def setup(self, args):
         super(controls, self).__init__()  ## get idx, attrsupdt from baseObj
@@ -3479,6 +3483,47 @@ def checked(self, value):
         if not self._constructing:
             self.addattr('checked')
 
+class winput(controls):
+    def __init__(self, **args):
+        args['_objName'] = 'winput'
+        self._checked = False
+        self._text = ''
+        self._type = 'numeric'
+        self._number = None
+        self._width = 100
+        self._height = 20
+        super(winput, self).setup(args)
+
+    @property
+    def text(self):
+        return self._text
+    @text.setter
+    def text(self, value):
+        self._text = value
+        if not self._constructing:
+            self.addattr('text')
+
+    @property
+    def number(self):
+        return self._number
+    @number.setter
+    def number(self, value):
+        raise AttributeError('Cannot change the winput number attribute.')
+
+    @property
+    def width(self):
+        return self._width
+    @width.setter
+    def width(self, value):
+        raise AttributeError('Cannot change the winput width attribute.')
+
+    @property
+    def type(self):
+        return self._type
+    @type.setter
+    def type(self, value):
+        raise AttributeError('Cannot change the winput type attribute.')
+
 class menu(controls):
     def __init__(self, **args):
         args['_objName'] = 'menu'

vpython/vpython_libraries/glowcomm.html

@@ -308,7 +308,7 @@
 
 var sliders = {}
 
-function control_handler(obj) {  // button, menu, slider, radio, checkbox
+function control_handler(obj) {  // button, menu, slider, radio, checkbox, winput
     "use strict";
     var evt = {idx: obj.idx}
     if (obj.objName === 'button') {
@@ -330,6 +330,10 @@
     } else if (obj.objName === 'menu') {
         evt.value = obj.index
         evt.widget = 'menu'
+    } else if (obj.objName === 'winput') {
+        evt.text = obj.text
+        evt.value = obj.number
+        evt.widget = 'winput'
     } else {
         console.log('unrecognized control', 'obj=', obj, obj.text)
     }
@@ -707,6 +711,13 @@
 				cfg = fix_location(cfg)
 				glowObjs[idx] = wtext(cfg)
 				break
+            }
+            case 'winput': {
+				cfg.objName = obj
+				cfg.bind = control_handler
+				cfg = fix_location(cfg)
+				glowObjs[idx] = winput(cfg)
+				break
             }
 			case 'checkbox': {
 				cfg.objName = obj

vpython/vpython_libraries/glowcomm.js

@@ -338,7 +338,7 @@ function process_binding(event) { // event associated with a previous bind comma
 
 var sliders = {}
 
-function control_handler(obj) {  // button, menu, slider, radio, checkbox
+function control_handler(obj) {  // button, menu, slider, radio, checkbox, winput
     "use strict";
     var evt = {idx: obj.idx}
     if (obj.objName === 'button') {
@@ -360,6 +360,10 @@ function control_handler(obj) {  // button, menu, slider, radio, checkbox
     } else if (obj.objName === 'menu') {
         evt.value = obj.index
         evt.widget = 'menu'
+    } else if (obj.objName === 'winput') {
+        evt.text = obj.text
+        evt.value = obj.number
+        evt.widget = 'winput'
     } else {
         console.log('unrecognized control', 'obj=', obj, obj.text)
     }
@@ -750,6 +754,13 @@ function handle_cmds(dcmds) {
 				cfg = fix_location(cfg)
 				glowObjs[idx] = wtext(cfg)
 				break
+            }
+            case 'winput': {
+				cfg.objName = obj
+				cfg.bind = control_handler
+				cfg = fix_location(cfg)
+				glowObjs[idx] = winput(cfg)
+				break
             }
 			case 'checkbox': {
 				cfg.objName = obj