lavavu-osmesa 1.8.81__cp311-cp311-manylinux_2_28_x86_64.whl → 1.8.84__cp311-cp311-manylinux_2_28_x86_64.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_osmesa-1.8.81.dist-info → lavavu_osmesa-1.8.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu-osmesa
-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_osmesa-1.8.81.dist-info → lavavu_osmesa-1.8.84.dist-info}/RECORD

@@ -1,31 +1,31 @@
-lavavu_osmesa-1.8.81.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu_osmesa-1.8.81.dist-info/RECORD,,
-lavavu_osmesa-1.8.81.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu_osmesa-1.8.81.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu_osmesa-1.8.81.dist-info/METADATA,sha256=0AGMy35QtwKh_TQgybtGdDQ1xlwXRbZs2CoWk3jwQ0U,18244
-lavavu_osmesa-1.8.81.dist-info/WHEEL,sha256=fSCMmwXhNzURRJrBh-Ze1hn48brKvWrIglFubPSWmlU,113
+lavavu_osmesa-1.8.84.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu_osmesa-1.8.84.dist-info/RECORD,,
+lavavu_osmesa-1.8.84.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu_osmesa-1.8.84.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu_osmesa-1.8.84.dist-info/METADATA,sha256=fsMw6VpQGwXKb5OGVncG5qP2pCki8tRXjWJIpqfpWiI,18244
+lavavu_osmesa-1.8.84.dist-info/WHEEL,sha256=fSCMmwXhNzURRJrBh-Ze1hn48brKvWrIglFubPSWmlU,113
+lavavu_osmesa.libs/libavcodec-e9f4b4d9.so.61.24.100,sha256=Regr2rtawk7_PlO-Lj1j_LA7aNPPcVjZy-zV32hXrYg,15042481
+lavavu_osmesa.libs/libavutil-54907a11.so.59.46.100,sha256=a2oV34NnMLzX6Wx58JEQxI8682WR9Amzu6Fvw4Yqpi0,1009281
 lavavu_osmesa.libs/libglapi-d9260dde.so.0.0.0,sha256=lk2-KJ-TfqKogN82K9yu6G_StS6MtPDFNP7dN1CZSjo,247921
 lavavu_osmesa.libs/libdrm-b0291a67.so.2.4.0,sha256=K48ZAlNAuvSdX7i2toETxCm6886w4E17JmP2c8RM2-0,96417
-lavavu_osmesa.libs/libavformat-2c4b075e.so.61.9.100,sha256=FscWR6X-KZVOGGZHqilkHwwOUdlxYtPztWaIfmLP5Yc,2702745
-lavavu_osmesa.libs/libswscale-4ff68837.so.8.9.101,sha256=QluomWhZTk8Fa6lREeOBDJ8N5ztrfAk07Du3TF4cWUM,648705
-lavavu_osmesa.libs/libtiff-97fb0e7a.so.5.3.0,sha256=ReUrhN0yHYGg-Fws0_oHS7soNRaqYFAMCqpS5FXXbMU,517801
+lavavu_osmesa.libs/libswscale-4ff68837.so.8.9.101,sha256=XJH4L1oSKLzYkPmBfMJL8daHDTWPNYMGWFxpc61O1IM,648705
 lavavu_osmesa.libs/libx264-6f5370e2.so.164,sha256=eB4ZQMvXUl_lla5tVyk8Xg8MVldtlDovZOpc8g0WhlE,2435841
 lavavu_osmesa.libs/libzstd-76b78bac.so.1.4.4,sha256=F2-A6yQ3AA2N0vHZe-81OfEUOcwgjjWiOnYAxk2Kflc,686073
-lavavu_osmesa.libs/libavutil-1e63d46c.so.59.46.100,sha256=khP7ezU-qUnsHWF-UAqWkyVrR4S6Aq3Gyod4UlvNMV8,1009281
 lavavu_osmesa.libs/libjpeg-da649728.so.62.2.0,sha256=IoO1YzjSjixVQSs5SiWK95E-RREenSFc2B97tb-x_5E,437961
 lavavu_osmesa.libs/libtinfo-3a2cb85b.so.6.1,sha256=6Co83bxdB4J-rBU5l0p_7HpGlU46RG2EDnf-LpF5kBY,194041
 lavavu_osmesa.libs/libpcre2-8-516f4c9d.so.0.7.1,sha256=IcbljW_oKuAVlrAwKz8qtRZxfi1sQH_iKxPSoNpzsmU,547745
-lavavu_osmesa.libs/libOSMesa-25f49adf.so.8.0.0,sha256=_WFDCZkS9KhK_WNSRQUG-CcR4NgKRfGtGaSkw--0EKw,12995657
+lavavu_osmesa.libs/libOSMesa-25f49adf.so.8.0.0,sha256=VvnkEih66KdjLynA69Wfft-HaBzyQefNVlMD1DZzpyg,12995657
+lavavu_osmesa.libs/libswresample-3aad7a38.so.5.4.100,sha256=qlNS5bfKiZBO6wo_UMOSKHg1zF7ifx7PUzhLgbNYSr0,128265
+lavavu_osmesa.libs/libtiff-5faff81f.so.5.3.0,sha256=_nDyPRF3kPCuqI_DmXegna3ky_SOJ0mmz7rROMg8KtQ,517801
 lavavu_osmesa.libs/libbz2-e34b29ae.so.1.0.6,sha256=t0Rx5MGhoqFd8hOzCgew5TwGvZFpy_XTk-dae2FXAEs,79145
