lavavu 1.8.75__cp311-cp311-win_amd64.whl → 1.8.76__cp311-cp311-win_amd64.whl

lavavu/LavaVuPython.py

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (https://www.swig.org).
-# Version 4.1.0
+# Version 4.2.0
 #
 # Do not make changes to this file unless you know what you are doing - modify
 # the SWIG interface file instead.

lavavu/convert.py

@@ -110,10 +110,10 @@ def points_to_volume_histogram(verts, weights, res=8, normed=True, clamp=None, b
 
     #H, edges = numpy.histogramdd(verts, bins=RES)
     if boundingbox is None:
-        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, normed=normed) #density=True for newer numpy
+        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, density=normed) #density=True for newer numpy
     else:
         rg = ((vmin[0], vmax[0]), (vmin[1], vmax[1]), (vmin[2], vmax[2])) #provide bounding box as range
-        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, range=rg, normed=normed) #density=True for newer numpy
+        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, range=rg, density=normed) #density=True for newer numpy
 
     #Reverse ordering X,Y,Z to Z,Y,X for volume data
     values = H.transpose()

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

lavavu/lavavu.py

@@ -166,6 +166,37 @@ def _convert(data, dtype=None):
 
     return data
 
+def is_documented_by(original):
+    def wrapper(target):
+        target.__doc__ = original.__doc__
+        return target
+    return wrapper
+
+def _brightness_contrast_saturation(target, brightness=0.5, contrast=0.5, saturation=0.5):
+    """
+    Set brightness, contrast and saturation in the range [0,1]
+    Zero is minimum level
+    0.5 is default, normal setting
+    1 is maximum level
+
+    Parameters
+    ----------
+    brightness : float
+        Brightness level from 0 to 1, converts to lavavu brightness in range [-1,1]
+        0 is full black, 0.5 is normal and 1.0 is full white
+    contrast : float
+        Contrast level from 0 to 1, converts to lavavu contrast in range [0,2]
+        0 is grey, 0.5 is normal and 1.0 is maximum contrast
+    saturation : float
+        Saturation level from 0 to 1, converts to lavavu saturation in range [0,2]
+        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
+    #Contrast and saturation range from [0,2] where 1 is default
+    target["contrast"] = contrast * 2.0
+    target["saturation"] = saturation * 2.0
+
 def grid2d(corners=((0.,1.), (1.,0.)), dims=[2,2]):
     """
     Generate a 2d grid of vertices
@@ -1102,7 +1133,7 @@ class Object(dict):
 
         self._loadScalar(data, LavaVuPython.lucLuminanceData, width, height, depth)
 
-    def texture(self, data=None, flip=True, filter=2, bgr=False):
+    def texture(self, data=None, flip=True, filter=2, bgr=False, label=""):
         """
         Load or clear texture data for object
 
@@ -1116,6 +1147,10 @@ class Object(dict):
             either (height, width, channels) for RGB(A) image
             or (height, width) for single channel grayscale image
             Pass a string to load a texture from given filename
+        label : string
+            Optional label to load a custom texture by name of uniform used
+            If provided, will attempt to find the texture by this label and replace its data
+            If not provided, will use the default/primary texture for the object
         flip : boolean
             flip the texture vertically after loading
             (default is enabled as usually required for OpenGL but can be disabled)
@@ -1129,7 +1164,7 @@ class Object(dict):
             self.parent.app.clearTexture(self.ref)
             return
         if isinstance(data, str):
-            self.parent.app.setTexture(self.ref, data, flip, filter, bgr)
+            self.parent.app.setTexture(self.ref, data, flip, filter, bgr, label)
             return
 
         data = _convert(data)
@@ -1145,9 +1180,9 @@ class Object(dict):
         if data.dtype == numpy.float32:
             data = _convert(data, numpy.uint8)
         if data.dtype == numpy.uint32:
-            self.parent.app.textureUInt(self.ref, data.ravel(), width, height, channels, flip, filter, bgr)
+            self.parent.app.textureUInt(self.ref, data.ravel(), width, height, channels, flip, filter, bgr, label)
         elif data.dtype == numpy.uint8:
-            self.parent.app.textureUChar(self.ref, data.ravel(), width, height, channels, flip, filter, bgr)
+            self.parent.app.textureUChar(self.ref, data.ravel(), width, height, channels, flip, filter, bgr, label)
 
     def labels(self, data):
         """
@@ -1593,6 +1628,10 @@ 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):
+        return _brightness_contrast_saturation(self)
+
 #Wrapper dict+list of objects
 class _Objects(dict):
     """  
@@ -1901,7 +1940,7 @@ class ColourMap(dict):
             Convert to greyscale
         """
         if data is not None:
-            if isinstance(data, str) and re.match('^[\w_]+$', data) is not None:
+            if isinstance(data, str) and re.match(r'^[\w_]+$', data) is not None:
                 #Single word of alphanumeric characters, if not a built-in map, try matplotlib
                 if data not in self.parent.defaultcolourmaps():
                     newdata = matplotlib_colourmap(data)
@@ -4652,6 +4691,59 @@ class Viewer(dict):
             self.render()
         convert.export_any(filepath, objects)
 
+    @is_documented_by(_brightness_contrast_saturation)
+    def brightness_contrast_saturation(self, brightness=0, contrast=0, saturation=0):
+        return _brightness_contrast_saturation(self, brightness, contrast, saturation)
+
+    def set_properties(self, objects=None, **kwargs):
+        """
+        Set properties on viewer or on a set of objects by name
+
+        Parameters
+        ----------
+        objects : list
+            List of objects or object names, if not provided the properties will be applied globally to the Viewer itself
+        **kwargs :
+            key=value property names and values to set
+        """
+        if objects is None:
+            for key in kwargs:
+                self[key] = kwargs[key]
+        else:
+            for o in objects:
+                if isinstance(o, str):
+                    obj = self.objects[o]
+                else:
+                    obj = o
+                for key in kwargs:
+                    obj[key] = kwargs[key]
+
+    def set_uniforms(self, objects=None, **kwargs):
+        """
+        Set uniform variables on a set of objects by name or all objects
+        Uniforms are parameters sent directly to the shader program and can have any
+        valid GLSL variable name, it just needs to match the declaration in the shader
+
+        Parameters
+        ----------
+        objects : list
+            List of objects or object names, if not provided the full object list will be iterated
+        **kwargs :
+            key=value uniform names and values to set
+        """
+        if objects == None: objects = self.objects.list
+        if not isinstance(objects, list):
+            objects = [objects]
+        for o in objects:
+            if isinstance(o, str):
+                obj = self.objects[o]
+            else:
+                obj = o
+            uniforms = obj['uniforms']
+            for key in kwargs:
+                uniforms[key] = kwargs[key]
+            obj['uniforms'] = uniforms
+
 #Wrapper for list of geomdata objects
 class Geometry(list):
     """  
@@ -5278,7 +5370,7 @@ class Video(object):
     def __exit__(self, exc_type, exc_value, exc_traceback):
         self.stop()
         if exc_value == None:
-            print('Recording complete, filename: ', self.filename)
+            #print('Recording complete, filename: ', self.filename)
             self.play()
         else:
             print('Recording failed: ', exc_value)

lavavu/vutils.py

@@ -81,15 +81,10 @@ def download(url, filename=None, overwrite=False, quiet=False):
     filename : str
         Actual filename written to local filesystem
     """
-    #Python 3 moved modules
-    try:
-        from urllib.request import urlopen, URLError, HTTPError, Request
-        from urllib.parse import urlparse
-        from urllib.parse import quote
-    except ImportError:
-        from urllib2 import urlopen, URLError, HTTPError, Request
-        from urllib import quote
-        from urlparse import urlparse
+    from urllib.request import urlopen, URLError, HTTPError, Request
+    from urllib.parse import urlparse
+    from urllib.parse import quote
+    import http.client
 
     if filename is None:
         filename = url[url.rfind("/")+1:]

{lavavu-1.8.75.dist-info → lavavu-1.8.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.75
+Version: 1.8.76
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -212,7 +212,7 @@ Classifier: Framework :: IPython
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: numpy >=1.18
+Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter-server-proxy
 
@@ -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.75)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.76)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.8.75.dist-info → lavavu-1.8.76.dist-info}/RECORD

@@ -1,5 +1,5 @@
-lavavu/LavaVuPython.py,sha256=I27VeH0GoGE2uIZ92UgoysGnQe5peBW_e-YEsA4Y1Q0,33691
-lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=mvgwUGYPcusho8nK24sR8xB8gCa0rAw_TQcncHxcNP8,3100672
+lavavu/LavaVuPython.py,sha256=fM1Xo8N4RGzWPdCkJy3rvjHECge4Vw5h8QZLCU31ep4,33691
+lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=VMDgd803xTP5vQoi4tEeeYfDu-2vPQWyGG2gE8tilLo,3111424
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
 lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
@@ -10,11 +10,11 @@ lavavu/avfilter-7.dll,sha256=cKwN6yDGzmf6XB5HXM1QVV4fc_HfhjAd3dBvV5YVdbk,1095731
 lavavu/avformat-58.dll,sha256=PB5bD4mq62vBBY8tdagrGaYD2AQjaz3Lgc6wpp0UIr0,11094016
 lavavu/avutil-56.dll,sha256=VsAhkveudbox9BBMuLEjnJ6yzoyJDoy2SzgPnMgMug0,866304
 lavavu/control.py,sha256=QyNNJCeM6MeQhy4lhhb3JGnIUctCKo9JshleVTRUsTI,67547
