lavavu-osmesa 1.8.80__cp38-cp38-manylinux_2_28_x86_64.whl → 1.8.83__cp38-cp38-manylinux_2_28_x86_64.whl

lavavu/LavaVuPython.py

@@ -481,6 +481,7 @@ class LavaVu(object):
     web = _swig_new_instance_method(_LavaVuPython.LavaVu_web)
     video = _swig_new_instance_method(_LavaVuPython.LavaVu_video)
     encodeVideo = _swig_new_instance_method(_LavaVuPython.LavaVu_encodeVideo)
+    pauseVideo = _swig_new_instance_method(_LavaVuPython.LavaVu_pauseVideo)
     defaultModel = _swig_new_instance_method(_LavaVuPython.LavaVu_defaultModel)
     addColourMap = _swig_new_instance_method(_LavaVuPython.LavaVu_addColourMap)
     updateColourMap = _swig_new_instance_method(_LavaVuPython.LavaVu_updateColourMap)

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.80/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.83/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

lavavu/lavavu.py

@@ -172,7 +172,7 @@ def is_documented_by(original):
         return target
     return wrapper
 
-def _brightness_contrast_saturation(target, brightness=0.5, contrast=0.5, saturation=0.5):
+def _brightness_contrast_saturation(target, brightness=None, contrast=None, saturation=None, normalise=True):
     """
     Set brightness, contrast and saturation in the range [0,1]
     Zero is minimum level
@@ -192,10 +192,10 @@ def _brightness_contrast_saturation(target, brightness=0.5, contrast=0.5, satura
         0 is greyscale, 0.5 is normal and 1.0 is maximum over-saturation
     """
     #Brightness in shader is [-1,1] where 0 is default
-    target["brightness"] = brightness * 2.0 - 1.0
+    target["brightness"] = None if brightness is None else brightness * 2.0 - 1.0
     #Contrast and saturation range from [0,2] where 1 is default
-    target["contrast"] = contrast * 2.0
-    target["saturation"] = saturation * 2.0
+    target["contrast"] = None if contrast is None else contrast * 2.0
+    target["saturation"] = None if saturation is None else saturation * 2.0
 
 def grid2d(corners=((0.,1.), (1.,0.)), dims=[2,2]):
     """
@@ -1629,7 +1629,7 @@ class Object(dict):
         self.parent.export_mesh(filepath, [self], rgba)
 
     @is_documented_by(_brightness_contrast_saturation)
-    def brightness_contrast_saturation(self, brightness=0, contrast=0, saturation=0):
+    def brightness_contrast_saturation(self, brightness=None, contrast=None, saturation=None):
         return _brightness_contrast_saturation(self)
 
 #Wrapper dict+list of objects
@@ -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
@@ -4402,7 +4402,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
@@ -4742,7 +4742,7 @@ class Viewer(dict):
         convert.export_any(filepath, objects)
 
     @is_documented_by(_brightness_contrast_saturation)
-    def brightness_contrast_saturation(self, brightness=0, contrast=0, saturation=0):
+    def brightness_contrast_saturation(self, brightness=None, contrast=None, saturation=None):
         return _brightness_contrast_saturation(self, brightness, contrast, saturation)
 
     def set_properties(self, objects=None, **kwargs):
@@ -5232,7 +5232,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="", nocache=True):
+def player(filename, params="controls autoplay loop", **kwargs):
     """
     Shows a video inline within an ipython notebook.
     If IPython is not running, just returns
@@ -5241,55 +5241,62 @@ def player(filename, width=None, height=None, params="", nocache=True):
     ----------
     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"
