Update to match GlowScript

Author: BruceSherwood

labextension/vpython/src/glowcommlab.js

@@ -1,7 +1,7 @@
-import 'script-loader!./vpython_libraries/jquery.min.js';
-import 'script-loader!./vpython_libraries/jquery-ui.custom.min.js';
-import 'script-loader!./vpython_libraries/glow.min.js';
-import 'script-loader!./vpython_libraries/plotly.min.js';
+import 'script-loader!../vpython_libraries/jquery.min.js';
+import 'script-loader!../vpython_libraries/jquery-ui.custom.min.js';
+import 'script-loader!../vpython_libraries/glow.min.js';
+import 'script-loader!../vpython_libraries/plotly.min.js';
 import '../style/jquery-ui.custom.css'
 import '../style/ide.css'
 
@@ -202,7 +202,7 @@ cylinder = vp_cylinder
 pyramid = vp_pyramid
 cone = vp_cone
 helix = vp_helix
-ellipsoid = vp_ellipsoid
+//ellipsoid = vp_ellipsoid   // This line causes a big problem in jupyterlab vpython extension
 ring = vp_ring
 arrow = vp_arrow
 compound = vp_compound
@@ -483,7 +483,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
               'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
               'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius', 
               'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
-              'D':'size_units', 'E':'userpan', 'F':'scroll'}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
@@ -498,7 +498,7 @@ var vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', '
                 'marker_color']
 
 var textattrs = ['text', 'align', 'caption', 'title', 'title_align', 'xtitle', 'ytitle', 'selected', 'capture',
-                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint']
+                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
 
 // patt gets idx and attr code; vpatt gets x,y,z of a vector            
 var patt = /(\d+)(.)(.*)/
@@ -542,8 +542,12 @@ function decode(data) {
                     vs = [Number(val[1]), Number(val[2]), Number(val[3]), Number(val[4])]
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
-                // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
-				val = m[3].replace(/<br>/g, "\n")
+                if (attr == 'choices') { // menu choices to be wrapped in a list
+                    val = m[3].split(' ')
+                } else {
+                    // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
+                    val = m[3].replace(/<br>/g, "\n")
+                }
 			} else if (attr == 'rotate') { // angle,x,y,z,x,y,z
 				var temp = m[3]
 				val = []

vpython/vpython.py

@@ -6,10 +6,10 @@
 from math import sqrt, tan, pi
 
 import time
-try:
-    clock = time.perf_counter # time.clock is deprecated in Python 3.3, gone in 3.8
-except:
-    clock = time.clock
+
+# vpython provides clock in its namespace
+clock = time.perf_counter
+
 import sys
 from . import __version__, __gs_version__
 from ._notebook_helpers import _isnotebook
@@ -97,7 +97,7 @@
           'right':'q', 'top':'r', 'bottom':'s', '_cloneid':'t',
           'logx':'u', 'logy':'v', 'dot':'w', 'dot_radius':'x',
           'markers':'y', 'legend':'z', 'label':'A', 'delta':'B', 'marker_color':'C',
-          'size_units':'D', 'userpan':'E', 'scroll':'F'}
+          'size_units':'D', 'userpan':'E', 'scroll':'F', 'choices':'G'}
 
 # methods are X in {'m': '23X....'}
 # pos is normally updated as an attribute, but for interval-based trails, it is updated (multiply) as a method
