Skip to content

Commit f575483

Browse files
Merge pull request #115 from vpython/Fix_text3D_depth_setting
Fix 3D text depth setting. Also improves helix display and mousemove …
2 parents 0041195 + e106742 commit f575483

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

labextension/vpython/src/glowcommlab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
472472
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
473473
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
474474
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
475-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
475+
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth'}
476476

477477
// methods are X in {'m': '23X....'}
478478
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB

vpython/vpython.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
'right':'q', 'top':'r', 'bottom':'s', '_cloneid':'t',
9898
'logx':'u', 'logy':'v', 'dot':'w', 'dot_radius':'x',
9999
'markers':'y', 'legend':'z', 'label':'A', 'delta':'B', 'marker_color':'C',
100-
'size_units':'D', 'userpan':'E', 'scroll':'F', 'choices':'G'}
100+
'size_units':'D', 'userpan':'E', 'scroll':'F', 'choices':'G', 'depth':'H'}
101101

102102
# methods are X in {'m': '23X....'}
103103
# pos is normally updated as an attribute, but for interval-based trails, it is updated (multiply) as a method
@@ -3979,7 +3979,7 @@ def depth(self, val): # sign issue ??
39793979
if abs(val) < 0.01*self._height:
39803980
if val < 0: val = -0.01*self._height
39813981
else: val = 0.01*self._height
3982-
self._depth = value
3982+
self._depth = val
39833983
self.addattr('depth')
39843984

39853985
@property

vpython/vpython_libraries/glow.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vpython/vpython_libraries/glowcomm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
400400
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
401401
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
402-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
402+
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth'}
403403

404404
// methods are X in {'m': '23X....'}
405405
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB

vpython/vpython_libraries/glowcomm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
444444
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
445445
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
446446
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
447-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices'}
447+
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth'}
448448

449449
// methods are X in {'m': '23X....'}
450450
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB

0 commit comments

Comments
 (0)