-lavavu_osmesa.libs/libLLVM-17-daa109ce.so,sha256=0F8UnMl03hrXBMto2ewBZRdnfzIbg6qvo-qVBIWY7H8,120778961
+lavavu_osmesa.libs/libavformat-dd2ce9c7.so.61.9.100,sha256=zYqQ_5Bvr8NrcLx6SeagIy8-mFXfVooDKA6BSC6ZGhk,2702745
 lavavu_osmesa.libs/libjbig-2504a0c3.so.2.1,sha256=VejIx8sDX3xfCuJkrk9HEyWBYjZbUiTyIRuoPqT-ibE,54265
-lavavu_osmesa.libs/libswresample-0ba304d7.so.5.4.100,sha256=i6FYI2DuKjgjVxmbqNm2mXewyRNM-a6WSzgGJwFKuZc,128265
 lavavu_osmesa.libs/libselinux-64a010fa.so.1,sha256=dNJwuKqYp8fwkmrQ9hom3hVQ-lYUkNxxHb4vmrk8zmE,195097
 lavavu_osmesa.libs/libffi-3a37023a.so.6.0.2,sha256=Q1Rq1XplFBXNFHvg92SNmTgQ0T6E9wmcqZcgOZ7DgLE,42489
-lavavu_osmesa.libs/libavcodec-c07e82e9.so.61.24.100,sha256=xMKCq1bFKmc36ShXE1AXmXVVJbxHjQiZo1O-nmDPwvs,15042481
+lavavu_osmesa.libs/libLLVM-17-51492e70.so,sha256=s_fu2V3vueF5k7yndLsOoMFVm3WjR4z7BrEPBATtmV8,120758265
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
 lavavu/LavaVuPython.py,sha256=ixhceiAr0gGGfCe3d2cY0IIgS4hbgoYJGa_RfgAmmrU,33207
-lavavu/_LavaVuPython.cpython-311-x86_64-linux-gnu.so,sha256=mnu_iXyvFpoKvoGYMt8rD4D8DnE6eiDPXDSbgNllua4,76854345
+lavavu/_LavaVuPython.cpython-311-x86_64-linux-gnu.so,sha256=4VNW45xMaeAiTWgD-ku3aolRV9tareYVCG9KSEU21m4,76854345
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
@@ -33,10 +33,10 @@ lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/points.py,sha256=jRRtA6CrcA46Y2jUJmkxnIiVoMC5a14xEd_ojhmjhz4,5871
 lavavu/tracers.py,sha256=0dB6v9Jg5G-IeZxiVFvbPoTycGvyAQBtgyEAZUmq4XU,4257
 lavavu/dict.json,sha256=lsZEHc7Bb6_lt7tkSBQMgkq7AEn_2hnhWzzdokmvIY8,52729
-lavavu/lavavu.py,sha256=BvswUID0WxpWuxV29qHfRj5AAeHkmm-QvuhfYnxqhZc,207324
+lavavu/lavavu.py,sha256=B_n4pude411uaNukrugiM3JUdKgWvhW3q6UxfFCoFxs,208383
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
-lavavu/control.py,sha256=eNocZPc-2Dz-nSty_KRz_9RzLvbU0clJGuAV3qnzxbU,65841
+lavavu/control.py,sha256=C5fLZeeNazRODDlWyWhKINry86uW7jAu3x_MvmrKeO8,66434
 lavavu/convert.py,sha256=tbYRjLE2l1hI4d6tsW41Lia1JXmrWSc0-JAYCiMrjys,35516
 lavavu/html/OK-min.js,sha256=-4Gc1-dWfxP_w6r9ZOHa8u-X2BlGUoSQbX68lwCxQ3E,39115
 lavavu/html/dat.gui.min.js,sha256=S4_QjoXe4IOpU0f0Sj5jEQLTWPoX9uRl1ohB91jyhuw,56992
@@ -57,7 +57,7 @@ lavavu/html/server.js,sha256=b5eNlWWbiEk90n3WARJ1Mh7lmfHM0pOtZfrrmM-wfyc,7099
 lavavu/html/baseviewer.js,sha256=u3UhC1At6rMBKmcQ7d2DXTRxQ20wsQkc4lqA-7sL7i4,9567
 lavavu/html/stats.min.js,sha256=iiwrLW4SUBhrzWrfW2VZP_9mowHX-Ks1EKORFv4EHdE,1965
 lavavu/html/LavaVu-amalgamated.css,sha256=iE2xrxFcwmY0AcASrXxNa_RpvFEbS_YO4H5OILbPteE,8640
-lavavu/html/webview.html,sha256=XMXO4b4vKNYXBp5Duzur80g86yT-9tTkbEJtMp1emrY,1522
+lavavu/html/webview.html,sha256=FtI5i_Fw4DPfDfJyY6OnphZmyAmqFW1Mc14I6ouG9nM,1522
 lavavu/shaders/default.frag,sha256=xCkYz8QriRlnAr-NtenZSIWI_liSxv9jz3Lp5immK9k,258
 lavavu/shaders/lineShader.frag,sha256=aCmOWC20fHinR32p6LZPdCZP6abn-K1V2slbJ_5NoVA,945
 lavavu/shaders/volumeShader.vert,sha256=uGdQjGqi7V5kE6V7nxymfugtU4cbf6u570xBy13RgmY,78