Merge pull request #145 from BruceSherwood/Finish_graph_scroll

Finish graph scroll

Author: BruceSherwood

labextension/vpython/src/glowcommlab.js

@@ -446,7 +446,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'}
+              '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

vpython/vpython.py

@@ -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'}
+          '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
@@ -2282,6 +2282,7 @@ def __init__(self, **args):
         self._title = ""
         self._xtitle = ""
         self._ytitle = ""
+        self._scroll = False
         argsToSend = []
 
         ## override default vector attributes
@@ -2296,7 +2297,7 @@ def __init__(self, **args):
 
         ## override default scalar attributes
         scalarAttributes = ['width', 'height', 'title', 'xtitle', 'ytitle','align',
-                            'xmin', 'xmax', 'ymin', 'ymax', 'logx', 'logy', 'fast']
+                            'xmin', 'xmax', 'ymin', 'ymax', 'logx', 'logy', 'fast', 'scroll']
         for a in scalarAttributes:
             if a in args:
                 argsToSend.append(a)
@@ -2309,6 +2310,12 @@ def __init__(self, **args):
 
         cmd = {"cmd": objName, "idx": self.idx}
 
+        if self._scroll:
+            if not ('xmin' in argsToSend and 'xmax' in argsToSend):
+                raise AttributeError("For a scrolling graph, both xmin and xmax must be specified.")
+            if self._xmax <= self._xmin:
+                raise AttributeError("For a scrolling graph, xmax must be greater than xmin.")
+
         ## send only args specified in constructor
         for a in argsToSend:
             aval = getattr(self,a)
@@ -2322,11 +2329,16 @@ def __init__(self, **args):
     def fast(self): return self._fast
     @fast.setter
     def fast(self,val):
-        # if _isnotebook and not val:
-            # raise AttributeError('"fast = False" is currently not available in a Jupyter notebook.')
         self._fast = val
         self.addattr('fast')
 
+    @property
+    def scroll(self): return self._scroll
+    @scroll.setter
+    def scroll(self,val):
+        self._scroll = val
+        self.addattr('scroll')
+
     @property
     def width(self): return self._width
     @width.setter

vpython/vpython_libraries/glowcomm.html

@@ -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'}
+              '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

vpython/vpython_libraries/glowcomm.js

@@ -423,7 +423,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'}
+              '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