lavavu 1.8.45__cp38-cp38-win_amd64.whl → 1.8.62__cp38-cp38-win_amd64.whl

lavavu/LavaVuPython.py

@@ -1,13 +1,10 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 4.0.2
+# This file was automatically generated by SWIG (https://www.swig.org).
+# Version 4.1.0
 #
-# Do not make changes to this file unless you know what you are doing--modify
+# Do not make changes to this file unless you know what you are doing - modify
 # the SWIG interface file instead.
 
 from sys import version_info as _swig_python_version_info
-if _swig_python_version_info < (2, 7, 0):
-    raise RuntimeError("Python 2.7 or later required")
-
 # Import the low-level C/C++ module
 if __package__ or "." in __name__:
     from . import _LavaVuPython
@@ -32,10 +29,10 @@ def _swig_repr(self):
 
 def _swig_setattr_nondynamic_instance_variable(set):
     def set_instance_attr(self, name, value):
-        if name == "thisown":
-            self.this.own(value)
-        elif name == "this":
+        if name == "this":
             set(self, name, value)
+        elif name == "thisown":
+            self.this.own(value)
         elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
             set(self, name, value)
         else:
@@ -92,7 +89,6 @@ class SwigPyIterator(object):
 
 # Register SwigPyIterator in _LavaVuPython:
 _LavaVuPython.SwigPyIterator_swigregister(SwigPyIterator)
