lavavu 1.8.80__cp38-cp38-macosx_11_0_arm64.whl → 1.8.81__cp38-cp38-macosx_11_0_arm64.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.81/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
@@ -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, width=None, height=None, params=""):
     """
     Shows a video inline within an ipython notebook.
     If IPython is not running, just returns
@@ -5247,49 +5247,37 @@ def player(filename, width=None, height=None, params="", nocache=True):
         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
     """
 
     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:
+        from IPython.display import display,HTML,Video
         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
+
+        def get_fn(filename):
+            import os
+            nbpath = os.getenv('JPY_SESSION_NAME')
+            if nbpath is not None:
+                import os.path
+                relpath = os.path.relpath(os.getcwd(), start=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)
+        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>
+        #"""))
+
         #Add download link
-        display(HTML('<a href="{fn}">Download Video</a>'.format(fn=filename)))
+        display(HTML('<a href="{fn}" download>Download Video</a>'.format(fn=filename)))
 
 #Class for managing video animation recording
 class Video(object):
@@ -5360,6 +5348,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-1.8.80.dist-info → lavavu-1.8.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.80
+Version: 1.8.81
 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.81)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

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

@@ -1,15 +1,9 @@
-lavavu-1.8.80.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu-1.8.80.dist-info/RECORD,,
-lavavu-1.8.80.dist-info/WHEEL,sha256=_9othfhg7kan2-Qy6AzVyjJqVfmHglUjs_8PIfaNfwA,107
-lavavu-1.8.80.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.80.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.80.dist-info/METADATA,sha256=BPSb003FOQmpqNLJ1o0bIdHrZfRAAA1FKNvZSWMO0ys,18237
-lavavu/lavavu.py,sha256=MJyUnl8MzVPDLRe5LoX_TRWRKFJC_OU7Du3k0REZvU4,207579
+lavavu/lavavu.py,sha256=BvswUID0WxpWuxV29qHfRj5AAeHkmm-QvuhfYnxqhZc,207324
 lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
 lavavu/dict.json,sha256=lsZEHc7Bb6_lt7tkSBQMgkq7AEn_2hnhWzzdokmvIY8,52729
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
 lavavu/points.py,sha256=jRRtA6CrcA46Y2jUJmkxnIiVoMC5a14xEd_ojhmjhz4,5871
-lavavu/LavaVuPython.py,sha256=ZdBJROEPysd_N_Od88PEO8Y1fjCOd05_vP6YBnJymN0,33131
+lavavu/LavaVuPython.py,sha256=ixhceiAr0gGGfCe3d2cY0IIgS4hbgoYJGa_RfgAmmrU,33207
 lavavu/tracers.py,sha256=0dB6v9Jg5G-IeZxiVFvbPoTycGvyAQBtgyEAZUmq4XU,4257
 lavavu/convert.py,sha256=tbYRjLE2l1hI4d6tsW41Lia1JXmrWSc0-JAYCiMrjys,35516
 lavavu/control.py,sha256=eNocZPc-2Dz-nSty_KRz_9RzLvbU0clJGuAV3qnzxbU,65841
@@ -17,7 +11,7 @@ lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
-lavavu/_LavaVuPython.cpython-38-darwin.so,sha256=GveV8GQV4ABt34cDIWYqXs-kat90YJXthbVINTE1PUI,3842096
+lavavu/_LavaVuPython.cpython-38-darwin.so,sha256=7mBV__pMFGbWdEtN7_hHYdKqvJ_5-s3KfwnQcSCX2lY,3842400
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
 lavavu/html/control.css,sha256=PVLwmle00ciEckUV5ZIRmI3Whxhl7-mlVexnyyxoU70,3259
 lavavu/html/control.js,sha256=oV24eJZ0vfuCxF3fO60eeJSkNFJ9hUkSCThHGJS1Wvc,11652
@@ -33,7 +27,7 @@ lavavu/html/dat.gui.min.js,sha256=S4_QjoXe4IOpU0f0Sj5jEQLTWPoX9uRl1ohB91jyhuw,56
 lavavu/html/OK-min.js,sha256=-4Gc1-dWfxP_w6r9ZOHa8u-X2BlGUoSQbX68lwCxQ3E,39115
 lavavu/html/emscripten.css,sha256=wkaIJhXaxuMchinQX9Z8c12cJomyvFQMeIZ62WGQEPQ,1813
 lavavu/html/drawbox.js,sha256=SJxFSmWd7QVFI5__66hFkKzLKeqg1JPcx-gJuqdMkXw,34590
-lavavu/html/webview.html,sha256=zif0TjI2RtOeuLl5yaQCPy5SeWJGkgJOa_amsMVq3Z0,1522
+lavavu/html/webview.html,sha256=XMXO4b4vKNYXBp5Duzur80g86yT-9tTkbEJtMp1emrY,1522
 lavavu/html/emscripten-template.js,sha256=h63mzl3Lv7aQT1wMOiOucPOvHTJjpKkzsL-SFVYaZlA,6135
 lavavu/html/draw.js,sha256=57LlHlYRh0IvWVwzGDnF6PaCxYLzokpokLNCuZlG1ds,84108
 lavavu/html/dat-gui-light-theme.css,sha256=uPhvJs-1IAsdxudItyOw8lZy8Hrih0zmFM1u-xRwZ-M,1142
@@ -51,3 +45,9 @@ lavavu/shaders/fontShader.vert,sha256=yCBmRugaPUeUQUdIh62-AK_5KELiJqVS2M82iyIqPw
 lavavu/shaders/pointShader.frag,sha256=T1PA9Z6FiE66rS2sAmmFIbYM2VqEkLBycxV-sx3nACY,3384
 lavavu/shaders/volumeShader.vert,sha256=uGdQjGqi7V5kE6V7nxymfugtU4cbf6u570xBy13RgmY,78
 lavavu/shaders/default.frag,sha256=xCkYz8QriRlnAr-NtenZSIWI_liSxv9jz3Lp5immK9k,258
+lavavu-1.8.81.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.8.81.dist-info/RECORD,,
+lavavu-1.8.81.dist-info/WHEEL,sha256=7_oe0rMIEoZOpgBhth1WRv0SCKz8pdiUZgyT0NjKRv8,107
+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/METADATA,sha256=MixzuyZ7zRaBaAFueSgveLWgm7YrCR8fa5y6v_1MJQE,18237

{lavavu-1.8.80.dist-info → lavavu-1.8.81.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-macosx_11_0_arm64