Some speedup in generating large numbers of compounds

Author: BruceSherwood

vpython/vpython.py

@@ -28,13 +28,7 @@
            'standardAttributes', 'text', 'textures', 'triangle', 'vertex',
            'wtext', 'winput', 'keysdown']
 
-__p = platform.python_version()
-_ispython3 = (__p[0] == '3')
-
-if _ispython3:
-    from inspect import signature # Python 3; needed to allow zero arguments in a bound function
-else:
-    from inspect import getargspec # Python 2; needed to allow zero arguments in a bound function
+from inspect import signature # needed to allow zero arguments in a bound function
 
 # __version__ is the version number of the Jupyter VPython installer, generated in building the installer.
 version = [__version__, 'jupyter']
@@ -175,10 +169,6 @@ def _encode_attr(D, ismethods): # ismethods is True if a list of method operatio
                 out.append(s)
     return out
 
-if sys.version > '3':
-    long = int
-
-
 def list_to_vec(L):
     return vector(L[0], L[1], L[2])
 
@@ -385,14 +375,9 @@ def handle_msg(self, msg):
                     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)
-                    if str(a) != '()': obj._bind( obj )
-                    else: obj._bind()
-                else: # Python 2
-                    a = getargspec(obj._bind)
-                    if len(a.args) > 0: obj._bind( obj )
-                    else: obj._bind()
+                a = signature(obj._bind)
+                if str(a) != '()': obj._bind( obj )
+                else: obj._bind()
             else:   ## a canvas event
                 if 'trigger' not in evt:
                     cvs = baseObj.object_registry[evt['canvas']]
@@ -1446,11 +1431,6 @@ def __init__(self, objList, **args):
             savesize = args['size']
             del args['size']
 
-        baseObj.sent = False
-        while not baseObj.sent: # wait for compounding objects to exist
-            if _isnotebook: rate(1000)
-            else: time.sleep(0.001)
-
         self.compound_idx += 1
         args['_objName'] = 'compound'+str(self.compound_idx)
         super(compound, self).setup(args)
@@ -3117,14 +3097,9 @@ def handle_event(self, evt):  ## events and scene info updates
                 del evt['height']
                 for fct in self._binds['resize']:
                     # inspect the bound function and see what it's expecting
-                    if _ispython3: # Python 3
-                        a = signature(fct)
-                        if str(a) != '()': fct( evt )
-                        else: fct()
-                    else: # Python 2
-                        a = getargspec(fct)
-                        if len(a.args) > 0: fct( evt )
-                        else: fct()
+                    a = signature(fct)
+                    if str(a) != '()': fct( evt )
+                    else: fct()
         else: # pause/waitfor, update_canvas
             if 'pos' in evt:
                 pos = evt['pos']
@@ -3144,14 +3119,9 @@ def handle_event(self, evt):  ## events and scene info updates
                 evt1 = event_return(evt)  ## turn it into an object
                 for fct in self._binds[ev]:
                     # inspect the bound function and see what it's expecting
-                    if _ispython3: # Python 3
-                        a = signature(fct)
-                        if str(a) != '()': fct( evt1 )
-                        else: fct()
-                    else: # Python 2
-                        a = getargspec(fct)
-                        if len(a.args) > 0: fct( evt1 )
-                        else: fct()
+                    a = signature(fct)
+                    if str(a) != '()': fct( evt1 )
+                    else: fct()
                 self._waitfor = evt1 # what pause and waitfor are looking for
             else:  ## user can change forward (spin), range/autoscale (zoom), up (touch), center (pan)
                 if 'forward' in evt and self.userspin and not self._set_forward:
@@ -4111,4 +4081,4 @@ def set_browser(type='default'):
     if type=='pyqt':
         _browsertype='pyqt'
     else:
-        _browsertype='default'
+        _browsertype='default'

vpython/vpython_libraries/glowcomm.html

@@ -75,7 +75,7 @@
 		}
 		var t2 = msclock()
 		var dt = Math.floor(t1+interval-t2) // attempt to keep the time between renders constant
-		if (dt < 15) dt = 0     // becaause setTimeout is inaccurate for small dt's
+		if (dt < 15) dt = 0     // because setTimeout is inaccurate for small dt's
 		timer = setTimeout(send, dt)
 	}
 
@@ -256,11 +256,13 @@
 	events.push(evt)
 }
 
-function send_compound(cvs, pos, size, up) {
+function send_compound(cvs, pos, size, up) { // compound, extrusion, 3D text
     "use strict";
     var evt = {event: '_compound', 'canvas': cvs, 'pos': [pos.x, pos.y, pos.z], 
         'size': [size.x, size.y, size.z], 'up': [up.x, up.y, up.z]}
 	events.push(evt)
+	clearTimeout(timer) // Don't wait for next transmission to Python
+	send()
 }
 
 var waitfor_canvas = null

vpython/vpython_libraries/glowcomm.js

@@ -306,11 +306,13 @@ function send_pick(cvs, p, seg) {
 	events.push(evt)
 }
 
-function send_compound(cvs, pos, size, up) {
-    "use strict";
+function send_compound(cvs, pos, size, up) { // compound, extrusion, 3D text
+	"use strict";
     var evt = {event: '_compound', 'canvas': cvs, 'pos': [pos.x, pos.y, pos.z], 
         'size': [size.x, size.y, size.z], 'up': [up.x, up.y, up.z]}
 	events.push(evt)
+	clearTimeout(timer) // Don't wait for next transmission to Python
+	send()
 }
 
 var waitfor_canvas = null