@@ -113,16 +113,22 @@
             'marker_color']
 
 __textattrs = ['text', 'align', 'caption', 'title', 'xtitle', 'ytitle', 'selected', 'label', 'capture',
-                 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint']
+                 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
 
 def _encode_attr2(sendval, val, ismethods):
     s = ''
     if sendval in __vecattrs: # it would be good to do some kind of compression of doubles
         s += "{:.16G},{:.16G},{:.16G}".format(val[0], val[1], val[2])
     elif sendval in __textattrs:
-        # '\n' doesn't survive JSON transmission, so we replace '\n' with '<br>' (and convert back in glowcomm)
-        if not isinstance(val, str): val = print_to_string(val)
-        val = val.replace('\n', '<br>')
+        if sendval == 'choices':
+            s2 = ''
+            for v in val:
+                s2 += v+' '
+            val = s2[0:-1]
+        else:
+            # '\n' doesn't survive JSON transmission, so we replace '\n' with '<br>' (and convert back in glowcomm)
+            if not isinstance(val, str): val = print_to_string(val)
+            val = val.replace('\n', '<br>')
         s += val
     elif sendval == 'rotate':
         for p in val:
@@ -556,7 +562,7 @@ class standardAttributes(baseObj):
                  'extrusion':[ ['pos', 'color', 'start_face_color', 'end_face_color'],
                         [ 'axis', 'size', 'up' ],
                         ['path', 'shape', 'visible', 'opacity','shininess', 'emissive',
-                         'show_start_face', 'show_end_face',
+                         'show_start_face', 'show_end_face', 'smooth',
                          'make_trail', 'trail_type', 'interval', 'show_start_face', 'show_end_face',
                          'retain', 'trail_color', 'trail_radius', 'texture', 'pickable' ],
                         ['red', 'green', 'blue','length', 'width', 'height'] ],
@@ -2702,7 +2708,7 @@ def rotate(self, angle=0, axis=None, origin=None):
         c = self._canvas
         if axis is None: axis = c.up
         if origin is not None and origin != self.pos:
-            origin = self.pos + (self.pos-origin).rotate(angle=angle, axis=axis)
+            origin = origin + (self.pos-origin).rotate(angle=angle, axis=axis)
         else:
             origin = self.pos
         if c._axis.diff_angle(axis) > 1e-6:
@@ -3098,7 +3104,6 @@ def handle_event(self, evt):  ## events and scene info updates
                 # Set attribute_vector.value, which avoids nullifying the
                 # on_change functions that detect changes in e.g. obj.pos.y
                 obj._pos.value = list_to_vec(p)
-                obj._origin = obj._pos
                 s = evt['size']
                 obj._size.value = obj._size0 = list_to_vec(s)
                 obj._axis.value = obj._size._x*norm(obj._axis)
@@ -3543,7 +3548,10 @@ def choices(self):
         return self._choices
     @choices.setter
     def choices(self, value):
-        raise AttributeError('choices cannot be modified after a menu is created')
+        self._choices = value
+        if not self._constructing:
+            self.addattr('choices')
+        #raise AttributeError('choices cannot be modified after a menu is created')
 
     @property
     def index(self):
@@ -3784,6 +3792,16 @@ def shape(self):
     def shape(self, value):
         raise AttributeError('shape cannot be changed after extrusion is created')
 
+    @property
+    def smooth(self):
+        if self._constructing:
+            return self._smooth
+        else:
+            return None
+    @smooth.setter
+    def smooth(self, value):
+        raise AttributeError('smooth cannot be changed after extrusion is created')
+
     @property
     def show_start_face(self):
         if self._constructing:

vpython/vpython_libraries/glow.min.js

@@ -406,7 +406,7 @@
               'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
               'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius', 
               'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
-              'D':'size_units', 'E':'userpan', 'F':'scroll'}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
@@ -421,7 +421,7 @@
                 'marker_color']
 
 var textattrs = ['text', 'align', 'caption', 'title', 'title_align', 'xtitle', 'ytitle', 'selected', 'capture',
-                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint']
+                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
 
 // patt gets idx and attr code; vpatt gets x,y,z of a vector            
 var patt = /(\d+)(.)(.*)/
@@ -465,8 +465,12 @@
                     vs = [Number(val[1]), Number(val[2]), Number(val[3]), Number(val[4])]
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
-                // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
-				val = m[3].replace(/<br>/g, "\n")
+                if (attr == 'choices') { // menu choices to be wrapped in a list
+                    val = m[3].split(' ')
+                } else {
+                    // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
+                    val = m[3].replace(/<br>/g, "\n")
+                }
 			} else if (attr == 'rotate') { // angle,x,y,z,x,y,z
 				var temp = m[3]
 				val = []
@@ -954,4 +958,4 @@
 
 </script>
 </div>
-</body>
+</body>

vpython/vpython_libraries/glowcomm.html

@@ -456,7 +456,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
               'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
               'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius', 
               'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
-              'D':'size_units', 'E':'userpan', 'F':'scroll'}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
@@ -471,7 +471,7 @@ var vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', '
                 'marker_color']
 
 var textattrs = ['text', 'align', 'caption', 'title', 'title_align', 'xtitle', 'ytitle', 'selected', 'capture',
-                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint']
+                 'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
 
 // patt gets idx and attr code; vpatt gets x,y,z of a vector            
 var patt = /(\d+)(.)(.*)/
@@ -515,8 +515,12 @@ function decode(data) {
                     vs = [Number(val[1]), Number(val[2]), Number(val[3]), Number(val[4])]
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
-                // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
-				val = m[3].replace(/<br>/g, "\n")
+                if (attr == 'choices') { // menu choices to be wrapped in a list
+                    val = m[3].split(' ')
+                } else {
+                    // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
+                    val = m[3].replace(/<br>/g, "\n")
+                }
 			} else if (attr == 'rotate') { // angle,x,y,z,x,y,z
 				var temp = m[3]
 				val = []