Merge pull request #260 from vpython/dotcolor

mwcraig · web-flow · commit 593ed0e771b5 · 2024-02-23T14:45:59.000-06:00
Fix dot_color
diff --git a/vpython/vpython.py b/vpython/vpython.py
@@ -500,6 +500,11 @@ class standardAttributes(baseObj):
                          'make_trail', 'trail_type', 'interval',
                          'retain', 'trail_color', 'trail_radius', 'texture', 'pickable'],
                         ['red', 'green', 'blue','length', 'width', 'height']],
+                 'group':[['pos', 'color', 'trail_color'],
+                        ['axis', 'size', 'up'],
+                        ['visible', 'make_trail', 'trail_type', 'interval',
+                         'retain', 'trail_color', 'trail_radius'],
+                        ['red', 'green', 'blue','length', 'width', 'height']],
                  'sphere':[['pos', 'color', 'trail_color'],
                         ['axis', 'size', 'up'],
                         ['visible', 'opacity','shininess', 'emissive',
diff --git a/vpython/vpython_libraries/glow.min.js b/vpython/vpython_libraries/glow.min.js
diff --git a/vpython/vpython_libraries/glowcomm.html b/vpython/vpython_libraries/glowcomm.html
@@ -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'
+			  'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw', 'N':'dot_color'
 			}
 
 // methods are X in {'m': '23X....'}
diff --git a/vpython/vpython_libraries/glowcomm.js b/vpython/vpython_libraries/glowcomm.js
@@ -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'
+			  'J':'name', 'K':'offset', 'L':'attach_idx', 'M':'ccw', 'N':'dot_color'
 			}
 
 // methods are X in {'m': '23X....'}

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@`
`399`	`399`	`'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',`
`400`	`400`	`'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',`
`401`	`401`	`'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',`
`402`		`- 'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'`
	`402`	`+ 'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw', 'N':'dot_color'`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`// methods are X in {'m': '23X....'}`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':`
`446`	`446`	`'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',`
`447`	`447`	`'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',`
`448`	`448`	`'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',`
`449`		`- 'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'`
	`449`	`+ 'J':'name', 'K':'offset', 'L':'attach_idx', 'M':'ccw', 'N':'dot_color'`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`// methods are X in {'m': '23X....'}`