Skip to content

Commit

Permalink
Merge pull request #63 from mwcraig/remove-integrate-selected
Browse files Browse the repository at this point in the history
This PR removes integrate_selected attribute of gdots
  • Loading branch information
mwcraig committed Feb 5, 2020
2 parents 3fcd32d + b6b9353 commit 7fc896b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
10 changes: 1 addition & 9 deletions vpython/vpython.py 100755 → 100644
Expand Up @@ -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', 'integrate_selected':'G'}
'size_units':'D', 'userpan':'E', 'scroll':'F'}

# 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
Expand Down Expand Up @@ -2027,7 +2027,6 @@ def setup(self, args):
self._legend = False
self._interval = -1
self._graph = None
self._integrate_selected = False
objName = args['_objName']
del args['_objName']
self._constructing = True ## calls are from constructor
Expand Down Expand Up @@ -2248,13 +2247,6 @@ def __init__(self, **args):
args['_objName'] = "gdots"
super(gdots, self).setup(args)

@property
def integrate_selected(self): return self._integrate_selected
@integrate_selected.setter
def integrate_selected(self,val):
self._integrate_selected = val
self.addattr('integrate_selected')

class gvbars(gobj):
def __init__(self, **args):
args['_objName'] = "gvbars"
Expand Down
4 changes: 2 additions & 2 deletions vpython/vpython_libraries/glow.min.js 100644 → 100755

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vpython/vpython_libraries/glowcomm.html
Expand Up @@ -393,7 +393,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', 'G':'integrate_selected'}
'D':'size_units', 'E':'userpan', 'F':'scroll'}

// methods are X in {'m': '23X....'}
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
Expand Down
2 changes: 1 addition & 1 deletion vpython/vpython_libraries/glowcomm.js
Expand Up @@ -443,7 +443,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', 'G':'integrate_selected'}
'D':'size_units', 'E':'userpan', 'F':'scroll'}

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

0 comments on commit 7fc896b

Please sign in to comment.