Skip to content

Commit 7fc896b

Browse files
authored
Merge pull request #63 from mwcraig/remove-integrate-selected
This PR removes integrate_selected attribute of gdots
2 parents 3fcd32d + b6b9353 commit 7fc896b

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

vpython/vpython.py

100755100644
Lines changed: 1 addition & 9 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', 'integrate_selected':'G'}
100+
'size_units':'D', 'userpan':'E', 'scroll':'F'}
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
@@ -2027,7 +2027,6 @@ def setup(self, args):
20272027
self._legend = False
20282028
self._interval = -1
20292029
self._graph = None
2030-
self._integrate_selected = False
20312030
objName = args['_objName']
20322031
del args['_objName']
20332032
self._constructing = True ## calls are from constructor
@@ -2248,13 +2247,6 @@ def __init__(self, **args):
22482247
args['_objName'] = "gdots"
22492248
super(gdots, self).setup(args)
22502249

2251-
@property
2252-
def integrate_selected(self): return self._integrate_selected
2253-
@integrate_selected.setter
2254-
def integrate_selected(self,val):
2255-
self._integrate_selected = val
2256-
self.addattr('integrate_selected')
2257-
22582250
class gvbars(gobj):
22592251
def __init__(self, **args):
22602252
args['_objName'] = "gvbars"

vpython/vpython_libraries/glow.min.js

100644100755
Lines changed: 2 additions & 2 deletions
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
@@ -393,7 +393,7 @@
393393
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
394394
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
395395
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
396-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'integrate_selected'}
396+
'D':'size_units', 'E':'userpan', 'F':'scroll'}
397397

398398
// methods are X in {'m': '23X....'}
399399
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
@@ -443,7 +443,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
443443
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
444444
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
445445
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
446-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'integrate_selected'}
446+
'D':'size_units', 'E':'userpan', 'F':'scroll'}
447447

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

0 commit comments

Comments
 (0)