added support for pyqt browser window for display vpython canvas

Author: Aaron Titus

vpython/no_notebook.py

@@ -1,6 +1,5 @@
-from .vpython import GlowWidget, baseObj, vector, canvas, _browsertype
+from .vpython import GlowWidget, baseObj, vector, canvas
 from ._notebook_helpers import _in_spyder, _undo_vpython_import_in_spyder
-#from .qtbrowser import createQtBrowser
 
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import os
@@ -14,18 +13,13 @@
 import txaio
 import copy
 import socket
-import PyQt5.QtCore
-import PyQt5.QtWebEngineWidgets
-from PyQt5.QtWidgets import QApplication
-import multiprocessing
 
 import signal
 from urllib.parse import unquote
 
 from .rate_control import rate
 
 
-
 # Check for Ctrl+C. SIGINT will also be sent by our code if WServer is closed.
 def signal_handler(signal, frame):
     stop_server()
@@ -237,25 +231,10 @@ def onClose(self, wasClean, code, reason):
     else:
         __server = HTTPServer(('', __HTTP_PORT), serveHTTP)
         # or webbrowser.open_new_tab()
-        if(_browsertype=='default'): #uses default browser
-            _webbrowser.open('http://localhost:{}'.format(__HTTP_PORT)) #uses default browser
-        
+        _webbrowser.open('http://localhost:{}'.format(__HTTP_PORT))
 except:
     pass
 
-def start_Qapp(port):
-    # creates a python browser with PyQt5
-    # runs qtbrowser.py in a separate process
-    filepath=os.path.dirname(__file__)
-    filename=filepath+'/qtbrowser.py'
-    os.system('python '+filename+' http://localhost:{}'.format(port))
-
-
-#create a browser in its own process
-if(_browsertype=='pyqt'): #uses default browser
-    __m = multiprocessing.Process(target=start_Qapp, args=(__HTTP_PORT,))
-    __m.start()
-
 __w = threading.Thread(target=__server.serve_forever)
 __w.start()
 
@@ -323,6 +302,7 @@ def stop_server():
         # python/threading.py:_shutdown). Since we just stopped those threads,
         # we'll now exit.
 
+
 GW = GlowWidget()
 
 while not (httpserving and websocketserving):  # try to make sure setup is complete

vpython/vpython.py

@@ -24,9 +24,9 @@
            'event_return', 'extrusion', 'faces', 'frame', 'gcurve', 'gdots',
            'ghbars', 'gobj', 'graph', 'gvbars', 'helix', 'label',
            'local_light', 'menu', 'meta_canvas', 'points', 'pyramid',
-           'quad', 'radio', 'ring', 'set_browser', 'simple_sphere', 'sleep', 'slider', 'sphere',
+           'quad', 'radio', 'ring', 'simple_sphere', 'sleep', 'slider', 'sphere',
            'standardAttributes', 'text', 'textures', 'triangle', 'vertex',
-           'wtext', 'winput']
+           'wtext', 'winput', 'keysdown']
 
 __p = platform.python_version()
 _ispython3 = (__p[0] == '3')
@@ -40,6 +40,8 @@
 version = [__version__, 'jupyter']
 GSversion = [__gs_version__, 'glowscript']
 
+keysdownlist = [] # list of keys currently pressed
+
 # To print immediately, do this:
 #    print(.....)
 #    sys.stdout.flush()
