lavavu 1.9.0__tar.gz → 1.9.6__tar.gz

{lavavu-1.9.0/lavavu.egg-info → lavavu-1.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.0
+Version: 1.9.6
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -215,6 +215,7 @@ License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
+Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
 Dynamic: license-file
 
@@ -223,7 +224,7 @@ Dynamic: license-file
 [![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.9.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.6)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -236,7 +237,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -259,13 +260,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -282,7 +280,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -291,14 +294,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.6}/README.md

@@ -3,7 +3,7 @@
 [![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.9.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.6)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -16,7 +16,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -39,13 +39,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -62,7 +59,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -71,14 +73,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.6}/lavavu/control.py

@@ -1689,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-1.9.0 → lavavu-1.9.6}/lavavu/html/menu.js

@@ -123,7 +123,12 @@ function menu_addctrls(menu, obj, viewer, onchange) {
     //Check if it has been set on the target object
     if (prop in obj) {
       //console.log(prop + " ==> " + JSON.stringify(viewer.dict[prop]));
-      menu_addctrl(menu, obj, viewer, prop, onchange);
+      try {
+        //Catch errors and continue gracefully
+        menu_addctrl(menu, obj, viewer, prop, onchange);
+      } catch(e) {
+        console.log("Error adding control to menu: " + e);
+      }
 
     } else {
       //Save list of properties without controls
@@ -159,9 +164,9 @@ function menu_addctrls(menu, obj, viewer, onchange) {
 
 function menu_addcmaps(menu, obj, viewer, onchange) {
   //Colourmap editing menu
-  if (viewer.cgui.prmenu) viewer.cgui.removeFolder(viewer.cgui.prmenu);
-  if (viewer.cgui.cmenu) viewer.cgui.removeFolder(viewer.cgui.cmenu);
-  if (viewer.cgui.pomenu) viewer.cgui.removeFolder(viewer.cgui.pomenu);
+  if (viewer.cgui.prmenu) viewer.cgui.remove(viewer.cgui.prmenu);
+  if (viewer.cgui.cmenu) viewer.cgui.remove(viewer.cgui.cmenu);
+  if (viewer.cgui.pomenu) viewer.cgui.remove(viewer.cgui.pomenu);
   viewer.cgui.prmenu = viewer.cgui.addFolder("Properties");
   viewer.cgui.cmenu = viewer.cgui.addFolder("Colours");
   viewer.cgui.pomenu = viewer.cgui.addFolder("Positions");

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

{lavavu-1.9.0 → lavavu-1.9.6}/lavavu/lavavu.py

@@ -53,6 +53,7 @@ import weakref
 import asyncio
 import quaternion as quat
 import platform
+import matplotlib
 
 if sys.version_info[0] < 3:
     print("Python 3 required. LavaVu no longer supports Python 2.7.")
@@ -610,12 +611,12 @@ class Object(dict):
         return key in self.dict
 
     def __repr__(self):
-        return str(self.ref)
+        return self.__str__()
 
     def __str__(self):
         #Default string representation
         self.parent._get() #Ensure in sync
-        return '{\n' + str('\n'.join(['  %s=%s' % (k,json.dumps(v)) for k,v in self.dict.items()])) + '\n}\n'
+        return '{\n' + str('\n'.join(['  %s=%s' % (k,json.dumps(v)) for k,v in self.dict.items()])) + '\n}'
 
     #Interface for setting filters
     def include(self, *args, **kwargs):
@@ -1144,7 +1145,12 @@ class Object(dict):
             #Re-arrange to array of [r,g,b,a] values
             data = numpy.dstack((data[0],data[1],data[2]))
 
-        self._loadScalar(data, LavaVuPython.lucRGBAData)
+        #Use the shape as dims for texture image data
+        if len(data.shape) > 1:
+            width, height =  data.shape[1], data.shape[0]
+            depth = 4 #4 channel RGBA
+
+        self._loadScalar(data, LavaVuPython.lucRGBAData, width, height, depth)
 
 
     def luminance(self, data):
@@ -1271,6 +1277,8 @@ class Object(dict):
             self.ref.colourMap = data.ref
             data = None
         else:
+            if isinstance(data, matplotlib.colors.Colormap):
+                data = matplotlib_cmap(data)
             if data is None:
                 self.parent._get() #Ensure in sync
                 cmid = self["colourmap"]
@@ -2739,7 +2747,7 @@ class Viewer(dict):
 
     """
 
-    def __init__(self, *args, resolution=None, binpath=None, context="default", port=8080, threads=False, **kwargs):
+    def __init__(self, *args, resolution=None, binpath=None, context=None, port=8080, threads=False, **kwargs):
         """
         Create and init viewer instance
 
@@ -2776,7 +2784,9 @@ class Viewer(dict):
         self._collections = {}
         self.validate = True #Property validation flag
         self.recording = None
-        self.context = os.environ.get('LV_CONTEXT', context)
+        self.context = context
+        if self.context is None:
+            self.context = os.environ.get('LV_CONTEXT', 'default')
 
         #Exit handler to clean up threads
         #(__del__ does not always seem to get called on termination)
@@ -4177,7 +4187,7 @@ class Viewer(dict):
         from IPython.display import display,HTML,Javascript
         display(Javascript(js + code))
 
-    def video(self, filename="", resolution=(0,0), fps=30, quality=0, encoder="h264", player=None, options={}, **kwargs):
+    def video(self, filename="", resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -4204,6 +4214,9 @@ class Viewer(dict):
             If omitted will use default settings, can fine tune settings in kwargs
         encoder : str
             Name of encoder to use, eg: "h264" (default), "mpeg"
+        embed : bool
+            Set to true to embed the video file rather than link to url
+            Not recommended for large videos, default is False
         player : dict
             Args to pass to the player when the video is finished, eg:
             {"width" : 800, "height", 400, "params": "controls autoplay"}
@@ -4218,12 +4231,11 @@ class Viewer(dict):
         recorder : Video(object)
             Context manager object that controls the video recording
         """
-        return Video(self, filename, resolution, fps, quality, encoder, player, options, **kwargs)
+        return Video(self, filename, resolution, fps, quality, encoder, embed, player, options, **kwargs)
 
-    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder="h264", player=None, options={}, **kwargs):
+    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
+        my_func.__doc__
         """
-        TODO: Fix to use pyAV
-
         Record a video of the model by looping through all time steps
 
         Shows the generated video inline within an ipython notebook.
@@ -4235,21 +4247,12 @@ class Viewer(dict):
 
         Parameters
         ----------
-        filename : str
-            Name of the file to save, if not provided a default will be used
         start : int
             First timestep to record, if not specified will use first available
         end : int
             Last timestep to record, if not specified will use last available
-        resolution : list or tuple
-            Video resolution in pixels [x,y]
-        fps : int
-            Frames to output per second of video
-        quality : int
-            Encoding quality, 1=low, 2=medium(default), 3=high, higher quality reduces
-            encoding artifacts at cost of larger file size
-        **kwargs :
-            Any additional keyword args will also be passed as options to the encoder
+
+        All other parameters same as video()
         """
 
         try:
@@ -4257,7 +4260,7 @@ class Viewer(dict):
             if end == 0: end = len(steps)
             steps = steps[start:end]
             from tqdm.notebook import tqdm
-            with Video(self, filename, resolution, fps, quality, encoder, player, options, **kwargs):
+            with Video(self, filename, resolution, fps, quality, encoder, embed, player, options, **kwargs):
                 for s in tqdm(steps, desc='Rendering loop'):
                     self.timestep(s)
                     self.render()
@@ -4476,10 +4479,10 @@ class Viewer(dict):
                 for key in ["translate", "rotate", "xyzrotate", "fov", "focus"]:
                     if key in src:
                         dst[key] = copy.copy(src[key])
-                        #Round down arrays to max 3 decimal places
+                        #Round down arrays to max 6 decimal places
                         try:
                             for r in range(len(dst[key])):
-                                dst[key][r] = round(dst[key][r], 3)
+                                dst[key][r] = round(dst[key][r], 6)
                         except:
                             #Not a list/array
                             pass
@@ -5405,37 +5408,44 @@ def player(filename, params="controls autoplay loop", **kwargs):
 
     if is_notebook():
         from IPython.display import display,HTML,Video,Javascript
-        import uuid
-        vid = 'video_' + str(uuid.uuid4())[:8]
 
         # Fallback - replace url on gadi and similar jupyterhub installs with 
         # fixed working directory that doesn't match notebook dir
         # check the video tag url and remove subpath on 404 error
-        display(Javascript(f"""
-        function video_error(el) {{
-            let url = el.src;
-            console.log("Bad video url: " + url);
-            let toppath = "/files/home/"
-            let baseurl = url.substring(0, url.indexOf(toppath)+toppath.length);
-            let endurl = url.substring(url.indexOf("{filename}"));
-            let fixed = baseurl + endurl;
-            if (url != fixed) {{
-              console.log("Replaced video url: " + fixed);
-              el.src = fixed;
+        onerror = """{
+          let url = this.src;
+          console.log('Error in video url: ' + url);
+          var urlp = new window.URL(url);
+          let toppath = '/files/home/';
+          let startidx = urlp.pathname.indexOf(toppath);
+          if (startidx < 0) {
+            toppath = '/files/';
+            startidx = urlp.pathname.indexOf(toppath);
+          }
+          if (startidx >= 0) {
+            let filename = urlp.pathname.split('/').pop();
+            let base = urlp.pathname.substring(0, startidx+toppath.length);
+            urlp.pathname = base + filename;
+            if (url != urlp.href) {
+              console.log('Replaced video url: ' + urlp.href);
+              this.src = urlp.href;
               //Also fix download link
-              document.getElementById('link_{vid}').href = fixed;
-            }} else {{
-              console.log("Not replacing video url, no change: " + fixed);
-            }}
-        }}
-        """))
-
-        #Embed player
-        filename = os.path.relpath(filename)
-        display(Video(url=filename, html_attributes=f'id="{vid}" onerror="video_error(this)"' + params, **kwargs))
+              let link = document.getElementById('link_' + this.id);
+              if (link) link.href = urlp.href;
+            }
+          }
+        }"""
+
+        if "embed" in kwargs:
+            #Not needed if embedding
+            onerror = ""
 
-        #Add download link
-        display(HTML(f'<a id="link_{vid}" href="{filename}" download>Download Video</a>'))
+        #Display player and download link
+        import uuid
+        vid = 'video_' + str(uuid.uuid4())[:8]
+        filename = os.path.relpath(filename)
+        display(Video(filename=filename, html_attributes=f'id="{vid}" onerror="{onerror}" ' + params, **kwargs),
+                HTML(f'<a id="link_{vid}" href="{filename}" download>Download Video</a>'))
 
 #Class for managing video animation recording
 class Video(object):
@@ -5455,7 +5465,7 @@ class Video(object):
     ...         lv.rotate('y', 10) # doctest: +SKIP
     ...         lv.render()        # doctest: +SKIP
     """
-    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder="h264", player=None, options={}, **kwargs):
+    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -5482,6 +5492,9 @@ class Video(object):
             Video resolution in pixels [x,y]
         encoder : str
             Name of encoder to use, eg: "h264" (default), "mpeg"
+        embed : bool
+            Set to true to embed the video file rather than link to url
+            Not recommended for large videos, default is False
         player : dict
             Args to pass to the player when the video is finished, eg:
             {"width" : 800, "height", 400, "params": "controls autoplay"}
@@ -5516,6 +5529,8 @@ class Video(object):
                 self.player = {"width": self.resolution[0]//2, "height": self.resolution[1]//2}
             else:
                 self.player = {}
+        if embed:
+            self.player["embed"] = True
         self.encoder = encoder
         self.options = options
         #Also include extra args

{lavavu-1.9.0 → lavavu-1.9.6/lavavu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.0
+Version: 1.9.6
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -215,6 +215,7 @@ License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
+Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
 Dynamic: license-file
 
@@ -223,7 +224,7 @@ Dynamic: license-file
 [![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.9.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.6)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -236,7 +237,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -259,13 +260,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -282,7 +280,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -291,14 +294,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.6}/lavavu.egg-info/SOURCES.txt

@@ -26,11 +26,6 @@ lavavu.egg-info/entry_points.txt
 lavavu.egg-info/requires.txt
 lavavu.egg-info/top_level.txt
 lavavu/html/LavaVu-amalgamated.css
-lavavu/html/LavaVu-amalgamated.js
-lavavu/html/LavaVu.data
-lavavu/html/LavaVu.html
-lavavu/html/LavaVu.js
-lavavu/html/LavaVu.wasm
 lavavu/html/OK-min.js
 lavavu/html/baseviewer.js
 lavavu/html/control.css
@@ -41,7 +36,6 @@ lavavu/html/draw.js
 lavavu/html/drawbox.js
 lavavu/html/emscripten-template.js
 lavavu/html/emscripten.css
-lavavu/html/emscripten.js
 lavavu/html/favicon.ico
 lavavu/html/gl-matrix-min.js
 lavavu/html/gui.css

{lavavu-1.9.0 → lavavu-1.9.6}/lavavu.egg-info/requires.txt

@@ -1,4 +1,5 @@
 numpy>=1.18
 aiohttp
 jupyter_server_proxy
+matplotlib
 numpy-quaternion

{lavavu-1.9.0 → lavavu-1.9.6}/requirements.txt

@@ -1,5 +1,6 @@
 numpy >= 1.18
 aiohttp
 jupyter_server_proxy
+matplotlib
 numpy-quaternion
 

{lavavu-1.9.0 → lavavu-1.9.6}/setup.py

@@ -19,7 +19,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.9.0"
+version = "1.9.6"
 
 """
 To release a new verison:
@@ -383,19 +383,9 @@ if __name__ == "__main__":
             #EGL and OSMesa are built as optional extra modules
             '''
             if find_library('OpenGL') and find_library('EGL') and check_libraries(['OpenGL', 'EGL'], ['GL/gl.h', 'EGL/egl.h']):
-                #EGL for offscreen OpenGL without X11/GLX - works only with NVidia currently
-                ex = Extension('lavavu.egl._LavaVuPython',
-                                define_macros = defines + [('HAVE_EGL', '1')],
-                                include_dirs = inc_dirs,
-                                libraries = libs + ['OpenGL', 'EGL'],
-                                library_dirs = lib_dirs,
-                                runtime_library_dirs = rt_lib_dirs,
-                                extra_compile_args = cflags,
-                                extra_link_args = ldflags,
-                                extra_objects=extra_objects,
-                                sources = srcs)
-                extensions.append(ex)
             ''';
+
+            #OSMesa built as optional extra module
             if find_library('OSMesa') and check_libraries(['OSMesa'], ['GL/osmesa.h']):
                 #OSMesa for software rendered offscreen OpenGL, build as additional extension
                 ex = Extension('lavavu.osmesa._LavaVuPython',
@@ -411,7 +401,12 @@ if __name__ == "__main__":
                 extensions.append(ex)
 
             #Main extension - use X11 or GLFW
-            if ("LV_GLFW" in os.environ and find_library('glfw')
+            if ("LV_EGL" in os.environ and find_library('OpenGL') and find_library('EGL')
+            and check_libraries(['OpenGL', 'EGL'], ['GL/gl.h', 'EGL/egl.h'])):
+                #EGL for offscreen OpenGL without X11/GLX - works with NVidia and latest Mesa
+                defines += [('HAVE_EGL', '1')]
+                libs += ['OpenGL', 'EGL']
+            elif ("LV_GLFW" in os.environ and find_library('glfw')
             and check_libraries(['glfw'], ['GLFW/glfw3.h'])):
                 #Use GLFW
                 defines += [('HAVE_GLFW', '1')]