lavavu 1.9.5__cp39-cp39-win_amd64.whl → 1.9.6__cp39-cp39-win_amd64.whl

lavavu/html/menu.js

@@ -123,7 +123,12 @@ function menu_addctrls(menu, obj, viewer, onchange) {
     //Check if it has been set on the target object
     if (prop in obj) {
       //console.log(prop + " ==> " + JSON.stringify(viewer.dict[prop]));
-      menu_addctrl(menu, obj, viewer, prop, onchange);
+      try {
+        //Catch errors and continue gracefully
+        menu_addctrl(menu, obj, viewer, prop, onchange);
+      } catch(e) {
+        console.log("Error adding control to menu: " + e);
+      }
 
     } else {
       //Save list of properties without controls
@@ -159,9 +164,9 @@ function menu_addctrls(menu, obj, viewer, onchange) {
 
 function menu_addcmaps(menu, obj, viewer, onchange) {
   //Colourmap editing menu
-  if (viewer.cgui.prmenu) viewer.cgui.removeFolder(viewer.cgui.prmenu);
-  if (viewer.cgui.cmenu) viewer.cgui.removeFolder(viewer.cgui.cmenu);
-  if (viewer.cgui.pomenu) viewer.cgui.removeFolder(viewer.cgui.pomenu);
+  if (viewer.cgui.prmenu) viewer.cgui.remove(viewer.cgui.prmenu);
+  if (viewer.cgui.cmenu) viewer.cgui.remove(viewer.cgui.cmenu);
+  if (viewer.cgui.pomenu) viewer.cgui.remove(viewer.cgui.pomenu);
   viewer.cgui.prmenu = viewer.cgui.addFolder("Properties");
   viewer.cgui.cmenu = viewer.cgui.addFolder("Colours");
   viewer.cgui.pomenu = viewer.cgui.addFolder("Positions");

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

lavavu/lavavu.py

@@ -4187,7 +4187,7 @@ class Viewer(dict):
         from IPython.display import display,HTML,Javascript
         display(Javascript(js + code))
 
-    def video(self, filename="", resolution=(0,0), fps=30, quality=0, encoder="h264", player=None, options={}, **kwargs):
+    def video(self, filename="", resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -4214,6 +4214,9 @@ class Viewer(dict):
             If omitted will use default settings, can fine tune settings in kwargs
         encoder : str
             Name of encoder to use, eg: "h264" (default), "mpeg"
+        embed : bool
+            Set to true to embed the video file rather than link to url
+            Not recommended for large videos, default is False
         player : dict
             Args to pass to the player when the video is finished, eg:
             {"width" : 800, "height", 400, "params": "controls autoplay"}
@@ -4228,12 +4231,11 @@ class Viewer(dict):
         recorder : Video(object)
             Context manager object that controls the video recording
         """
-        return Video(self, filename, resolution, fps, quality, encoder, player, options, **kwargs)
+        return Video(self, filename, resolution, fps, quality, encoder, embed, player, options, **kwargs)
 
-    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder="h264", player=None, options={}, **kwargs):
+    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
+        my_func.__doc__
         """
-        TODO: Fix to use pyAV
-
         Record a video of the model by looping through all time steps
 
         Shows the generated video inline within an ipython notebook.
@@ -4245,21 +4247,12 @@ class Viewer(dict):
 
         Parameters
         ----------
-        filename : str
-            Name of the file to save, if not provided a default will be used
         start : int
             First timestep to record, if not specified will use first available
         end : int
             Last timestep to record, if not specified will use last available
-        resolution : list or tuple
-            Video resolution in pixels [x,y]
-        fps : int
-            Frames to output per second of video
-        quality : int
-            Encoding quality, 1=low, 2=medium(default), 3=high, higher quality reduces
-            encoding artifacts at cost of larger file size
-        **kwargs :
-            Any additional keyword args will also be passed as options to the encoder
+
+        All other parameters same as video()
         """
 
         try:
@@ -4267,7 +4260,7 @@ class Viewer(dict):
             if end == 0: end = len(steps)
             steps = steps[start:end]
             from tqdm.notebook import tqdm
-            with Video(self, filename, resolution, fps, quality, encoder, player, options, **kwargs):
+            with Video(self, filename, resolution, fps, quality, encoder, embed, player, options, **kwargs):
                 for s in tqdm(steps, desc='Rendering loop'):
                     self.timestep(s)
                     self.render()
@@ -5415,37 +5408,44 @@ def player(filename, params="controls autoplay loop", **kwargs):
 
     if is_notebook():
         from IPython.display import display,HTML,Video,Javascript
-        import uuid
-        vid = 'video_' + str(uuid.uuid4())[:8]
 
         # 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"""
-        function video_error(el) {{
-            let url = el.src;
-            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;
-            if (url != fixed) {{
-              console.log("Replaced video url: " + fixed);
-              el.src = fixed;
+        onerror = """{
+          let url = this.src;
+          console.log('Error in video url: ' + url);
+          var urlp = new window.URL(url);
+          let toppath = '/files/home/';
+          let startidx = urlp.pathname.indexOf(toppath);
+          if (startidx < 0) {
+            toppath = '/files/';
+            startidx = urlp.pathname.indexOf(toppath);
+          }
+          if (startidx >= 0) {
+            let filename = urlp.pathname.split('/').pop();
+            let base = urlp.pathname.substring(0, startidx+toppath.length);
+            urlp.pathname = base + filename;
+            if (url != urlp.href) {
+              console.log('Replaced video url: ' + urlp.href);
+              this.src = urlp.href;
               //Also fix download link
-              document.getElementById('link_{vid}').href = fixed;
-            }} else {{
-              console.log("Not replacing video url, no change: " + fixed);
-            }}
-        }}
-        """))
-
-        #Embed player
-        filename = os.path.relpath(filename)
-        display(Video(url=filename, html_attributes=f'id="{vid}" onerror="video_error(this)"' + params, **kwargs))
+              let link = document.getElementById('link_' + this.id);
+              if (link) link.href = urlp.href;
+            }
+          }
+        }"""
+
+        if "embed" in kwargs:
+            #Not needed if embedding
+            onerror = ""
 
-        #Add download link
-        display(HTML(f'<a id="link_{vid}" href="{filename}" download>Download Video</a>'))
+        #Display player and download link
+        import uuid
+        vid = 'video_' + str(uuid.uuid4())[:8]
+        filename = os.path.relpath(filename)
+        display(Video(filename=filename, html_attributes=f'id="{vid}" onerror="{onerror}" ' + params, **kwargs),
+                HTML(f'<a id="link_{vid}" href="{filename}" download>Download Video</a>'))
 
 #Class for managing video animation recording
 class Video(object):
@@ -5465,7 +5465,7 @@ class Video(object):
     ...         lv.rotate('y', 10) # doctest: +SKIP
     ...         lv.render()        # doctest: +SKIP
     """
-    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder="h264", player=None, options={}, **kwargs):
+    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -5492,6 +5492,9 @@ class Video(object):
             Video resolution in pixels [x,y]
         encoder : str
             Name of encoder to use, eg: "h264" (default), "mpeg"
+        embed : bool
+            Set to true to embed the video file rather than link to url
+            Not recommended for large videos, default is False
         player : dict
             Args to pass to the player when the video is finished, eg:
             {"width" : 800, "height", 400, "params": "controls autoplay"}
@@ -5526,6 +5529,8 @@ class Video(object):
                 self.player = {"width": self.resolution[0]//2, "height": self.resolution[1]//2}
             else:
                 self.player = {}
+        if embed:
+            self.player["embed"] = True
         self.encoder = encoder
         self.options = options
         #Also include extra args

{lavavu-1.9.5.dist-info → lavavu-1.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.5
+Version: 1.9.6
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -224,7 +224,7 @@ Dynamic: license-file
 [![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.9.5)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.6)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.9.5.dist-info → lavavu-1.9.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lavavu/LavaVuPython.py,sha256=uTyBhkTp-Gcg468mS7EXZWxUU4TVtQ0R6D169CnMUZ0,33768
-lavavu/_LavaVuPython.cp39-win_amd64.pyd,sha256=QYTIaI5mu4EOhgM5ifIUFhEirvc2r_F4-vKrS7pM1HY,3132416
+lavavu/_LavaVuPython.cp39-win_amd64.pyd,sha256=60pnScil_VDFPugb-kQOGrwa7yq36wYYO0XbYkA8Ydc,3132416
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
 lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
@@ -14,7 +14,7 @@ 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=BMQM-1j14wOnjakh30SECYLoWej8kHkVPyIkLR4yeGY,224466
+lavavu/lavavu.py,sha256=Sh1DAgP8SaYsO7NyKA667WMzoGsS2adAu7Pdp2x4eKQ,224667
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -41,12 +41,12 @@ lavavu/html/emscripten.css,sha256=xSOf_UBkkq3fPF_8h_YKFLZXUVy8FVOymRgANWQMMLc,19
 lavavu/html/favicon.ico,sha256=OrIWwvxOSnOCuynrGRUyEIVQng0ZwA9Rrz89S9eiog0,1150
 lavavu/html/gl-matrix-min.js,sha256=-LGye5bMuwoTva7bswxQeewoEaybX7EnZFTlhjXzrB8,23189
 lavavu/html/gui.css,sha256=5sfIpoA-fFIVxEBqEK4cKagF1mnOAMnI4dABk9rj-pU,607
-lavavu/html/menu.js,sha256=hqmRv_gZsRjGduSOQxpMVVO8M4eEZU1lMiaaX7_bG1s,22111
+lavavu/html/menu.js,sha256=vFw163cTqpbYq6h0UFCVCIArJvYD8_1aj_bQVxo3eoY,22245
 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=3ETCQYGZ8rpSTfE4rIlGQr4E9jRqCbFaSzZ8HJAYtJo,1564
+lavavu/html/webview.html,sha256=07nQPUnc0F-qN9be9gL30JQMgS9Sg5gvR6NvYm2g8OY,1564
 lavavu/osmesa/LavaVuPython.py,sha256=uTyBhkTp-Gcg468mS7EXZWxUU4TVtQ0R6D169CnMUZ0,33768
 lavavu/osmesa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lavavu/shaders/default.frag,sha256=SHdqowe24zRNKnffZX7XilwD_I0NhVx9_rR04YJlLTE,194
@@ -61,9 +61,9 @@ lavavu/shaders/triShader.frag,sha256=6VhNYBN5encmiE6jM-Y_titqCteTnL4AcefGprVDqxM
 lavavu/shaders/triShader.vert,sha256=haljW2eQwyB24QWR1SURspU1z6ndskdZG7mrILfgXzo,1129
 lavavu/shaders/volumeShader.frag,sha256=6NeP_bgEl0SNOAjMxOWORhU62-TA9KyveDZ93mVtkKE,14594
 lavavu/shaders/volumeShader.vert,sha256=CroiEfEIe7pP66w14KwmKxfbTuKN6EuXYbZJvt_bfHk,83
-lavavu-1.9.5.dist-info/licenses/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.9.5.dist-info/METADATA,sha256=-TaXvLzsFVh9cmylCSW73maqGMH0QQPzxKIPlhuiFu8,18200
-lavavu-1.9.5.dist-info/WHEEL,sha256=3JRrBaG_r4GKEsQxd6dVT34joOu5By0wlyszd6u_ofs,99
-lavavu-1.9.5.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.9.5.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.9.5.dist-info/RECORD,,
+lavavu-1.9.6.dist-info/licenses/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.9.6.dist-info/METADATA,sha256=8uElwm8qg73dYqmStSy5z9iZmmva_24pDWbLGy7dwzI,18200
+lavavu-1.9.6.dist-info/WHEEL,sha256=3JRrBaG_r4GKEsQxd6dVT34joOu5By0wlyszd6u_ofs,99
+lavavu-1.9.6.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.9.6.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.9.6.dist-info/RECORD,,