lavavu 1.8.62__cp311-cp311-macosx_10_9_x86_64.whl → 1.9.5__cp311-cp311-macosx_10_9_x86_64.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.
@@ -481,6 +481,7 @@ class LavaVu(object):
     web = _swig_new_instance_method(_LavaVuPython.LavaVu_web)
     video = _swig_new_instance_method(_LavaVuPython.LavaVu_video)
     encodeVideo = _swig_new_instance_method(_LavaVuPython.LavaVu_encodeVideo)
+    pauseVideo = _swig_new_instance_method(_LavaVuPython.LavaVu_pauseVideo)
     defaultModel = _swig_new_instance_method(_LavaVuPython.LavaVu_defaultModel)
     addColourMap = _swig_new_instance_method(_LavaVuPython.LavaVu_addColourMap)
     updateColourMap = _swig_new_instance_method(_LavaVuPython.LavaVu_updateColourMap)

lavavu/aserver.py

@@ -11,6 +11,7 @@ import socket
 import asyncio
 import aiohttp
 from aiohttp import web
+import logging
 
 from urllib.parse import unquote
 
@@ -284,6 +285,10 @@ async def _serve(viewer, sock):
     try:
         #Create web application manager
         app = web.Application()
+        #https://github.com/aio-libs/aiohttp/issues/3287
+        #app.logger.manager.disable = 100
+        app.logger.setLevel(logging.CRITICAL)
+
         #Store viewer
         app["viewer"] = viewer
         #Add routes
@@ -348,9 +353,6 @@ if __name__ == '__main__':
     import asyncio
     lv = lavavu.Viewer()
 
-    import logging
-    logging.getLogger('aiohttp.server').setLevel(logging.CRITICAL)
-
     lv.browser()
     lv.app.loop()
     #lv.interactive()

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")
@@ -474,8 +481,20 @@ class Window(_Container):
         self.align = align
         self.wrapper = wrapper
         self.fullscreen = fullscreen
-        if resolution is not None:
-            viewer.output_resolution = resolution
+        if resolution is None:
+            #Default to largest of 640x480 or output res / 2
+            resolution = [0,0]
+            resolution[0] = max(viewer.output_resolution[0]//2, 640)
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+        elif isinstance(resolution, int):
+            #Passed interger - interpert as width
+            resolution = [resolution,0]
+
+        if resolution[1] == 0:
+            #Width only, set height based on output aspect ratio
+            resolution[1] = int(resolution[0] * viewer.output_resolution[1]/viewer.output_resolution[0])
+
+        viewer.output_resolution = resolution
 
     def html(self):
         #print(self.viewer["resolution"], self.viewer.output_resolution)
@@ -1670,13 +1689,26 @@ class _ControlFactory(object):
         """
         if not is_notebook():
             return
-        #Find matching viewer id, redisplay all that match
+        from IPython.display import display,HTML,Javascript
+        display(Javascript(self.redisplay_call()))
+
+    def redisplay_call(self):
+        """Update the active viewer image if any
+        Applies changes made in python to the viewer and forces a redisplay
+        """
+        #Find matching viewer id, redisplay first  match
+        ids = self.active_viewers()
+        return ';'.join('_wi["{0}"].redisplay()'.format(i) for i in ids)
+
+    def active_viewers(self):
+        """Return matching active viewer IDs
+        """
+        #Find matching viewer ids, all that match
+        ids = []
         for idx,obj in enumerate(windows):
             if obj == self._target():
-                viewerid = winids[idx]
-                from IPython.display import display,HTML,Javascript
-                #display(Javascript('_wi["{0}"].redisplay();'.format(viewerid)))
-                display(HTML('<script>_wi["{0}"].redisplay();</script>'.format(viewerid)))
+                ids.append(winids[idx])
+        return ids
 
     def update(self):
         """Update the control values from current viewer data

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