lavavu 1.9.6__cp313-cp313-macosx_11_0_arm64.whl → 1.9.7__cp313-cp313-macosx_11_0_arm64.whl

lavavu/html/control.js

@@ -87,7 +87,7 @@ function WindowInteractor(id, uid, port) {
 
     //Several possible modes to try
     //Modern JupyterHub lab URL
-    var regex = /\/lab\//;
+    var regex = /\/lab(\/|\?|$)/; //Match "/lab" at end of url or "/lab/" or "/lab?" anywhere
     var parsed = regex.exec(loc.href);
     if (parsed && parsed.length > 0) {
       connect(loc.href.substring(0,parsed.index) + "/proxy/" + port);

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

lavavu/lavavu.py

@@ -23,7 +23,7 @@ __all__ = ['Viewer', 'Object', 'Properties', 'ColourMap', 'DrawData', 'Figure',
 import os
 #must be an object or won't be referenced from __init__.py import
 #(enures values are passed on when set externally)
-settings = {"default_args" : [], "echo_fails" : False, "quality_override" : None}
+settings = {"default_args" : [], "echo_fails" : False, "quality_override" : None, "test_mode" : False}
 #Default arguments for viewer creation
 _val = os.environ.get('LV_ARGS')
 if _val:
@@ -36,6 +36,10 @@ if _val:
 _val = os.environ.get('LV_QUALITY')
 if _val:
     settings["quality_override"] = int(_val)
+#Test mode - changes some behaviour to support automated testing
+_val = os.environ.get('LV_TEST')
+if _val:
+    settings["test_mode"] = bool(_val)
 
 import json
 import math
@@ -54,6 +58,7 @@ import asyncio
 import quaternion as quat
 import platform
 import matplotlib
+from pathlib import Path
 
 if sys.version_info[0] < 3:
     print("Python 3 required. LavaVu no longer supports Python 2.7.")
@@ -3562,7 +3567,6 @@ class Viewer(dict):
         ll = len(self.objects.list) #Save list length before load
         if not self.app.loadFile(filename):
             #Support trimesh formats
-            from pathlib import Path
             path = Path(filename)
             ext = path.suffix.lower()[1:]
             import convert
@@ -3876,6 +3880,9 @@ class Viewer(dict):
         """        
         Render a new frame, explicit display update
         """
+        if settings["test_mode"] and self.recording and self.recording.framecount != 0:
+            #Skip rendering all except first and last frames when testing
+            return
         self.app.render()
         #Video recording?
         if self.recording:
@@ -4305,7 +4312,7 @@ class Viewer(dict):
         #This is thread safe as doesn't load texture
         return self.app.imageFromFile(filename)
 
-    def testimages(self, imagelist=None, tolerance=TOL_DEFAULT, expectedPath='expected/', outputPath='./', clear=True):
+    def testimages(self, imagelist=None, tolerance=TOL_DEFAULT, expectedPath='expected/', outputPath='./', png=True, jpg=False, clear=True):
         """
         Compare a list of images to expected images for testing
 
@@ -4320,6 +4327,10 @@ class Viewer(dict):
             Where to find the expected result images (should have the same filenames as output images)
         outputPath : str
             Where to find the output images
+        png : boolean
+            Check png image outputs, defaults to True
+        jpng : boolean
+            Check jpg image outputs, defaults to False
         clear : boolean
             If the test passes the output images will be deleted, set to False to disable deletion
         """
@@ -4333,14 +4344,17 @@ class Viewer(dict):
                 #No expected images yet, just get images in cwd
                 #will be copied in to expected in testimage()
                 pass
-            imagelist = glob.glob("*.png")
-            imagelist += glob.glob("*.jpg")
+            imagelist = []
+            if png:
+                imagelist += glob.glob("*.png")
+            if jpg:
+                imagelist += glob.glob("*.jpg")
             imagelist.sort(key=os.path.getmtime)
             os.chdir(cwd)
 
         for f in sorted(imagelist):
-            outfile = outputPath+f
-            expfile = expectedPath+f
+            outfile = os.path.join(outputPath, f)
+            expfile = os.path.join(expectedPath, f)
             results.append(self.testimage(expfile, outfile, tolerance, clear))
 
         #Combined result
@@ -5504,9 +5518,6 @@ class Video(object):
         **kwargs :
             Any additional keyword args will also be passed as options to the encoder
         """
-        if av is None:
-            raise(ImportError("Video output not supported without pyAV - pip install av"))
-            return
         self.resolution = list(resolution)
         if self.resolution[0] == 0 or self.resolution[1] == 0:
             self.resolution = (viewer.app.viewer.width, viewer.app.viewer.height)
@@ -5515,7 +5526,20 @@ class Video(object):
         self.framerate = framerate
         self.quality = quality
         self.viewer = viewer
-        self.filename = filename
+        self.filename = Path(filename)
+        if settings["test_mode"]:
+            #Force png output when testing
+            encoder = 'png'
+        if av is None or encoder == 'png' or encoder == 'jpg':
+            if av is None:
+                print("Video output not supported without pyAV - pip install av, writing image frames instead")
+            self.encoder = 'png' if encoder == 'png' else 'jpg'
+            p = self.filename
+            self.basename = p.stem
+            self.filename = p.parent / p.stem
+            self.framecount = 0
+            return
+
         self.player = player
         if self.player is None:
             #Default player is half output resolution, unless < 900 then full
@@ -5547,6 +5571,12 @@ class Video(object):
         #Compression level, lower = high quality
         #See also: https://github.com/PyAV-Org/PyAV/blob/main/tests/test_encode.py
         options = {}
+        if self.encoder == 'jpg' or self.encoder == 'png':
+            if not settings["test_mode"]:
+                self.filename.mkdir(exist_ok=True)
+            self.viewer.recording = self
+            return
+
         if self.encoder == 'h264' or self.encoder == 'libx265':
             #Only have default options for h264/265 for now
             if self.quality == 1:
@@ -5576,7 +5606,7 @@ class Video(object):
         options.update(self.options)
 
         #print(options)
-        self.container = av.open(self.filename, mode="w")
+        self.container = av.open(str(self.filename), mode="w")
         self.stream = self.container.add_stream(self.encoder, rate=self.framerate, options=options)
         self.stream.width = self.resolution[0]
         self.stream.height = self.resolution[1]
@@ -5602,10 +5632,19 @@ class Video(object):
         Write a frame, called when viewer.render() is called
         while a recording is in progress
         """
-        img = self.viewer.rawimage(resolution=self.resolution, channels=3)
-        frame = av.VideoFrame.from_ndarray(img.data, format="rgb24")
-        for packet in self.stream.encode(frame):
-            self.container.mux(packet)
+        if self.encoder == 'jpg' or self.encoder == 'png':
+            if settings["test_mode"]:
+                #Don't output in subdir
+                fn = f"{self.framecount:06}_{self.basename}.{self.encoder}"
+            else:
+                fn = self.filename / f"{self.framecount:06}_{self.basename}.{self.encoder}"
+            self.framecount += 1
+            self.viewer.image(str(fn), resolution=self.resolution)
+        else:
+            img = self.viewer.rawimage(resolution=self.resolution, channels=3)
+            frame = av.VideoFrame.from_ndarray(img.data, format="rgb24")
+            for packet in self.stream.encode(frame):
+                self.container.mux(packet)
 
     def pause(self):
         """
@@ -5621,6 +5660,15 @@ class Video(object):
         Stop recording, final frames will be written and file closed, ready to play. 
         No further frames will be added to the video
         """
+        if self.encoder == 'jpg' or self.encoder == 'png':
+            self.viewer.recording = None
+            if settings["test_mode"]:
+                #Render the last frame for tests
+                self.viewer.app.render()
+                fn = f"{self.framecount:06}_{self.basename}.{self.encoder}"
+                self.viewer.image(str(fn), resolution=self.resolution)
+            self.framecount = 0
+            return
         # Flush stream
         for packet in self.stream.encode():
             self.container.mux(packet)
@@ -5648,7 +5696,14 @@ class Video(object):
             if image.size == self.resolution[0] * self.resolution[1] * 4:
                 image = image.reshape(self.resolution[0], self.resolution[1], 4)
                 image = image[::,::,:3] #Remove alpha channel
-            #self.encoder.copyframe(image.ravel())
+
+            if self.encoder == 'jpg' or self.encoder == 'png':
+                from PIL import Image as PILImage
+                img = PILImage.fromarray(image)
+                fn = self.filename / f"{self.framecount:06}_{self.basename}.{self.encoder}"
+                self.framecount += 1
+                img.save(fn)
+                return
 
             frame = av.VideoFrame.from_ndarray(image, format="rgb24")
             for packet in self.stream.encode(frame):
@@ -5658,7 +5713,11 @@ class Video(object):
         """
         Show the video in an inline player if in an interactive notebook
         """
-        player(self.filename, **self.player)
+        if self.encoder == 'jpg' or self.encoder == 'png':
+            from IPython.display import display,HTML
+            display(HTML('<p>Video written to images, no player available</p>'))
+        else:
+            player(self.filename, **self.player)
 
     def __enter__(self):
         self.start()
@@ -5671,6 +5730,8 @@ class Video(object):
             self.play()
         else:
             print('Recording failed: ', exc_value)
+            import traceback
+            print(traceback.format_exc())
         return True
 
 #Wrapper class for raw image data

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

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

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

@@ -1,4 +1,4 @@
-lavavu/lavavu.py,sha256=I64ioPwTN1eyZcZEaF9RfdxncfLuihl-7VqqqJDFLCw,218528
+lavavu/lavavu.py,sha256=v7tXwp6gQzu1F05hHyALng8FXznv4rVwdCJ3sO65O8o,221223
 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
@@ -9,12 +9,12 @@ lavavu/convert.py,sha256=tbYRjLE2l1hI4d6tsW41Lia1JXmrWSc0-JAYCiMrjys,35516
 lavavu/control.py,sha256=s32rtLPXXYtxpeXd6-iHdupmaMTJ3KhK6Vq-CLjf9OQ,66755
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
-lavavu/_LavaVuPython.cpython-313-darwin.so,sha256=lI093WT-d3OL1N2RhS-HH50DJYjTHRJwjdXYiLpkeNI,3927376
+lavavu/_LavaVuPython.cpython-313-darwin.so,sha256=7BX8bLplJs0YG-UIabUasfipkxPCMXkE7N9w9K_csxY,3927376
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
 lavavu/html/control.css,sha256=PVLwmle00ciEckUV5ZIRmI3Whxhl7-mlVexnyyxoU70,3259
-lavavu/html/control.js,sha256=oV24eJZ0vfuCxF3fO60eeJSkNFJ9hUkSCThHGJS1Wvc,11652
+lavavu/html/control.js,sha256=dBjFHgDal3aixVWoQuMOt_ZyhiGSAcEUFJJx9I_ndOQ,11719
 lavavu/html/gui.css,sha256=PRDLsYwM6cgLC9zZsEAG0dnnSd-HYH6oSEfsdEBkuxk,582
 lavavu/html/favicon.ico,sha256=OrIWwvxOSnOCuynrGRUyEIVQng0ZwA9Rrz89S9eiog0,1150
 lavavu/html/LavaVu-amalgamated.css,sha256=iE2xrxFcwmY0AcASrXxNa_RpvFEbS_YO4H5OILbPteE,8640
@@ -27,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=8eilGjX8y_I5OjCvTm-ZAQDNOSCaT1yvogKFqK4lCS0,1521
+lavavu/html/webview.html,sha256=Tjv9TWx1k6ovHY8xxaG_NGwHwuiDC0Hz5Npm39afHAU,1521
 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
@@ -47,9 +47,9 @@ lavavu/shaders/fontShader.vert,sha256=yCBmRugaPUeUQUdIh62-AK_5KELiJqVS2M82iyIqPw
 lavavu/shaders/pointShader.frag,sha256=3zREBdsimlL9fAXBPjhzomGaFUWmlG_QYkhwMTVURHQ,3291
 lavavu/shaders/volumeShader.vert,sha256=uGdQjGqi7V5kE6V7nxymfugtU4cbf6u570xBy13RgmY,78
 lavavu/shaders/default.frag,sha256=5XLYVfLwzN0sFT3aMYGmxbyquA_cmndp55YCOuy1t4E,180
-lavavu-1.9.6.dist-info/RECORD,,
-lavavu-1.9.6.dist-info/WHEEL,sha256=Cxq5pla4scSj9raD9htoFbIhfTk0lSQlQLVCyAjgIi4,136
-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/METADATA,sha256=EHgjIlNax60denK4kKXeAJziT1zFhX8e-9OqQUVd9WE,17877
-lavavu-1.9.6.dist-info/licenses/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.9.7.dist-info/RECORD,,
+lavavu-1.9.7.dist-info/WHEEL,sha256=89IgJaLF6X8hMUjC4DKLcrcADd48Z33aA8odPAkCuhg,136
+lavavu-1.9.7.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.9.7.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.9.7.dist-info/METADATA,sha256=pDV89WKg6njzJArxsKbduk1rcj2NHSb75oV1lUtNx30,17877
+lavavu-1.9.7.dist-info/licenses/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603

{lavavu-1.9.6.dist-info → lavavu-1.9.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: false
 Tag: cp313-cp313-macosx_11_0_arm64
 Generator: delocate 0.13.0