lavavu 1.8.81__cp311-cp311-win_amd64.whl → 1.8.84__cp311-cp311-win_amd64.whl

lavavu/control.py

@@ -481,8 +481,20 @@ class Window(_Container):
         self.align = align
         self.wrapper = wrapper
         self.fullscreen = fullscreen
-        if resolution is not None:
-            viewer.output_resolution = resolution
+        if resolution is None:
+            #Default to largest of 640x480 or output res / 2
+            resolution = [0,0]
+            resolution[0] = max(viewer.output_resolution[0]//2, 640)
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+        elif isinstance(resolution, int):
+            #Passed interger - interpert as width
+            resolution = [resolution,0]
+
+        if resolution[1] == 0:
+            #Width only, set height based on output aspect ratio
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+
+        viewer.output_resolution = resolution
 
     def html(self):
         #print(self.viewer["resolution"], self.viewer.output_resolution)

lavavu/html/webview.html

@@ -27,7 +27,7 @@
 
     <input id="fileinput" type="file" style="visibility:hidden" onchange="useFileInput(this)" />
 
-    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.81/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.84/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

lavavu/lavavu.py

@@ -4194,7 +4194,7 @@ class Viewer(dict):
 
         try:
             fn = self.app.video(filename, fps, resolution[0], resolution[1], start, end, quality, **kwargs)
-            player(fn)
+            player(fn, **kwargs)
         except (Exception) as e:
             print("Video output error: " + str(e))
             pass
@@ -4357,8 +4357,10 @@ class Viewer(dict):
 
         Parameters
         ----------
-        resolution : tuple(int,int)
-            Frame size in pixels: width, height. Defaults to the viewer default output resolution, usually (640,480)
+        resolution : int, tuple(int,int)
+            Frame size in pixels: width, height.
+            Defaults to half the viewer default output resolution with a minimum width of 640 pixels
+            If a single integer is passed, will use as the width while maintaining output aspect ratio
         menu : boolean
             Adds a menu to the top right allowing control of vis parameters, defaults to on
         """
@@ -4402,7 +4404,7 @@ class Viewer(dict):
         vdat = {}
         if len(self.state["views"]) and self.state["views"][0]:
             def copyview(dst, src):
-                for key in ["translate", "rotate", "xyzrotate", "fov"]:
+                for key in ["translate", "rotate", "xyzrotate", "fov", "focus"]:
                     if key in src:
                         dst[key] = copy.copy(src[key])
                         #Round down arrays to max 3 decimal places
@@ -4426,7 +4428,6 @@ class Viewer(dict):
         #Return
         return vdat
 
-
     def getview(self):
         """
         Get current view settings
@@ -5232,7 +5233,7 @@ class DrawData(object):
         renderlist = [geomnames[value] for value in geomtypes if value == self.data.type]
         return ' '.join(['DrawData("' + r + '")' for r in renderlist]) + ' ==> ' + str(self.available)
 
-def player(filename, width=None, height=None, params=""):
+def player(filename, params="controls autoplay loop", **kwargs):
     """
     Shows a video inline within an ipython notebook.
     If IPython is not running, just returns
@@ -5241,43 +5242,62 @@ def player(filename, width=None, height=None, params=""):
     ----------
     filename : str
         Path and name of the file to play
-    width : int
-        Fixed width of player window, otherwise will use video resolution
-    height : int
-        Fixed height of player window, otherwise will use video resolution
     params : str
-        Any other parameters to add to the <video> tag, eg: "autoplay"
+        Additional html attributes for the video control, see:
+        https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
+    **kwargs : 
+        width=W,height=H will set fixed size of player window
+        See further player arguments at
+        https://ipython.readthedocs.io/en/latest/api/generated/IPython.display.html#IPython.display.Video
     """
 
     if is_notebook():
-        from IPython.display import display,HTML,Video
-        extra_params = params
-        if width and height:
-            extra_params += ' width=' + str(width) + ' height=' + str(height) 
+        from IPython.display import display,HTML,Video,Javascript
+        import uuid
+        vid = 'video_' + str(uuid.uuid4())[:8]
 
+        '''
         def get_fn(filename):
             import os
+            #This is unreliable, path incorrect on NCI
             nbpath = os.getenv('JPY_SESSION_NAME')
             if nbpath is not None:
                 import os.path
-                relpath = os.path.relpath(os.getcwd(), start=nbpath)
+                relpath = os.path.relpath(os.getcwd(), start=os.path.dirname(nbpath))
                 return relpath + '/' + filename
             return filename
+        ''';
 
         import uuid
         uid = uuid.uuid1()
-        filename_rel = get_fn(filename)
         
-        display(Video(filename, width=width, height=height))
-        #display(HTML(f"""
-        #<video controls loop {extra_params}>
-        #  <source src="{filename_rel}">
-        #Sorry, your browser doesn't support embedded videos 
-        #</video><br>
-        #"""))
+        #Embed player
+        display(Video(url=os.path.relpath(filename), html_attributes=f"id='{vid}' " + params, **kwargs))
 
         #Add download link
-        display(HTML('<a href="{fn}" download>Download Video</a>'.format(fn=filename)))
+        display(HTML(f'<a id="link_{vid}" href="{filename}" download>Download Video</a>'))
+
+        # Fallback - replace url on gadi and similar jupyterhub installs with 
+        # fixed working directory that doesn't match notebook dir
+        # check the video tag url and remove subpath on 404 error
+        display(Javascript(f"""
+        let el = document.getElementById('{vid}');
+        let url = el.src;
+        fetch(url, {{method: 'HEAD'}}).then(response=>{{
+          if(response.status == 404) {{
+            console.log("Bad video url: " + url);
+            let toppath = "/files/home/"
+            let baseurl = url.substring(0, url.indexOf(toppath)+toppath.length);
+            let endurl = url.substring(url.indexOf("{filename}"));
+            let fixed = baseurl + endurl;
+            console.log("Replaced video url: " + fixed);
+            el.src = fixed;
+            //Also fix download link
+            document.getElementById('link_{vid}').href = fixed;
+          }}
+        }});
+        """))
+        
 
 #Class for managing video animation recording
 class Video(object):

{lavavu-1.8.81.dist-info → lavavu-1.8.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.81
+Version: 1.8.84
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -221,7 +221,7 @@ Requires-Dist: jupyter-server-proxy
 [![Build Status](https://github.com/lavavu/LavaVu/workflows/Test/badge.svg)](https://github.com/lavavu/LavaVu/actions?query=workflow:Test)
 [![Deploy Status](https://github.com/lavavu/LavaVu/workflows/Deploy/badge.svg?branch=1.7.3)](https://github.com/lavavu/LavaVu/actions?query=workflow:Deploy)
 [![DOI](https://zenodo.org/badge/45163055.svg)](https://zenodo.org/badge/latestdoi/45163055)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.81)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.84)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.8.81.dist-info → lavavu-1.8.84.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lavavu/LavaVuPython.py,sha256=uTyBhkTp-Gcg468mS7EXZWxUU4TVtQ0R6D169CnMUZ0,33768
-lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=C7cRvVO0_tHkppdpXU2kOPGI4SbVxYwLhQzwzJ0Wm50,3117056
+lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=i5HC28hEeSCps5R6McB9Rx_8lIMQO2e6jukYxZ4aUqk,3117056
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
 lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
@@ -9,12 +9,12 @@ lavavu/avdevice-58.dll,sha256=VgLrv5NWSD4u-hlKHkTE5ciLMUNTxlZljLavR9AlTkQ,276019
 lavavu/avfilter-7.dll,sha256=cKwN6yDGzmf6XB5HXM1QVV4fc_HfhjAd3dBvV5YVdbk,10957312
 lavavu/avformat-58.dll,sha256=PB5bD4mq62vBBY8tdagrGaYD2AQjaz3Lgc6wpp0UIr0,11094016
 lavavu/avutil-56.dll,sha256=VsAhkveudbox9BBMuLEjnJ6yzoyJDoy2SzgPnMgMug0,866304
-lavavu/control.py,sha256=QyNNJCeM6MeQhy4lhhb3JGnIUctCKo9JshleVTRUsTI,67547
+lavavu/control.py,sha256=AyCg1zJQcKbd_FwtfAn_KiJctEVQ-YRwPPFn6jlopAI,68152
 lavavu/convert.py,sha256=3F79LHdsi74pvewvDuvnlYR_Zsh5mCc1QI7XZnQSMN8,36404
 lavavu/dict.json,sha256=1q3o7wF_siDIwmA2Sw1nh8Y1knlfmWJ64EHki21iWRU,55246
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/glfw3.dll,sha256=zI-Qy4RDHQo4mYYgW4QLREz-WZ5l5HCXJzyksyTy0bY,83456
-lavavu/lavavu.py,sha256=QpGCMRv_vGp4nhuAGcNlp-hSAEhIlVOWHefHQnkmxpA,213163
+lavavu/lavavu.py,sha256=GBV1gn62IBa1Kd9eRDFwYkh0fiuvU9fRogNxICerEe8,214242
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -46,7 +46,7 @@ lavavu/html/server.js,sha256=WXuAnY6aE4h8vYs4U2sl4Xq5RjrkuDi-mIgM-x3Nkj0,7325
 lavavu/html/stats.min.js,sha256=q9kZjkwmWu8F8HV-4m2EfZRJXQBzyibceJoz-tDgB94,1970
 lavavu/html/styles.css,sha256=8JE8l7zcc0PV8CfOQpfDyhM226-Sq9eDLXvTCe-wSgw,3041
 lavavu/html/webview-template.html,sha256=E5w7pd91z0WL3244PQxDKMNZorWzoRT5G7wuBHXJc6Y,1573
-lavavu/html/webview.html,sha256=yuf0wYlgUPjPPFIGJ-lSWmcWZXT-L8q79dmzsh3Dugs,1565
+lavavu/html/webview.html,sha256=9F-wQhoSXW_u1kP0eN_VeDy_tYpJDZrZ5hYJ20LRmtY,1565
 lavavu/shaders/default.frag,sha256=AlGMo01JdaOsXx6Gq7s1WADi2b-vyX9XMSB91AcJvuA,278
 lavavu/shaders/default.vert,sha256=SKC2BkE2axNjJL2j5QYjU2bj6mMXs8Wq02XgMTiOeFo,334
 lavavu/shaders/fontShader.frag,sha256=0GGFFg6S4v0p_1gDTIATDmc19jrCl7xIgH9PpxcXEcE,469
@@ -59,9 +59,9 @@ lavavu/shaders/triShader.frag,sha256=eVGp_ttGMVgKnDYRwByvx_PN80EYiSz61jeuAD8JJvw
 lavavu/shaders/triShader.vert,sha256=tzgJjqbhKDgVngUJvMVL1ehYvwxAMFLQ-WtKEYU3in0,1175
 lavavu/shaders/volumeShader.frag,sha256=PLTei6fN_uLxPD35LHbBQVe_S7TanxdBqcW5khslQMI,16583
 lavavu/shaders/volumeShader.vert,sha256=CroiEfEIe7pP66w14KwmKxfbTuKN6EuXYbZJvt_bfHk,83
-lavavu-1.8.81.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.81.dist-info/METADATA,sha256=N1pOU4ckJdaHiRwR4fil9Hh7-B7j7hx0vTNFnoivjGw,18555
-lavavu-1.8.81.dist-info/WHEEL,sha256=WutsMqxRjo8PALJe8NWxuOYrO2lUIIHDIxhZ8tjc8BY,101
-lavavu-1.8.81.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.81.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.81.dist-info/RECORD,,
+lavavu-1.8.84.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.8.84.dist-info/METADATA,sha256=AJGc4e_tLRCUz0jmFTyFKolg_MZ5cRdN3AuepnWh0_Y,18555
+lavavu-1.8.84.dist-info/WHEEL,sha256=WutsMqxRjo8PALJe8NWxuOYrO2lUIIHDIxhZ8tjc8BY,101
+lavavu-1.8.84.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.8.84.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.8.84.dist-info/RECORD,,