@@ -95,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
@@ -522,7 +524,7 @@ class standardAttributes(baseObj):
                          ['visible'],
                          []],
                  'compound':[['pos', 'color', 'trail_color'],
-                         ['axis', 'size', 'up'],
+                         ['axis', 'size', 'up', 'origin'],
                          ['visible', 'opacity','shininess', 'emissive',
                          'make_trail', 'trail_type', 'interval', 'texture',
                          'retain', 'trail_color', 'trail_radius', 'obj_idxs', 'pickable'],
@@ -698,7 +700,7 @@ def setup(self, args):
 
 
     # set canvas
-        if self.canvas == None:  ## not specified in constructor
+        if self.canvas is None:  ## not specified in constructor
             self.canvas = canvas.get_selected()
         #cmd["attrs"].append({"attr": 'canvas', "value": self.canvas.idx})
         cmd['canvas'] = self.canvas.idx
@@ -711,7 +713,7 @@ def setup(self, args):
         if _special_clone is not None: cmd["_cloneid"] = _special_clone
         self.appendcmd(cmd)
 
-        # if ('frame' in args and args['frame'] != None):
+        # if ('frame' in args and args['frame'] is not None):
             # frame.objects.append(self)
             # frame.update_obj_list()
 
@@ -999,9 +1001,9 @@ def rotate(self, angle=None, axis=None, origin=None):
         saveorigin = origin
         if angle == 0:
             return
-        if angle == None:
+        if angle is None:
             raise TypeError('You must specify an angle through which to rotate')
-        if axis == None:
+        if axis is None:
             rotaxis = self.axis
         else:
             rotaxis = axis
@@ -1528,32 +1530,34 @@ def size(self,value): # compound axis and size don't interact
         if not self._constructing:
             self.addattr('size')
 
-    def _world_zaxis(self):
-        axis = self._axis
-        up = norm(self._up)
-        if abs(axis.dot(up)) / sqrt(axis.mag2) > 0.98:
-            if abs(norm(axis).dot(vector(-1,0,0))) > 0.98:
-                z_axis = axis.cross(vector(0,0,1)).norm()
-            else:
-                z_axis = axis.cross(vector(-1,0,0)).norm()
-        else:
-            z_axis = axis.cross(up).norm()
-        return z_axis
+    @property
+    def origin(self):
+        return self._origin
+    @origin.setter
+    def origin(self,value): # compound origin cannot be reset
+        if not self._constructing:
+            raise AttributeError('The compound "origin" attribute is read-only; change "pos" instead.')
+        self._origin = value
 
     def world_to_compound(self, v):
-        axis = self._axis
-        z_axis = self._world_zaxis()
-        y_axis = z_axis.cross(axis).norm()
-        x_axis = axis.norm()
-        v = v - self._pos
-        return vector(v.dot(x_axis), v.dot(y_axis), v.dot(z_axis))
+            v = v-self._pos
+            x_axis = self._axis.hat
+            y_axis = self._up.hat
+            z_axis = x_axis.cross(y_axis)
+            ox = self._size0.x/self._size.x # _size0 is the original size
+            oy = self._size0.y/self._size.y
+            oz = self._size0.z/self._size.z
+            return self._origin + vector(v.dot(x_axis)*ox, v.dot(y_axis)*oy, v.dot(z_axis)*oz)
 
     def compound_to_world(self, v):
-        axis = self._axis
-        z_axis = self._world_zaxis()
-        y_axis = z_axis.cross(axis).norm()
-        x_axis = axis.norm()
-        return self._pos+(v.x*x_axis) + (v.y*y_axis) + (v.z*z_axis)
+            v = v-self._origin
+            x_axis = self._axis.hat
+            y_axis = self._up.hat
+            z_axis = x_axis.cross(y_axis)
+            ox = self._size.x/self._size0.x # _size0 is the original size
+            oy = self._size.y/self._size0.y
+            oz = self._size.z/self._size0.z
+            return self._pos + v.x*ox*x_axis + v.y*oy*y_axis + v.z*oz*z_axis
 
 class vertex(standardAttributes):
     def __init__(self, **args):
@@ -1961,7 +1965,7 @@ def __init__(self,*args1, **args):
 
         super(curveMethods, self).setup(args)
 
-        if tpos != None:
+        if tpos is not None:
             if len(args1) > 0: raise AttributeError('Malformed constructor')
             self.append(tpos)
         if len(args1) > 0:
@@ -1985,7 +1989,7 @@ def __init__(self,*args1, **args):
 
         super(curveMethods, self).setup(args)
 
-        if tpos != None:
+        if tpos is not None:
             if len(args1) > 0: raise AttributeError('Malformed constructor')
             self.append(tpos)
         if len(args1) > 0:
@@ -2278,6 +2282,7 @@ def __init__(self, **args):
         self._title = ""
         self._xtitle = ""
         self._ytitle = ""
+        self._scroll = False
         argsToSend = []
 
         ## override default vector attributes
@@ -2292,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)
@@ -2305,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)
@@ -2318,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
@@ -2814,7 +2830,7 @@ def __init__(self, **args):
 
         for a in canvasNonVecAttrs:
             if a in args:
-                if args[a] != None:
+                if args[a] is not None:
                     setattr(self, '_'+a, args[a])
                     cmd[a]= args[a]
                 del args[a]
@@ -3099,11 +3115,13 @@ def objz(self, obj, operation):
 
 ## key events conflict with notebook command mode; not permitted for now
     def handle_event(self, evt):  ## events and scene info updates
+        global keysdownlist
         ev = evt['event']
         if ev == 'pick':
             self.mouse.setpick( evt )
             self._waitfor = True # what pick is looking for
         elif ev == '_compound': # compound, text, extrusion
+            print('compound event return')
             obj = self._compound
             p = evt['pos']
             if obj._objName == 'text':
@@ -3115,7 +3133,7 @@ def handle_event(self, evt):  ## events and scene info updates
                 # on_change functions that detect changes in e.g. obj.pos.y
                 obj._pos.value = list_to_vec(p)
                 s = evt['size']
-                obj._size.value = list_to_vec(s)
+                obj._size.value = obj._size0 = list_to_vec(s)
                 obj._axis.value = obj._size._x*norm(obj._axis)
                 obj._up.value = list_to_vec(evt['up'])
             self._waitfor = True # what compound and text and extrusion are looking for in _wait()
@@ -3182,6 +3200,8 @@ def handle_event(self, evt):  ## events and scene info updates
                 if 'autoscale' in evt and self.userzoom and not self._set_autoscale:
                     self._autoscale = evt['autoscale']
                 self._set_autoscale = False
+                if 'keysdown' in evt: keysdownlist = evt['keysdown']
+
 
     def bind(self, eventtype, whattodo):
         evts = eventtype.split()
@@ -3255,7 +3275,7 @@ def __init__(self, **args):
         args['_objName'] = "local_light"
         super(local_light, self).setup(args)
 
-        if (canvas.get_selected() != None):
+        if (canvas.get_selected() is not None):
             canvas.get_selected()._lights.append(self)
 
 class distant_light(standardAttributes):
@@ -3265,7 +3285,7 @@ def __init__(self, **args):
         self._direction = vector(0,0,1)
         super(distant_light, self).setup(args)
 
-        if (canvas.get_selected() != None):
+        if (canvas.get_selected() is not None):
             canvas.get_selected()._lights.append(self)
 
     @property
@@ -4092,11 +4112,9 @@ def print_to_string(*args): # treatment of <br> vs. \n not quite right here
     s = s[:-1]
     return(s)
 
-# global variable for type of web browser to display vpython
-_browsertype = 'default'
-def set_browser(type='default'):
-    global _browsertype
-    if type=='pyqt':
-        _browsertype='pyqt'
-    else:
-        _browsertype='default'
+def keysdown():
+    global keysdownlist
+    keys = []
+    for k in keysdownlist: # return a copy of keysdownlist
+        keys.append(k)
+    return keys