-lavavu/convert.py,sha256=LBMvZrxJDhJYPbeTJEs7PpBs3zXkeIPtbzHs-Wxr8FI,36402
+lavavu/convert.py,sha256=3F79LHdsi74pvewvDuvnlYR_Zsh5mCc1QI7XZnQSMN8,36404
 lavavu/dict.json,sha256=6WjVWKKKfF5ieZK2AfWldrl4c7BCo8tEgigJR5CpCqQ,55239
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/glfw3.dll,sha256=zI-Qy4RDHQo4mYYgW4QLREz-WZ5l5HCXJzyksyTy0bY,83456
-lavavu/lavavu.py,sha256=K6ia3i9_YXrPpzioya8bIjNeKUwBgeIeiisKJwZoN1k,207659
+lavavu/lavavu.py,sha256=U-cz-UJxMYHJA7-xkJwNIQz5iroRe6I4dqA-OeQcK7g,211403
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -24,7 +24,7 @@ lavavu/swresample-3.dll,sha256=hlz9EYJ8_DjhqGYcevhIDwM_9qSuZFAxK4MgeAetqE4,43366
 lavavu/swscale-5.dll,sha256=s1IjI1-IaDVYiY3P9TouwS0OQRCG620yF-kLkKMiz70,552960
 lavavu/tiff.dll,sha256=fz7vpqGN9PbzO-zgiDnOlSicYj8eJBf3lhp-sY_j6uk,646656
 lavavu/tracers.py,sha256=hE9vgbMjZEXhnL_Z5ihlD8BEVTWU7jMnkrmfDwJLGdM,4381
-lavavu/vutils.py,sha256=TUk-sF7A7L5h9MTBshtz6Bq7i4xA-LV6cHPpvL6Xu94,5840
+lavavu/vutils.py,sha256=69Aygnjdz7l8-6PVYHKtOmSNFz9bGSKCv79ZI3MHY6M,5648
 lavavu/zlib.dll,sha256=4tlDhqlDl2vb-ztXfk8WIhbyfNrMRvtmygwk4s9fRQM,84992
 lavavu/zstd.dll,sha256=NJIIlGtaKrXDSlaIzizhDVEMxjuccfkSqhgy-DSUN80,491008
 lavavu/html/LavaVu-amalgamated.css,sha256=oHR0Xcn58ve_InCszKUR_Lw4RTK7DbGk_2FjP2x-UsE,8922
@@ -46,7 +46,7 @@ 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=-HGHJ2DY_4xghYa1_eoqthieO67z5dWRW_qohqZGcdY,1565
+lavavu/html/webview.html,sha256=4mKjKToZMhjneCJyVJ57ViSayk_pglb85smcZMp2oLE,1565
 lavavu/shaders/default.frag,sha256=AlGMo01JdaOsXx6Gq7s1WADi2b-vyX9XMSB91AcJvuA,278
 lavavu/shaders/default.vert,sha256=SKC2BkE2axNjJL2j5QYjU2bj6mMXs8Wq02XgMTiOeFo,334
 lavavu/shaders/fontShader.frag,sha256=0GGFFg6S4v0p_1gDTIATDmc19jrCl7xIgH9PpxcXEcE,469
@@ -59,9 +59,9 @@ lavavu/shaders/triShader.frag,sha256=eVGp_ttGMVgKnDYRwByvx_PN80EYiSz61jeuAD8JJvw
 lavavu/shaders/triShader.vert,sha256=tzgJjqbhKDgVngUJvMVL1ehYvwxAMFLQ-WtKEYU3in0,1175
 lavavu/shaders/volumeShader.frag,sha256=PLTei6fN_uLxPD35LHbBQVe_S7TanxdBqcW5khslQMI,16583
 lavavu/shaders/volumeShader.vert,sha256=CroiEfEIe7pP66w14KwmKxfbTuKN6EuXYbZJvt_bfHk,83
-lavavu-1.8.75.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.75.dist-info/METADATA,sha256=wdxlXttAawb3Kg49-zbIeB6KRjm5sO2pOorCIvE5Ww4,18556
-lavavu-1.8.75.dist-info/WHEEL,sha256=WYSXpZsvXNiAggUvUzBeRCxUY27Bzz6nBjGWxD02TN4,101
-lavavu-1.8.75.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.75.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.75.dist-info/RECORD,,
+lavavu-1.8.76.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.8.76.dist-info/METADATA,sha256=auIzfJ0-5C-LJYC06IywxU70e61vm4NOZYRjrne29Fw,18555
+lavavu-1.8.76.dist-info/WHEEL,sha256=yNCBXpt7EYM4XWkQWwdIjv6aROYfg72vYtkZaa0M7Y4,101
+lavavu-1.8.76.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.8.76.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.8.76.dist-info/RECORD,,

{lavavu-1.8.75.dist-info → lavavu-1.8.76.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64