lavavu 1.8.74__cp39-cp39-macosx_11_0_arm64.whl → 1.8.75__cp39-cp39-macosx_11_0_arm64.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,4 +1,4 @@
-lavavu/lavavu.py,sha256=j710i05alXW92-C73OUb_SEZP19IoKB-NAz40Mf-ss8,201005
+lavavu/lavavu.py,sha256=wTa9yyjDRdqdsmJbIEkj0vyrd0_ZElFbPg6_sjn8vd0,201960
 lavavu/vutils.py,sha256=L5TpyGlRHThhGChzaKhB70NQd75o3ctyKhSqZTsxceg,5624
 lavavu/dict.json,sha256=Zb1QnJOsx2DK3M1tRSXRUQ5PjEpOo3SMM3tTNHIKMPs,52722
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
@@ -6,10 +6,10 @@ lavavu/points.py,sha256=jRRtA6CrcA46Y2jUJmkxnIiVoMC5a14xEd_ojhmjhz4,5871
 lavavu/LavaVuPython.py,sha256=Ki8G9XYHkyfqmxG6BohDWomvSn5eJwG9cHqGzEhZDDs,33131
 lavavu/tracers.py,sha256=0dB6v9Jg5G-IeZxiVFvbPoTycGvyAQBtgyEAZUmq4XU,4257
 lavavu/convert.py,sha256=JT73q32YMchuSIkoH_A0cTUVwfns8fWLGjyWp2A5i5M,35514
-lavavu/control.py,sha256=MWoYWBhqJbq_1GArE79SQAcZ1rINlvl0bx5nV5XTf8U,65568
+lavavu/control.py,sha256=eNocZPc-2Dz-nSty_KRz_9RzLvbU0clJGuAV3qnzxbU,65841
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
 lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
-lavavu/_LavaVuPython.cpython-39-darwin.so,sha256=LMFrDeC6txLrVYBoeGJL8mBXMEiUZi9gkibFEJMpeGs,3792416
+lavavu/_LavaVuPython.cpython-39-darwin.so,sha256=l6F5AR0eSevzVtllb0_O_WwzqyVAkBDnpcaf3U12Nyc,3792416
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
@@ -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=T3AQXMNZwPWpWfdrBe6hjUyZh98_ds15SBjZc1Y-KwY,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=wGb9ImUAQJUTBINSx_Z49LHYKjFqnKf-yeNRdifsLY4,107
-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.75.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.8.75.dist-info/RECORD,,
+lavavu-1.8.75.dist-info/WHEEL,sha256=9pNdQPFvBqtyjygr-ufETb3aWCkPwzIHIZFTeqcm3gw,107
+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/METADATA,sha256=vbAX7HwcXmqSTfS-IoCW0sXO_FadSG5zig8-kmH-Kfk,18238

{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: cp39-cp39-macosx_11_0_arm64