-
 SHARED_PTR_DISOWN = _LavaVuPython.SHARED_PTR_DISOWN
 class Line(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
@@ -137,7 +133,6 @@ class Line(object):
 
 # Register Line in _LavaVuPython:
 _LavaVuPython.Line_swigregister(Line)
-
 class Array(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -181,7 +176,6 @@ class Array(object):
 
 # Register Array in _LavaVuPython:
 _LavaVuPython.Array_swigregister(Array)
-
 class List(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -225,7 +219,6 @@ class List(object):
 
 # Register List in _LavaVuPython:
 _LavaVuPython.List_swigregister(List)
-
 class GeomList(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -269,7 +262,6 @@ class GeomList(object):
 
 # Register GeomList in _LavaVuPython:
 _LavaVuPython.GeomList_swigregister(GeomList)
-
 class ByteArray(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -313,7 +305,6 @@ class ByteArray(object):
 
 # Register ByteArray in _LavaVuPython:
 _LavaVuPython.ByteArray_swigregister(ByteArray)
-
 lucMinType = _LavaVuPython.lucMinType
 lucLabelType = _LavaVuPython.lucLabelType
 lucPointType = _LavaVuPython.lucPointType
@@ -367,7 +358,6 @@ class Colour(object):
 
 # Register Colour in _LavaVuPython:
 _LavaVuPython.Colour_swigregister(Colour)
-
 class OpenGLViewer(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -421,7 +411,6 @@ class DrawingObject(object):
 
 # Register DrawingObject in _LavaVuPython:
 _LavaVuPython.DrawingObject_swigregister(DrawingObject)
-
 class Model(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -429,13 +418,12 @@ class Model(object):
     figures = property(_LavaVuPython.Model_figures_get, _LavaVuPython.Model_figures_set)
     figure = property(_LavaVuPython.Model_figure_get, _LavaVuPython.Model_figure_set)
 
-    def __init__(self, session: "Session &"):
+    def __init__(self, session):
         _LavaVuPython.Model_swiginit(self, _LavaVuPython.new_Model(session))
     __swig_destroy__ = _LavaVuPython.delete_Model
 
 # Register Model in _LavaVuPython:
 _LavaVuPython.Model_swigregister(Model)
-
 class ColourMap(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -451,9 +439,6 @@ class ColourMap(object):
 
 # Register ColourMap in _LavaVuPython:
 _LavaVuPython.ColourMap_swigregister(ColourMap)
-ColourMap_getDefaultMapNames = _LavaVuPython.ColourMap_getDefaultMapNames
-ColourMap_getDefaultMap = _LavaVuPython.ColourMap_getDefaultMap
-
 class GeomData(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -463,13 +448,12 @@ class GeomData(object):
     step = property(_LavaVuPython.GeomData_step_get, _LavaVuPython.GeomData_step_set)
     type = property(_LavaVuPython.GeomData_type_get, _LavaVuPython.GeomData_type_set)
 
-    def __init__(self, draw: "DrawingObject", type: "lucGeometryType"):
+    def __init__(self, draw, type):
         _LavaVuPython.GeomData_swiginit(self, _LavaVuPython.new_GeomData(draw, type))
     __swig_destroy__ = _LavaVuPython.delete_GeomData
 
 # Register GeomData in _LavaVuPython:
 _LavaVuPython.GeomData_swigregister(GeomData)
-
 class LavaVu(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -480,8 +464,8 @@ class LavaVu(object):
     binpath = property(_LavaVuPython.LavaVu_binpath_get, _LavaVuPython.LavaVu_binpath_set)
     unprocessed = property(_LavaVuPython.LavaVu_unprocessed_get, _LavaVuPython.LavaVu_unprocessed_set)
 
-    def __init__(self, binpath: "std::string", havecontext: "bool"=False, omegalib: "bool"=False):
-        _LavaVuPython.LavaVu_swiginit(self, _LavaVuPython.new_LavaVu(binpath, havecontext, omegalib))
+    def __init__(self, binpath, havecontext=False):
+        _LavaVuPython.LavaVu_swiginit(self, _LavaVuPython.new_LavaVu(binpath, havecontext))
     __swig_destroy__ = _LavaVuPython.delete_LavaVu
     destroy = _swig_new_instance_method(_LavaVuPython.LavaVu_destroy)
     resize = _swig_new_instance_method(_LavaVuPython.LavaVu_resize)
@@ -508,6 +492,7 @@ class LavaVu(object):
     getTimeSteps = _swig_new_instance_method(_LavaVuPython.LavaVu_getTimeSteps)
     addTimeStep = _swig_new_instance_method(_LavaVuPython.LavaVu_addTimeStep)
     resetViews = _swig_new_instance_method(_LavaVuPython.LavaVu_resetViews)
+    addViewport = _swig_new_instance_method(_LavaVuPython.LavaVu_addViewport)
     setObject = _swig_new_instance_method(_LavaVuPython.LavaVu_setObject)
     createObject = _swig_new_instance_method(_LavaVuPython.LavaVu_createObject)
     getObject = _swig_new_instance_method(_LavaVuPython.LavaVu_getObject)
@@ -555,14 +540,13 @@ class LavaVu(object):
 
 # Register LavaVu in _LavaVuPython:
 _LavaVuPython.LavaVu_swigregister(LavaVu)
-
 rawImageWrite = _LavaVuPython.rawImageWrite
 class VideoEncoder(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
     filename = property(_LavaVuPython.VideoEncoder_filename_get, _LavaVuPython.VideoEncoder_filename_set)
 
-    def __init__(self, fn: "std::string const &", fps: "int", quality: "int"=3):
+    def __init__(self, fn, fps, quality=3):
         _LavaVuPython.VideoEncoder_swiginit(self, _LavaVuPython.new_VideoEncoder(fn, fps, quality))
     __swig_destroy__ = _LavaVuPython.delete_VideoEncoder
     open = _swig_new_instance_method(_LavaVuPython.VideoEncoder_open)
@@ -574,5 +558,3 @@ class VideoEncoder(object):
 # Register VideoEncoder in _LavaVuPython:
 _LavaVuPython.VideoEncoder_swigregister(VideoEncoder)
 
-
-

lavavu/amalgamate.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 
+#sudo apt install emscripten
+#make clean
+#make emscripten
+
 #Creates amalgamated js and css for emscripten web viewer
 filenames = ["dat.gui.min.js", "OK-min.js", "baseviewer.js", "menu.js", "emscripten.js", "LavaVu.js"]
 with open("html/LavaVu-amalgamated.js", "w") as text_file:

lavavu/convert.py

@@ -58,7 +58,7 @@ def default_sample_grid(vrange, res=8):
     print("Sample grid RES:",RES)
     return RES
 
-def points_to_volume(verts, res=8, kdtree=False, normed=False, clamp=None, boundingbox=None):
+def points_to_volume(verts, weights=None, res=8, kdtree=False, normed=True, clamp=None, boundingbox=None):
     """
     Convert object vertices to a volume by interpolating points to a grid
 
@@ -68,7 +68,7 @@ def points_to_volume(verts, res=8, kdtree=False, normed=False, clamp=None, bound
 
     Default is to use numpy.histogramdd method, pass kdtree=True to use scipy.spatial.KDTree
 
-    TODO: support colour data too, converted density field becomes alpha channel
+    TODO: support colour data too, converted density field becomes alpha channel (actually, use weights)
 
     Returns
     -------
@@ -80,11 +80,11 @@ def points_to_volume(verts, res=8, kdtree=False, normed=False, clamp=None, bound
 
     """
     if kdtree:
-        return points_to_volume_tree(verts, res)
+        return points_to_volume_tree(verts, weights, res)
     else:
-        return points_to_volume_histogram(verts, res, normed, clamp, boundingbox)
+        return points_to_volume_histogram(verts, weights, res, normed, clamp, boundingbox)
 
-def points_to_volume_histogram(verts, res=8, normed=False, clamp=None, boundingbox=None):
+def points_to_volume_histogram(verts, weights, res=8, normed=True, clamp=None, boundingbox=None):
     """
     Using numpy.histogramdd to create 3d histogram volume grid
     (Easily the fastest, but less control over output)
@@ -102,12 +102,18 @@ def points_to_volume_histogram(verts, res=8, normed=False, clamp=None, boundingb
         vrange = numpy.array(boundingbox[1]) - numpy.array(boundingbox[0])
     RES = default_sample_grid(vrange, res)
 
+    if weights is not None:
+        weights = weights.ravel()
+        #Normalise (should be done by histogramdd anyway if normed=True)
+        weights = (weights - weights.min()) / (weights.max() - weights.min())
+        #print(verts.shape, weights.shape, weights.min(), weights.max())
+
     #H, edges = numpy.histogramdd(verts, bins=RES)
     if boundingbox is None:
-        H, edges = numpy.histogramdd(verts, bins=RES, normed=normed) #density=True for newer numpy
+        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, normed=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, bins=RES, range=rg, normed=normed) #density=True for newer numpy
+        H, edges = numpy.histogramdd(verts, weights=weights, bins=RES, range=rg, normed=normed) #density=True for newer numpy
 
     #Reverse ordering X,Y,Z to Z,Y,X for volume data
     values = H.transpose()
@@ -196,7 +202,7 @@ def points_to_volume_tree(verts, res=8):
     return (values, lmin, lmax)
 
 
-def points_to_volume_3D(vol, objects, res=8, kdtree=False, blur=0, pad=None, normed=False, clamp=None):
+def points_to_volume_3D(vol, objects, res=8, kdtree=False, blur=0, pad=None, normed=True, clamp=None, weights=None):
     """
     Interpolate points to grid and load into passed volume object
 
@@ -205,16 +211,19 @@ def points_to_volume_3D(vol, objects, res=8, kdtree=False, blur=0, pad=None, nor
     points_to_volume()
     """
     lv = vol.parent #Get the viewer from passed object
-    lv.hide(objects) #Hide the converted objects
+    #lv.hide(objects) #Hide the converted objects
 
     #Get vertices from lavavu objects
-    pverts, bb_all = lv.get_all_vertices(objects)
+    if weights:
+        pverts, bb_all, weights = lv.get_all_vertices(objects, weights)
+    else:
+        pverts, bb_all = lv.get_all_vertices(objects)
 
     #blur = False
     #Use bounding box of full model?
     #vmin, vmax, vrange = min_max_range([lv["min"], lv["max"]])
     #bb_all == (vmin, vmax)
-    vdata, vmin, vmax = points_to_volume(pverts, res, kdtree, normed, clamp, bb_all)
+    vdata, vmin, vmax = points_to_volume(pverts, weights, res, kdtree, normed, clamp, bb_all)
 
     if blur > 0:
         if pad == None:
@@ -234,7 +243,7 @@ def points_to_volume_3D(vol, objects, res=8, kdtree=False, blur=0, pad=None, nor
     vol.values(values)
     vol.vertices((vmin, vmax))
 
-def points_to_volume_4D(vol, objects, res=8, kdtree=False, blur=False, normed=False, clamp=None):
+def points_to_volume_4D(vol, objects, res=8, kdtree=False, blur=0, pad=None, normed=True, clamp=None, weights=None):
     """
     Interpolate points to grid at each timestep
 
@@ -247,8 +256,11 @@ def points_to_volume_4D(vol, objects, res=8, kdtree=False, blur=False, normed=Fa
     for step in lv.steps:
         print("TIMESTEP:",step)
         lv.timestep(step)
+        #TODO: timestep data not changing!!!
+        print(lv.step)
+        lv.display((200,150))
         
-        points_to_volume_3D(vol, objects, res, kdtree, blur, normed, clamp)
+        points_to_volume_3D(vol, objects, res, kdtree, blur, pad, normed, clamp, weights)
 
 def colour2rgb(c):
     return [c & 255, (c >> 8) & 255, (c >> 16) & 255]
@@ -804,7 +816,7 @@ def export_any(filepath, source, name=None):
             f.write(gltf[fn])
     """
 
-def read_any(filepath, lv):
+def read_any(filepath, lv, scaling=None):
     """
     Load using trimesh, supports GLTF etc
 
@@ -823,10 +835,21 @@ def read_any(filepath, lv):
             idx = int(idx)
 
         if idx == 0:
-            tris = lv.triangles(name)
+            #Texturing for multiple objects is broken when loaded with triangles() renderer
+            #tris = lv.triangles(name)
+            #Use surface() instead and textures work as expected
+            tris = lv.surface(name)
         else:
             tris.append()
 
+        if scaling:
+            import numpy as np
+            matrix = np.eye(4)
+            matrix[0, 0] = scaling
+            matrix[1, 1] = scaling
+            matrix[2, 2] = scaling
+            geometry.apply_transform(matrix)
+
         tris.vertices(geometry.vertices)
         tris.normals(geometry.vertex_normals)
         tris.indices(geometry.faces)
@@ -841,13 +864,25 @@ def read_any(filepath, lv):
             tris.colours(geometry.visual.vertex_colors)
         #Load single colour material
         elif hasattr(geometry.visual, "material"):
-            #print("HAVE MATERIAL")
-            #print(geometry.visual.material)
-            #print(geometry.visual.material.baseColorFactor)
-            if idx == 0:
-                #Can set as prop, but only works for single el
-                tris["colour"] = geometry.visual.material.baseColorFactor
-            else:
-                tris.colours(geometry.visual.material.baseColorFactor)
+            if hasattr(geometry.visual.material, "baseColorTexture"):
+                #print("HAVE TEXTURE")
+                #print(geometry.visual.material)
+                #if hasattr(geometry.visual, "image"):
+                #print(geometry.visual.image)
+                #print(dir(geometry.visual.material))
+                #print(hasattr(geometry.visual, "material"))
+                #print(geometry.visual.material.baseColorTexture)
+                tris.texture(geometry.visual.material.baseColorTexture)
+            elif hasattr(geometry.visual.material, "baseColorFactor"):
+                #print("HAVE MATERIAL")
+                #print(geometry.visual.material)
+                #print(geometry.visual.material.baseColorFactor)
+                if idx == 0:
+                    #Can set as prop, but only works for single el
+                    tris["colour"] = geometry.visual.material.baseColorFactor
+                else:
+                    tris.colours(geometry.visual.material.baseColorFactor)
+
+        idx += 1 #Inc index?
 
     return tris

lavavu/dict.json

@@ -1445,6 +1445,22 @@
       true
     ]
   },
+  "rotation": {
+    "default": [
+      0.0,
+      0.0,
+      0.0,
+      1.0
+    ],
+    "target": "object,shape",
+    "type": "quaternion",
+    "desc": "Shape rotation about Y axis, applies to all shape objects, [x,y,z,y] or [X,Y,Z]",
+    "strict": true,
+    "redraw": 0,
+    "control": [
+      true
+    ]
+  },
   "colourbar": {
     "default": false,
     "target": "colourbar",
@@ -1680,7 +1696,7 @@
     ],
     "target": "view",
     "type": "quaternion",
-    "desc": "Camera rotation quaternion [x,y,z,w]",
+    "desc": "Camera rotation quaternion [x,y,z,w], if applied to an object rotates the object, can be quaternion or Euler angles [x,y,z] in this case",
     "strict": true,
     "redraw": 0,
     "control": [
@@ -1839,6 +1855,22 @@
       true
     ]
   },
+  "port": {
+    "default": [
+      0,
+      0,
+      1.0,
+      1.0
+    ],
+    "target": "view",
+    "type": "real[4]",
+    "desc": "Viewport position and dimensions array [x,y,width,height] in normalised coords [0,1]",
+    "strict": true,
+    "redraw": 0,
+    "control": [
+      false
+    ]
+  },
   "min": {
     "default": [
       0,
@@ -1871,7 +1903,7 @@
   },
   "title": {
     "default": "",
-    "target": "global",
+    "target": "view",
     "type": "string",
     "desc": "Title to display at top centre of view",
     "strict": true,

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

lavavu/lavavu.py

@@ -335,30 +335,51 @@ def matplotlib_colourmap(name, samples=16):
     list
         List of colours ready to be loaded by colourmap()
     """
+    if not isinstance(name, str):
+        #Assume passed a Matplotlib colourmap object directly
+        return matplotlib_cmap(name, samples)
     try:
         import matplotlib.pyplot as plt
         cmap = plt.get_cmap(name)
-        if hasattr(cmap, 'colors'):
-            #Reduce length? many MPL maps have 256 samples,
-            #unnecessary since we are already interpolating
-            #Can disable this by setting samples=None
-            data = cmap.colors
-            if len(data) == 256 and samples is not None:
-                subsample = int(256/samples)
-                data = data[0::subsample]
-            return data
-        #Get colour samples when no list provided
-        if samples == None: samples = 16
-        colours = []
-        for i in range(samples):
-            pos = i/float(samples-1)
-            colours.append(cmap(pos))
-        return colours
+        return matplotlib_cmap(cmap, samples)
     except (Exception) as e:
         #Assume single colour value, just return it
         return name
     return []
 
+def matplotlib_cmap(cmap, samples=16):
+    """
+    Import a colourmap from a matplotlib
+
+    Parameters
+    ----------
+    cmap : Matplotlib colormap object
+        The matplotlib colourmap to import
+    samples : int
+        Number of samples to take for LinearSegmentedColormap type
+
+    Returns
+    -------
+    list
+        List of colours ready to be loaded by colourmap()
+    """
+    if hasattr(cmap, 'colors'):
+        #Reduce length? many MPL maps have 256 samples,
+        #unnecessary since we are already interpolating
+        #Can disable this by setting samples=None
+        data = cmap.colors
+        if len(data) == 256 and samples is not None:
+            subsample = int(256/samples)
+            data = data[0::subsample]
+        return data
+    #Get colour samples when no list provided
+    if samples == None: samples = 16
+    colours = []
+    for i in range(samples):
+        pos = i/float(samples-1)
+        colours.append(cmap(pos))
+    return colours
+
 #Wrapper class for a set of properties
 #handles property updating via internal dict
 class Properties(dict):
@@ -513,7 +534,7 @@ class Object(dict):
         if key == "colourmap":
             if isinstance(value, LavaVuPython.ColourMap) or isinstance(value, ColourMap):
                 value = value.name #Use name instead of object when setting colourmap on object
-            elif not self.parent.app.getColourMap(value):
+            elif not self.parent.app.getColourMap(value if value is not None else 0):
                 #Not found by passed id/name/ref, use the value to set map data
                 cmap = self.colourmap(value)
                 value = cmap.name
@@ -1108,7 +1129,7 @@ class Object(dict):
             self.parent.app.clearTexture(self.ref)
             return
         if isinstance(data, str):
-            self.parent.app.setTexture(self.ref, data)
+            self.parent.app.setTexture(self.ref, data, flip, filter, bgr)
             return
 
         data = _convert(data)
@@ -2000,14 +2021,10 @@ class _LavaVuWrapper(LavaVuPython.LavaVu):
 
         #OpenGL context creation options
         havecontext = False
-        omegalib = False
         self.use_moderngl = False
         self.use_moderngl_window = False
         if "provided" in context:
             havecontext = True
-        elif "omegalib" in context:
-            havecontext = True
-            omegalib = True
         elif "moderngl" in context:
             if moderngl is not None:
                 havecontext = True
@@ -2022,7 +2039,7 @@ class _LavaVuWrapper(LavaVuPython.LavaVu):
         self.wnd = None
         self.ctx = None
 
-        super(_LavaVuWrapper, self).__init__(binpath, havecontext, omegalib)
+        super(_LavaVuWrapper, self).__init__(binpath, havecontext)
 
         self._thread = threaded
         self._q = []
@@ -2661,7 +2678,7 @@ class Viewer(dict):
             OpenGL context type, *"default"* will create a context and window based on available configurations.
             *"provided"* specifies a user provided context, set this if you have already created and activated the context. 
             *"moderngl"* creates a context in python using the moderngl module (experimental). 
-            *"moderngl."* creates a context and a window in python using the moderngl module (experimental) specify class after separator, eg: moderngl.headless, moderngl.pyglet, moderngl.pyqt5. *"omegalib"* is for use in multi-display VR mode.
+            *"moderngl."* creates a context and a window in python using the moderngl module (experimental) specify class after separator, eg: moderngl.headless, moderngl.pyglet, moderngl.pyqt5.
         port : int
             Web server port, open server on specific port for control/interaction
             Viewer will be run in a separate thread, all rendering will be done in this thread
@@ -3270,6 +3287,28 @@ class Viewer(dict):
         #Return wrapper obj
         return obj
 
+    def viewport(self, x=0.0, y=0.0, width=1.0, height=1.0, replace=False, **kwargs):
+        """
+        Add a viewport object
+
+        Parameters
+        ----------
+        x : float
+            x offset as fraction of window size [0,1]
+        y : float
+            y offset as fraction of window size [0,1]
+        width : float
+            width as fraction of window size [0,1]
+        height : float
+            height as fraction of window size [0,1]
+        replace : bool
+            Set to True to replace the active viewport instead of adding a new viewport
+
+        Subsequent kwargs are passed as properties dict
+        """
+        #Adds a new viewport, kwargs passed to properties dict
+        self.app.addViewport(x, y, width, height, replace, _convert_args(kwargs))
+
     def add(self, name=None, **kwargs):
         """
         Add a visualisation object
@@ -4883,7 +4922,11 @@ class DrawData(object):
         #Attempt to return an array with the correct shape
         dims = [0.,0.,0.]
         if "dims" in self._obj.dict:
-            dims = self._obj.dict["dims"][::-1]
+            dims = self._obj.dict["dims"]
+            if isinstance(dims, list) or isinstance(dims, tuple):
+                dims = dims[::-1] #Reversed
+            else:
+                dims = [dims] #Scalar to list
         if self.data.width > 1:
             #print("OBJECT W,H,D: ",self.data.width, self.data.height, self.data.depth)
             #dims = [self.data.depth, self.data.height, self.data.width]

{lavavu-1.8.45.dist-info → lavavu-1.8.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.45
+Version: 1.8.62
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Home-page: https://github.com/lavavu/LavaVu
 Author: Owen Kaluza
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Jupyter
 Classifier: Framework :: IPython
 License-File: LICENSE.md
-Requires-Dist: numpy (>=1.11)
+Requires-Dist: numpy >=1.11
 Requires-Dist: aiohttp
 Requires-Dist: jupyter-server-proxy
 

{lavavu-1.8.45.dist-info → lavavu-1.8.62.dist-info}/RECORD

@@ -1,8 +1,8 @@
-lavavu/LavaVuPython.py,sha256=qIY8brmfEEtCyO83E0SEagZgFFtDnp0NB2QK_xHzq8A,34022
-lavavu/_LavaVuPython.cp38-win_amd64.pyd,sha256=qCZkAZtvg0WY29o6mKodA4BpgRw6yOWTX0sB0E75flY,3114496
+lavavu/LavaVuPython.py,sha256=I27VeH0GoGE2uIZ92UgoysGnQe5peBW_e-YEsA4Y1Q0,33691
+lavavu/_LavaVuPython.cp38-win_amd64.pyd,sha256=o2OOYnaXa9OkekJ0h1A0D4Lvrl7uSF1JkG8J2HHsa8o,3101696
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
-lavavu/amalgamate.py,sha256=zRij7CoRMAP5xne36GcwhyCdHo3Msvtsm8BmwbBUawg,538
+lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
 lavavu/aserver.py,sha256=2b6Sj-dxoL2IfvNLolqhC-yhMv4m4Xw7I6jYO-DDTbE,12286
 lavavu/avcodec-58.dll,sha256=Yrvy4kZBIyUw-d1yhU32wxwRSNwkQeU7HvL_sBbpisY,50103296
 lavavu/avdevice-58.dll,sha256=VgLrv5NWSD4u-hlKHkTE5ciLMUNTxlZljLavR9AlTkQ,2760192
@@ -10,11 +10,11 @@ lavavu/avfilter-7.dll,sha256=cKwN6yDGzmf6XB5HXM1QVV4fc_HfhjAd3dBvV5YVdbk,1095731
 lavavu/avformat-58.dll,sha256=PB5bD4mq62vBBY8tdagrGaYD2AQjaz3Lgc6wpp0UIr0,11094016
 lavavu/avutil-56.dll,sha256=VsAhkveudbox9BBMuLEjnJ6yzoyJDoy2SzgPnMgMug0,866304
 lavavu/control.py,sha256=TyisNZc6RuuO1O1IHW4b4BqK4oil9uuxWNfKEp-04v0,67267
-lavavu/convert.py,sha256=TowKrDaD50Tf5wypEy0DEV4yviwVRESdb6H48_JDEfg,34641
-lavavu/dict.json,sha256=_XB5sbeJQlGL8erS-HeojwLsTGt_7M-jiDIIWg6Bnmk,54502
+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=mLcv9riuBaCpu9lR8v0GZh_Bn634lxoLnUcuwd16dSY,205310
+lavavu/lavavu.py,sha256=Ix2bOQG450uRVjGXGpWwsJRFWZAP112TgXyiLK_1x2E,206683
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -46,7 +46,7 @@ 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=6pfyeJ1oIcW3fW5ASRmvRu1umDqqoYLjAR2XwglU-Vc,1565
+lavavu/html/webview.html,sha256=9k5imVr3B2J4PYgvsYPI6OwUavpV6F-IisB7twqfHCI,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.45.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.45.dist-info/METADATA,sha256=Z69ODTOFSXyodbxgzbCwdcnsqAMWwZ94yPavkT5a1pE,1346
-lavavu-1.8.45.dist-info/WHEEL,sha256=F2aDWtWrilNM3-px1vBtJOEd7aRVTetQfFuDYmYbAUQ,100
-lavavu-1.8.45.dist-info/entry_points.txt,sha256=LgxRUxcd5pH9w3yYRyTYyGm8xwAlnyvS_CKaisWHDWc,70
-lavavu-1.8.45.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.45.dist-info/RECORD,,
+lavavu-1.8.62.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.8.62.dist-info/METADATA,sha256=K9x1MZydFjc2kAEMMJbU9zZb7MoZBYGeYOmZnDaI1gM,1344
+lavavu-1.8.62.dist-info/WHEEL,sha256=3SeyPJ5-Us2Ct5GSftUVKtLSlm-bNefW4m5qd0GLzww,100
+lavavu-1.8.62.dist-info/entry_points.txt,sha256=LgxRUxcd5pH9w3yYRyTYyGm8xwAlnyvS_CKaisWHDWc,70
+lavavu-1.8.62.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.8.62.dist-info/RECORD,,

{lavavu-1.8.45.dist-info → lavavu-1.8.62.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-win_amd64