lavavu 1.8.74__cp312-cp312-win_amd64.whl → 1.8.75__cp312-cp312-win_amd64.whl

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/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.75/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

lavavu/lavavu.py

@@ -3899,6 +3899,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 +3917,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

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

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

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

@@ -1,5 +1,5 @@
 lavavu/LavaVuPython.py,sha256=I27VeH0GoGE2uIZ92UgoysGnQe5peBW_e-YEsA4Y1Q0,33691
-lavavu/_LavaVuPython.cp312-win_amd64.pyd,sha256=B1oMwVHBWjWjy4_JTXl7UUbAdbBuOEewf2XfGQ_lHvo,3103744
+lavavu/_LavaVuPython.cp312-win_amd64.pyd,sha256=pPdA_jKOPAP1h9kKfigHEy_C4Zb1bukkJ5PMpPQ4rvw,3103744
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
 lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
@@ -9,12 +9,12 @@ lavavu/avdevice-58.dll,sha256=VgLrv5NWSD4u-hlKHkTE5ciLMUNTxlZljLavR9AlTkQ,276019
 lavavu/avfilter-7.dll,sha256=cKwN6yDGzmf6XB5HXM1QVV4fc_HfhjAd3dBvV5YVdbk,10957312
 lavavu/avformat-58.dll,sha256=PB5bD4mq62vBBY8tdagrGaYD2AQjaz3Lgc6wpp0UIr0,11094016
 lavavu/avutil-56.dll,sha256=VsAhkveudbox9BBMuLEjnJ6yzoyJDoy2SzgPnMgMug0,866304
-lavavu/control.py,sha256=TyisNZc6RuuO1O1IHW4b4BqK4oil9uuxWNfKEp-04v0,67267
+lavavu/control.py,sha256=QyNNJCeM6MeQhy4lhhb3JGnIUctCKo9JshleVTRUsTI,67547
 lavavu/convert.py,sha256=LBMvZrxJDhJYPbeTJEs7PpBs3zXkeIPtbzHs-Wxr8FI,36402
 lavavu/dict.json,sha256=6WjVWKKKfF5ieZK2AfWldrl4c7BCo8tEgigJR5CpCqQ,55239
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/glfw3.dll,sha256=zI-Qy4RDHQo4mYYgW4QLREz-WZ5l5HCXJzyksyTy0bY,83456
-lavavu/lavavu.py,sha256=Ix2bOQG450uRVjGXGpWwsJRFWZAP112TgXyiLK_1x2E,206683
+lavavu/lavavu.py,sha256=K6ia3i9_YXrPpzioya8bIjNeKUwBgeIeiisKJwZoN1k,207659
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -35,18 +35,18 @@ lavavu/html/control.js,sha256=5f3sKRzF2wRGTbxp6RFjQMPeywqWeaU9kP_A8UJgd8Y,11801
 lavavu/html/dat-gui-light-theme.css,sha256=ltfUmBSxso6IGcqkVxRwcGXRnxMDnuUjj3sSmyFyWLo,1210
 lavavu/html/dat.gui.min.js,sha256=orheAPn_tR1rCQK7KxVCXPmFYpqLT7MGTJ9tG_BsrQo,56993
 lavavu/html/draw.js,sha256=gcdGLddyYmuCMcflIPAFL6LsmOCHVbftd0gL_L9A3xA,86367
-lavavu/html/drawbox.js,sha256=ccQHP36ndK6vNnB5ZH4xHFesO_C8F6VuRf3zUdLlE50,35310
-lavavu/html/emscripten-template.js,sha256=QmAoTH6FhP_jDahCTvQniaEzyZMD6wnqZYtvwmsimms,6317
+lavavu/html/drawbox.js,sha256=Q3z27LaSqpbWM__-rFThDa5M8_e0dAdXLzgetm6qrS0,35629
+lavavu/html/emscripten-template.js,sha256=JyieolnlHOBUQioqNfycVbdKrdwS2RV_ORogG5vWjcc,6319
 lavavu/html/emscripten.css,sha256=xSOf_UBkkq3fPF_8h_YKFLZXUVy8FVOymRgANWQMMLc,1905
 lavavu/html/favicon.ico,sha256=OrIWwvxOSnOCuynrGRUyEIVQng0ZwA9Rrz89S9eiog0,1150
 lavavu/html/gl-matrix-min.js,sha256=-LGye5bMuwoTva7bswxQeewoEaybX7EnZFTlhjXzrB8,23189
 lavavu/html/gui.css,sha256=5sfIpoA-fFIVxEBqEK4cKagF1mnOAMnI4dABk9rj-pU,607
-lavavu/html/menu.js,sha256=kfDeMoLpep6XZFLE8mOMQb9__zguKdsg6G6FPQgbqxc,22075
+lavavu/html/menu.js,sha256=hqmRv_gZsRjGduSOQxpMVVO8M4eEZU1lMiaaX7_bG1s,22111
 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=IeKJ7DI6tCODq_4tJiE7gCGsNWdEigt_99OYrSXYlFA,1565
+lavavu/html/webview.html,sha256=-HGHJ2DY_4xghYa1_eoqthieO67z5dWRW_qohqZGcdY,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.74.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.74.dist-info/METADATA,sha256=W8BS4RpPyU5Nw2Io5aNTlGKG4NTWkoX2Jzd1yisXOsY,18556
-lavavu-1.8.74.dist-info/WHEEL,sha256=3x_bcW68bUAcconjAL7QQrdN9TajBLCHyHJA2sbOuIc,101
-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/RECORD,,
+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=zUKlehupiwlnUEPaWzoeU3i_GPyMnWLKYSUI9sqi8Vs,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.74.dist-info → lavavu-1.8.75.dist-info}/WHEEL

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