Merge pull request #248 from vpython/helix_ccw

Implement helix ccw

Author: BruceSherwood

vpython/vpython.py

@@ -77,7 +77,7 @@ def Exit():
 # attrs are X in {'a': '23X....'}
 __attrs = {'pos':'a', 'up':'b', 'color':'c', 'trail_color':'d', # don't use single and double quotes; available: comma, but maybe that would cause trouble
          'ambient':'e', 'axis':'f', 'size':'g', 'origin':'h',
-         'direction':'j', 'linecolor':'k', 'bumpaxis':'l', 
+         'direction':'j', 'linecolor':'k', 'bumpaxis':'l',
          'foreground':'n', 'background':'o', 'ray':'p', 'center':'E', 'forward':'#', 'resizable':'+',
 
          # scalar attributes
@@ -109,7 +109,7 @@ def Exit():
           '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', 'choices':'G', 'depth':'H',
-          'round':'I', 'name':'J', 'offset':'K', 'attach_idx':'L'}
+          'round':'I', 'name':'J', 'offset':'K', 'attach_idx':'L', 'ccw':'M'}
 
 # 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
@@ -529,7 +529,7 @@ class standardAttributes(baseObj):
                  'helix':[['pos', 'color', 'trail_color'],
                          ['axis', 'size', 'up'],
                          ['visible', 'opacity','shininess', 'emissive',
-                         'make_trail', 'trail_type', 'interval',
+                         'make_trail', 'trail_type', 'interval', 'ccw',
                          'retain', 'trail_color', 'trail_radius', 'coils', 'thickness', 'pickable'],
                          ['red', 'green', 'blue','length', 'width', 'height', 'radius']],
                  'curve':[['origin', 'color'],
@@ -1137,7 +1137,7 @@ def clone(self, **args):
                     'visible':True, 'pickable':self._pickable}
         elif objName == 'helix':
             oldargs = {'pos':self.pos, 'color':self._color,
-                    'thickness':self._thickness, 'coils':self._coils,
+                    'thickness':self._thickness, 'coils':self._coils, 'ccw':self._ccw,
                     'size':self._size, 'axis':self._axis, 'up':self._up,
                     'shininess':self._shininess, 'emissive':self._emissive,
                     'visible':True, 'pickable':self._pickable}
@@ -1503,6 +1503,7 @@ def __init__(self,**args):
         args['_objName'] = 'helix'
         args['_default_size'] = vector(1,2,2)
         self._coils = 5
+        self._ccw = True
         self._thickness = 1/20  ## radius/20
 
         super(helix, self).setup(args)
@@ -1525,6 +1526,15 @@ def coils(self,value):
         if not self._constructing:
             self.addattr('coils')
 
+    @property
+    def ccw(self):
+        return self._ccw
+    @ccw.setter
+    def ccw(self,value):
+        self._ccw =value
+        if not self._constructing:
+            self.addattr('ccw')
+
     @property
     def radius(self):
         return self._size.y/2

vpython/vpython_libraries/glow.min.js

@@ -364,10 +364,10 @@
 	events.push(evt)
 }
 
-// attrs are X in {'a': '23X....'} avaiable: none
+// attrs are X in {'a': '23X....'} available: none
 var attrs = {'a':'pos', 'b':'up', 'c':'color', 'd':'trail_color', // don't use single and double quotes; available: comma, but maybe that would cause trouble
          'e':'ambient', 'f':'axis', 'g':'size', 'h':'origin', 'i':'textcolor',
-         'j':'direction', 'k':'linecolor', 'l':'bumpaxis', 'm':'dot_color',
+         'j':'direction', 'k':'linecolor', 'l':'bumpaxis',
          'n':'foreground', 'o':'background', 'p':'ray', 'E':'center', '#':'forward', '+':'resizable',
 
          // scalar attributes
@@ -398,7 +398,9 @@
               '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', 'G':'choices', 'H':'depth', 'I':'round'}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',
+			  'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'
+			}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB

vpython/vpython_libraries/glowcomm.html

@@ -421,7 +421,7 @@ var attrs = {'a':'pos', 'b':'up', 'c':'color', 'd':'trail_color', // don't use s
          'q':'graph', 'r':'canvas', 's':'trail_radius', 
          't':'visible', 'u':'opacity', 'v':'shininess', 'w':'emissive',  
          'x':'make_trail', 'y':'trail_type', 'z':'interval', 'A':'pps', 'B':'retain',  
-         'C':'red', 'D':'green', 'F':'blue', 'G':'length', 'H':'width', 'I':'height', 'J':'radius',
+         'C':'red', 'D':'green', 'E':'ccw', 'F':'blue', 'G':'length', 'H':'width', 'I':'height', 'J':'radius',
          'K':'thickness', 'L':'shaftwidth', 'M':'headwidth', 'N':'headlength', 'O':'pickable',
          'P':'coils', 'Q':'xoffset', 'R':'yoffset',
          'S':'border', 'T':'line', 'U':'box', 'V':'space', 'W':'linewidth',
@@ -445,7 +445,9 @@ 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', 'G':'choices', 'H':'depth', 'I':'round'}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',
+			  'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'
+			}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB