lavavu 1.8.76__cp311-cp311-macosx_11_0_arm64.whl → 1.8.80__cp311-cp311-macosx_11_0_arm64.whl

lavavu/dict.json

@@ -214,10 +214,10 @@
     ]
   },
   "uniforms": {
-    "default": [],
+    "default": {},
     "target": "object",
     "type": "object",
-    "desc": "Custom shader uniforms for rendering objects, list of uniform names, will be copied from property data",
+    "desc": "Custom shader uniforms for rendering objects, dict of uniform names/values, will be copied from property data",
     "strict": true,
     "redraw": 0,
     "control": [

lavavu/html/control.js

@@ -86,12 +86,17 @@ function WindowInteractor(id, uid, port) {
   } else {
 
     //Several possible modes to try
-    //JupyterHub URL
-    var regex = /\/user\/[a-z0-9-]+\//i;
+    //Modern JupyterHub lab URL
+    var regex = /\/lab\//;
     var parsed = regex.exec(loc.href);
     if (parsed && parsed.length > 0) {
-      var base = parsed[0];
-      connect(loc.href.substring(0,parsed.index) + base + "proxy/" + port);
+      connect(loc.href.substring(0,parsed.index) + "/proxy/" + port);
+    }
+    //Old JupyterHub URL
+    regex = /\/user\/[a-z0-9-]+\//i;
+    parsed = regex.exec(loc.href);
+    if (parsed && parsed.length > 0) {
+      connect(loc.href.substring(0,parsed.index) + parsed[0] + "proxy/" + port);
     }
 
     if (loc.protocol != 'file:') {

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

lavavu/lavavu.py

@@ -2319,29 +2319,29 @@ class _LavaVuWrapper(LavaVuPython.LavaVu):
                 if _LavaVuWrapper._ctx:
                     self.ctx = _LavaVuWrapper._ctx
                 else:
-                    self.ctx = moderngl.create_standalone_context(require=330)
+                    import platform
+                    if platform.system() == 'Linux':
+                        self.ctx = moderngl.create_context(standalone=True, require=330, backend='egl')
+                    else:
+                        self.ctx = moderngl.create_standalone_context(require=330)
+                    #print(self.ctx.info)
                     _LavaVuWrapper._ctx = self.ctx
 
             if self.use_moderngl_window and self.ctx:
                 # Activate the context
                 moderngl_window.activate_context(ctx=self.ctx)
-                if self.use_moderngl_window == 'window':
-                    # Configure with default window class / settings
-                    from moderngl_window.conf import settings
-                    settings.WINDOW['gl_version'] = (3, 3)
-                    settings.WINDOW['samples'] = 4
-                    if self.resolution:
-                        settings.WINDOW['size'] = self.resolution
-                    # Creates the window instance and activates its context
-                    self.wnd = moderngl_window.create_window_from_settings()
-                else:
-                    # Configure to use provided window class
-                    window_str = 'moderngl_window.context.' + self.use_moderngl_window + '.Window'
-                    window_cls = moderngl_window.get_window_cls(window_str)
-                    if self.resolution:
-                        self.wnd = window_cls(title="LavaVu", gl_version=(3, 3), samples=4, vsync=True, cursor=True, size=self.resolution)
-                    else:
-                        self.wnd = window_cls(title="LavaVu", gl_version=(3, 3), samples=4, vsync=True, cursor=True)
+
+                # Configure with default window class / settings
+                from moderngl_window.conf import settings
+                settings.WINDOW['gl_version'] = (3, 3)
+                if self.use_moderngl_window != 'window':
+                    #Use specified class
+                    settings.WINDOW['class'] = f'moderngl_window.context.{self.use_moderngl_window}.Window'
+                settings.WINDOW['samples'] = 4
+                if self.resolution:
+                    settings.WINDOW['size'] = self.resolution
+                # Creates the window instance and activates its context
+                self.wnd = moderngl_window.create_window_from_settings()
 
                 # register event methods
                 self.wnd.resize_func = self.resized
@@ -3695,6 +3695,56 @@ class Viewer(dict):
         else:
             return c.tolist()
 
+    def texture(self, label, data=None, flip=True, filter=2, bgr=False):
+        """
+        Load or clear global/shared texture data
+
+        Parameters
+        ----------
+        label : string
+            Label to load a custom texture by name of uniform used
+            Will attempt to find the texture by this label and replace its data
+        data : list or array or string
+            (If data is not provided, the object's texture data will be cleared)
+            Pass a list or numpy uint32 or uint8 array
+            texture data is loaded as raw image data
+            shape of array must be 2d or 3d,
+            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
+        flip : boolean
+            flip the texture vertically after loading
+            (default is enabled as usually required for OpenGL but can be disabled)
+        filter : int
+            type of filtering, 0=None/nearest, 1=linear, 2=mipmap linear
+        bgr : boolean
+            rgb data is in BGR/BGRA format instead of RGB/RGBA
+        """
+        if data is None:
+            #Clear texture
+            self.app.clearTexture(None, label)
+            return
+        if isinstance(data, str):
+            self.app.setTexture(None, data, flip, filter, bgr, label)
+            return
+
+        data = _convert(data)
+        if len(data.shape) < 2:
+            raise ValueError(data.shape + " : Must pass a 2D or 3D data set")
+        if len(data.shape) < 3:
+            height, width = data.shape
+            channels = 1
+        else:
+            height, width, channels = data.shape
+
+        #Convert floating point data
+        if data.dtype == numpy.float32:
+            data = _convert(data, numpy.uint8)
+        if data.dtype == numpy.uint32:
+            self.app.textureUInt(None, data.ravel(), width, height, channels, flip, filter, bgr, label)
+        elif data.dtype == numpy.uint8:
+            self.app.textureUChar(None, data.ravel(), width, height, channels, flip, filter, bgr, label)
+
     def clear(self, objects=True, colourmaps=True):
         """
         Clears all data from the visualisation
@@ -4740,6 +4790,7 @@ class Viewer(dict):
             else:
                 obj = o
             uniforms = obj['uniforms']
+            if len(uniforms) == 0: uniforms = {}
             for key in kwargs:
                 uniforms[key] = kwargs[key]
             obj['uniforms'] = uniforms

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

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

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

@@ -1,6 +1,12 @@
-lavavu/lavavu.py,sha256=_6kKbk3KXUTDWYoSCkcnYLKOQPRkZteDepBApKepPUs,205612
+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=wZi4olA0NR6c8yfzURN7DX9ImcSoHfH-g7UT7-9uFnE,109
+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/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
-lavavu/dict.json,sha256=Zb1QnJOsx2DK3M1tRSXRUQ5PjEpOo3SMM3tTNHIKMPs,52722
+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
@@ -12,9 +18,9 @@ lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
-lavavu/_LavaVuPython.cpython-311-darwin.so,sha256=yV7qOwkN529hoSKxSWaUJw6Ah3MMgyxJO7nvxo2sQ9k,3840896
+lavavu/_LavaVuPython.cpython-311-darwin.so,sha256=8kA0tnhScc0YYjtUN6BWmKyr5BwZuUKnzycSBZMA8Cw,3842192
 lavavu/html/control.css,sha256=PVLwmle00ciEckUV5ZIRmI3Whxhl7-mlVexnyyxoU70,3259
-lavavu/html/control.js,sha256=Gi3eszKip1JsrM1HrMvSJWjqFZql6DPXdMUkU6Zuj7Q,11466
+lavavu/html/control.js,sha256=oV24eJZ0vfuCxF3fO60eeJSkNFJ9hUkSCThHGJS1Wvc,11652
 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 +33,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=vD2cFL5mpl1TLA_-Ys6_yiOt8snXxu5YrGfDiVAmRoI,1522
+lavavu/html/webview.html,sha256=zif0TjI2RtOeuLl5yaQCPy5SeWJGkgJOa_amsMVq3Z0,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
@@ -45,9 +51,3 @@ 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.76.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu-1.8.76.dist-info/RECORD,,
-lavavu-1.8.76.dist-info/WHEEL,sha256=14CKxoVCfJ3KAIauGqtlVEBIkzvOXTVWMttVST6ktOc,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.76.dist-info → lavavu-1.8.80.dist-info}/WHEEL

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