Merge pull request #263 from vpython/dot_color3

simplify dot_color

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', 'dot_color':'m',
          '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', 'ccw':'M', 'dot_color':'N'}
+          '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
@@ -122,7 +122,7 @@ def Exit():
 __vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', 
             'direction', 'linecolor', 'bumpaxis', 'ambient', 'add_to_trail',
             'foreground', 'background', 'ray', 'ambient', 'center', 'forward', 'normal',
-            'marker_color', 'offset']
+            'marker_color', 'offset', 'dot_color']
 
 __textattrs = ['text', 'align', 'caption', 'title', 'xtitle', 'ytitle', 'selected', 'label', 'capture', 'name',
                  'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'choices']

vpython/vpython_libraries/glowcomm.html

@@ -367,7 +367,7 @@
 // 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',
+         'j':'direction', 'k':'linecolor', 'l':'bumpaxis', 'm':'dot_color',
          'n':'foreground', 'o':'background', 'p':'ray', 'E':'center', '#':'forward', '+':'resizable',
 
          // scalar attributes
@@ -399,7 +399,7 @@
               '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',
-			  'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw', 'N':'dot_color'
+			  'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'
 			}
 
 // methods are X in {'m': '23X....'}

vpython/vpython_libraries/glowcomm.js

@@ -411,7 +411,7 @@ function control_handler(obj) {  // button, menu, slider, radio, checkbox, winpu
 	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',
@@ -446,7 +446,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
               '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',
-			  'J':'name', 'K':'offset', 'L':'attach_idx', 'M':'ccw', 'N':'dot_color'
+			  'J':'name', 'K':'offset', 'L':'attach_idx', 'M':'ccw'
 			}
 
 // methods are X in {'m': '23X....'}