-    nocache : bool
-        Add a timestamp to the filename url to prevent caching
+        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
-        #try:
-        #    #Newer IPython versions have a Video display function
-        #    from IPython.display import Video
-        #    display(Video(filename))
-        #except (ImportError) as e:
-        extra_params = params
-        if width and height:
-            extra_params += ' width=' + str(width) + ' height=' + str(height) 
-        html = """
-        <video controls loop {params}>
-          <source src="{fn1}">
-          <source src="{fn2}">
-          <source src="http://localhost:{port}/{fn1}">
-        Sorry, your browser doesn't support embedded videos, 
-        </video><br>
-        """
-        #Jupyterlab adds it's own timestamp but notebook doesn't
-        #don't know a way to detect jupyterlab, so provide source url with and without
-        #Browser should load the first working url
-
-        #Get path relative to cwd
-        #(this works in notebook/lab but not voila)
-        #import pathlib
-        #path = pathlib.Path(filename)
-        #filename = str(path.relative_to(os.getcwd()))
-
-        global server_ports
+        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=os.path.dirname(nbpath))
+                return relpath + '/' + filename
+            return filename
+        ''';
+
         import uuid
         uid = uuid.uuid1()
-        #Append a UUID based on host ID and current time
-        filename_ts = filename
-        if nocache:
-            filename_ts += "?" + str(uid)
-        html = HTML(html.format(params=extra_params, fn1=filename_ts, fn2=filename, port=server_ports[-1] if len(server_ports) else 8080))
-        display(html)
+        
+        #Embed player
+        display(Video(url=filename, html_attributes=f"id='{vid}' " + params, **kwargs))
+
         #Add download link
-        display(HTML('<a href="{fn}">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):
@@ -5360,6 +5367,15 @@ class Video(object):
             for f in glob.glob(self.filename + "/frame_*.jpg"):
                 os.remove(f)
 
+    def pause(self):
+        """
+        Pause/resume recording, no rendered frames will be added to the video while paused
+        """
+        if self.encoder:
+            self.encoder.render = not self.encoder.render
+        else:
+            self.viewer.app.pauseVideo()
+
     def stop(self):
         """
         Stop recording, final frames will be written and file closed, ready to play. 

{lavavu_osmesa-1.8.80.dist-info → lavavu_osmesa-1.8.83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu-osmesa
-Version: 1.8.80
+Version: 1.8.83
 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.80)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.83)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu_osmesa-1.8.80.dist-info → lavavu_osmesa-1.8.83.dist-info}/RECORD

@@ -1,33 +1,39 @@
 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/libx264-3daadd71.so.164,sha256=1AiHi-PoYrS70fP_NvC9HYuEKWhqPr5wVP81HJCB32E,2431745
-lavavu_osmesa.libs/libswresample-5281a095.so.5.4.100,sha256=FCwCF-UT7a0MXZ6tj0K5edvk661ZJckVdu93l7mZfnY,128265
+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/libavformat-110b7b98.so.61.9.100,sha256=yswy-iJ55yHUy0hnrIzJP4NO5ggKdB8hmWPTwIOKpYE,2690465
 lavavu_osmesa.libs/libOSMesa-25f49adf.so.8.0.0,sha256=_WFDCZkS9KhK_WNSRQUG-CcR4NgKRfGtGaSkw--0EKw,12995657
-lavavu_osmesa.libs/libavcodec-22608acb.so.61.22.100,sha256=U1ZRhRsDOEHEyqW5ai80bsCIaJGf5GSlzNy0NgvltaQ,14755761
 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/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/libswscale-a39dc465.so.8.6.100,sha256=V6Ag0Fpy80Nke0Q2VniQ4mi6ppAORgXEAEiraF8W-1I,636305
-lavavu_osmesa.libs/libavutil-6f297d47.so.59.44.100,sha256=djxnbtoji8xDmjOPbxG2ByGfkEm8g7nqgWdoKe4BzyY,1009281
+lavavu_osmesa.libs/libavcodec-c07e82e9.so.61.24.100,sha256=xMKCq1bFKmc36ShXE1AXmXVVJbxHjQiZo1O-nmDPwvs,15042481
+lavavu_osmesa-1.8.83.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu_osmesa-1.8.83.dist-info/RECORD,,
+lavavu_osmesa-1.8.83.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu_osmesa-1.8.83.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu_osmesa-1.8.83.dist-info/METADATA,sha256=XMUGgi2BeXUbsU5Ju-agHXvzXiFSxVT_SIUqJ__UN3M,18244
+lavavu_osmesa-1.8.83.dist-info/WHEEL,sha256=PcfaDtCalyUfabMw1WySgzQ9vYH6julonqZBc8w3Cwo,111
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
-lavavu/LavaVuPython.py,sha256=ZdBJROEPysd_N_Od88PEO8Y1fjCOd05_vP6YBnJymN0,33131
+lavavu/LavaVuPython.py,sha256=ixhceiAr0gGGfCe3d2cY0IIgS4hbgoYJGa_RfgAmmrU,33207
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
-lavavu/_LavaVuPython.cpython-38-x86_64-linux-gnu.so,sha256=N2fz_JPtx2-mH_1Mub1eis9vBzh781y69GQ7k8TAFJ4,76612649
+lavavu/_LavaVuPython.cpython-38-x86_64-linux-gnu.so,sha256=XcsYbPtbgITYEZfvc-jpy57C0095fWKPOe7T0aG1e4s,76616753
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
 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=MJyUnl8MzVPDLRe5LoX_TRWRKFJC_OU7Du3k0REZvU4,207579
+lavavu/lavavu.py,sha256=wBjlfDY-MTolGCigPS1bG3Z0ZEJMQjI5A8I2PtkRQS8,208226
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/control.py,sha256=eNocZPc-2Dz-nSty_KRz_9RzLvbU0clJGuAV3qnzxbU,65841
@@ -51,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=zif0TjI2RtOeuLl5yaQCPy5SeWJGkgJOa_amsMVq3Z0,1522
+lavavu/html/webview.html,sha256=_kNxQCpgMOijm1yV66Wua3_Tu6txvaUVyCllKIaITds,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
@@ -64,9 +70,3 @@ lavavu/shaders/fontShader.frag,sha256=DXAzO7kS36TBzYMJW0XqFiQQTTc4jFedGiUkLjelYK
 lavavu/shaders/triShader.vert,sha256=pJXftq7IiqiGe7NTMmuBUMDs4OZc9TD8lNJ4q-8B57Q,1120
 lavavu/shaders/lineShader.vert,sha256=6kJQcfu3eqaj910_KdaklVRvYxNbeu0ZbpDEOxRVde0,522
 lavavu/shaders/pointShader.frag,sha256=T1PA9Z6FiE66rS2sAmmFIbYM2VqEkLBycxV-sx3nACY,3384
-lavavu_osmesa-1.8.80.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu_osmesa-1.8.80.dist-info/RECORD,,
-lavavu_osmesa-1.8.80.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu_osmesa-1.8.80.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu_osmesa-1.8.80.dist-info/METADATA,sha256=-xcSiM2QkPrfXALEOg2Rp9ENBDVQNdJbuCSBpLAgBq8,18244
-lavavu_osmesa-1.8.80.dist-info/WHEEL,sha256=W9e4r3msM3u_ijCi8BxnZ2Trbl_QN7pXHA-OUUN8eE0,111

{lavavu_osmesa-1.8.80.dist-info → lavavu_osmesa-1.8.83.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-manylinux_2_28_x86_64