lavavu 1.8.74__cp312-cp312-macosx_11_0_arm64.whl → 1.8.76__cp312-cp312-macosx_11_0_arm64.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/control.py

@@ -220,6 +220,13 @@ def _connectcode(target):
     else:
         return ""
 
+def _emscriptencode(menu=False, lighttheme=True):
+    """
+    Returns WebGL base code for an interactive visualisation window
+    """
+    jslibs = [[], ['emscripten.js', 'LavaVu.js']]
+    return _webglcode('', ['emscripten.css'], jslibs, menu=menu, lighttheme=lighttheme)
+
 def _getcss(files=["styles.css"]):
     #Load stylesheets to inline tag
     return _filestohtml(files, tag="style")

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/drawbox.js

@@ -190,6 +190,14 @@ function canvasBoxMouseMove(event, mouse) {
 
   mouse.element.viewer.draw();
 
+  //Instant updates
+  if (mouse.element.viewer.alwaysdraw) {
+    if (mouse.element.viewer.rotating)
+      mouse.element.viewer.command('' + mouse.element.viewer.getRotationString());
+    else
+      mouse.element.viewer.command('' + mouse.element.viewer.getTranslationString());
+  }
+
   return false;
 }
 
@@ -422,6 +430,7 @@ function BoxViewer(canvas) {
 
   //Non-persistant settings
   this.mode = 'Rotate';
+  this.alwaysdraw = false;
   if (!this.gl) return;
 
   //Create the renderers

lavavu/html/emscripten-template.js

@@ -67,7 +67,7 @@ var Module = {
   },
   locateFile: function(path, prefix) {
     // Source from github by default
-    if (path.endsWith("LavaVu.wasm") || path.endsWith("LavaVu.data")) return "https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@LAVAVU_VERSION/" + path;
+    //if (path.endsWith("LavaVu.wasm") || path.endsWith("LavaVu.data")) return "https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@LAVAVU_VERSION/" + path;
     // otherwise, use the default, the prefix (JS file's dir) + the path
     return prefix + path;
   },

lavavu/html/menu.js

@@ -320,6 +320,7 @@ function createMenu(viewer, onchange, webglmode, global) {
     gui.add({"Export GLDB" : function() {window.commands.push('export');}}, 'Export GLDB');
   } else if (viewer.canvas) {
     //Server render
+    gui.add(viewer, "alwaysdraw");
     var url = viewer.canvas.imgtarget.baseurl;
     if (url)
       gui.add({"Popup Viewer" : function() {window.open(url, "LavaVu", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,width=1024,height=768");}}, 'Popup Viewer');

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.74/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)
@@ -3899,6 +3938,7 @@ class Viewer(dict):
         if not is_notebook():
             #Open the file in a new browser window
             import webbrowser
+            #TODO: this url doesn't work
             webbrowser.open("/webview.html", new=1, autoraise=True)
         else:
             from IPython.display import display,HTML,IFrame
@@ -3916,6 +3956,26 @@ class Viewer(dict):
             </div>""".format(resolution[0], resolution[1], url)
             display(HTML(html))
 
+        """
+        #EXPERIMENTAL EMSCRIPTEN INLINE VERSION
+        html = control._emscriptencode(menu)
+        ID = str(len(self.webglviews))
+        template = control.emscripten_inline
+        #template = template.replace('---ID---', ID)
+        #template = template.replace('---INIT---', 'initPage(\'{0}\', {1});'.format(ID, "true" if menu else "false"))
+        #template = template.replace('---CONTENT---', control.hiddenhtml)
+        #template = template.replace('---WIDTH---', str(resolution[0]))
+        #template = template.replace('---HEIGHT---', str(resolution[1]))
+        html = template.replace('---SCRIPTS---', html)
+        self.webglviews.append(ID)
+
+        #Display inline in cell
+        #from IPython.display import IFrame
+        #display(IFrame(filename, width=resolution[0], height=resolution[1]))
+        from IPython.display import display,HTML
+        display(HTML(html))
+        """
+
     def webgl(self, filename=None, resolution=(640,480), browser=False, menu=True, **kwargs):
         """        
         Create a WebGL page with a 3D interactive view of the active model
@@ -4631,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):
     """  
@@ -5257,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.74.dist-info → lavavu-1.8.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.74
+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.74)
+[![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.74.dist-info → lavavu-1.8.76.dist-info}/RECORD

@@ -1,13 +1,13 @@
-lavavu/lavavu.py,sha256=j710i05alXW92-C73OUb_SEZP19IoKB-NAz40Mf-ss8,201005
-lavavu/vutils.py,sha256=L5TpyGlRHThhGChzaKhB70NQd75o3ctyKhSqZTsxceg,5624
+lavavu/lavavu.py,sha256=_6kKbk3KXUTDWYoSCkcnYLKOQPRkZteDepBApKepPUs,205612
+lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
 lavavu/dict.json,sha256=Zb1QnJOsx2DK3M1tRSXRUQ5PjEpOo3SMM3tTNHIKMPs,52722
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
 lavavu/points.py,sha256=jRRtA6CrcA46Y2jUJmkxnIiVoMC5a14xEd_ojhmjhz4,5871
-lavavu/_LavaVuPython.cpython-312-darwin.so,sha256=E8gn2GS_T8id5IK3x8pjgtjsxqMfNfaxZzIzlcsiN9c,3792464
-lavavu/LavaVuPython.py,sha256=Ki8G9XYHkyfqmxG6BohDWomvSn5eJwG9cHqGzEhZDDs,33131
+lavavu/_LavaVuPython.cpython-312-darwin.so,sha256=uMsu6lwfDOt4ia1t-drh8PNHr-lAVAVixSDmXJxSw2w,3840880
+lavavu/LavaVuPython.py,sha256=ZdBJROEPysd_N_Od88PEO8Y1fjCOd05_vP6YBnJymN0,33131
 lavavu/tracers.py,sha256=0dB6v9Jg5G-IeZxiVFvbPoTycGvyAQBtgyEAZUmq4XU,4257
-lavavu/convert.py,sha256=JT73q32YMchuSIkoH_A0cTUVwfns8fWLGjyWp2A5i5M,35514
-lavavu/control.py,sha256=MWoYWBhqJbq_1GArE79SQAcZ1rINlvl0bx5nV5XTf8U,65568
+lavavu/convert.py,sha256=tbYRjLE2l1hI4d6tsW41Lia1JXmrWSc0-JAYCiMrjys,35516
+lavavu/control.py,sha256=eNocZPc-2Dz-nSty_KRz_9RzLvbU0clJGuAV3qnzxbU,65841
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
@@ -26,12 +26,12 @@ lavavu/html/server.js,sha256=b5eNlWWbiEk90n3WARJ1Mh7lmfHM0pOtZfrrmM-wfyc,7099
 lavavu/html/dat.gui.min.js,sha256=S4_QjoXe4IOpU0f0Sj5jEQLTWPoX9uRl1ohB91jyhuw,56992
 lavavu/html/OK-min.js,sha256=-4Gc1-dWfxP_w6r9ZOHa8u-X2BlGUoSQbX68lwCxQ3E,39115
 lavavu/html/emscripten.css,sha256=wkaIJhXaxuMchinQX9Z8c12cJomyvFQMeIZ62WGQEPQ,1813
-lavavu/html/drawbox.js,sha256=oaB6bokR4uA2mT9IDLZR7n6P-eDQ86auGbRQHWX423M,34280
-lavavu/html/webview.html,sha256=f0WSNwiUOTanA_FHqZixSuydfGYby2UD942nedv2_Vo,1522
-lavavu/html/emscripten-template.js,sha256=8OBEPzJYW00-b2d-BUQetFIivIO8PD_ktiCXd_GAEHQ,6133
+lavavu/html/drawbox.js,sha256=SJxFSmWd7QVFI5__66hFkKzLKeqg1JPcx-gJuqdMkXw,34590
+lavavu/html/webview.html,sha256=vD2cFL5mpl1TLA_-Ys6_yiOt8snXxu5YrGfDiVAmRoI,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
-lavavu/html/menu.js,sha256=Kep88q4kEPXUfoa4xEEOLWieFph8pFnp1UR92d7VRiA,21466
+lavavu/html/menu.js,sha256=WCli3UYcQ7frjNq0aAXNALu33iNiN8lpTYwKZ7pUcn4,21501
 lavavu/html/baseviewer.js,sha256=u3UhC1At6rMBKmcQ7d2DXTRxQ20wsQkc4lqA-7sL7i4,9567
 lavavu/shaders/volumeShader.frag,sha256=CIFSfwI8xVZ0ALme2QPMcXWl5yB55WCGnfJZ1Led6TU,16120
 lavavu/shaders/pointShader.vert,sha256=rnEa8PfIK3kFtFg04Ataf10aWsjEkh1URY2ipV1xTMY,1235
@@ -45,9 +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.74.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu-1.8.74.dist-info/RECORD,,
-lavavu-1.8.74.dist-info/WHEEL,sha256=HnaoENn6Qm4iEXnBLTInwHfMXWh8BGFQKdBGriofhz4,109
-lavavu-1.8.74.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.74.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.74.dist-info/METADATA,sha256=KBDh8ndRnRNa9f90EFhmqkshLuJitRahywEwJdcwpzg,18238
+lavavu-1.8.76.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.8.76.dist-info/RECORD,,
+lavavu-1.8.76.dist-info/WHEEL,sha256=a49DngoqagUUlcaS-2XVqRCxwXxmdMxhw30J7454hso,109
+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/METADATA,sha256=_Q3RNrqe4mm_Qb3CM15xfNkX9b7Wq0ORAlIYrUdry-k,18237

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

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_11_0_arm64