lavavu 1.8.60__tar.gz → 1.8.62__tar.gz

{lavavu-1.8.60/lavavu.egg-info → lavavu-1.8.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lavavu
-Version: 1.8.60
+Version: 1.8.62
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Home-page: https://github.com/lavavu/LavaVu
 Author: Owen Kaluza

{lavavu-1.8.60 → lavavu-1.8.62}/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.8.53)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.62)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.8.60 → lavavu-1.8.62}/lavavu/LavaVuPython.py

@@ -492,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)

{lavavu-1.8.60 → lavavu-1.8.62}/lavavu/dict.json

@@ -1903,7 +1903,7 @@
   },
   "title": {
     "default": "",
-    "target": "global",
+    "target": "view",
     "type": "string",
     "desc": "Title to display at top centre of view",
     "strict": true,

{lavavu-1.8.60 → lavavu-1.8.62}/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.60/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-1.8.60 → lavavu-1.8.62}/lavavu/lavavu.py

@@ -3287,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

{lavavu-1.8.60 → lavavu-1.8.62/lavavu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lavavu
-Version: 1.8.60
+Version: 1.8.62
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Home-page: https://github.com/lavavu/LavaVu
 Author: Owen Kaluza

{lavavu-1.8.60 → lavavu-1.8.62}/setup.py

@@ -23,7 +23,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.8.60"
+version = "1.8.62"
 
 """
 To release a new verison:

{lavavu-1.8.60 → lavavu-1.8.62}/src/DrawingObject.cpp

@@ -233,6 +233,9 @@ TextureData* DrawingObject::useTexture(Texture_Ptr tex)
       //printf("Load texture from cached copy on drawing object\n");
       tex = texture;
     }
+    //else if (properties.has("cubemap"))
+    //{
+    //}
     else if (properties.has("texture"))
     {
       //printf("Load texture from property\n");

{lavavu-1.8.60 → lavavu-1.8.62}/src/Geometry.cpp

@@ -1400,16 +1400,34 @@ void Geometry::setState(Geom_Ptr g)
         prop = it.value();
       //std::cout << label << " ==> " << prop << std::endl;
 
-      //Special case: string data -> treat as colourmap!
+      //Special case: string data -> treat as texture
       if (prop.is_string())
       {
-        if (g->draw->textureMap && g->draw->textureMap->texture)
+        std::string texfn = prop;
+        //Support multiple textures, load subsequent from custom props
+        if (textures.find(texfn) == textures.end())
         {
-          prog->setUniformi(label, g->draw->textureMap->texture->texture->unit);
-          //std::cerr << label << " : Colourmap texture available on unit " << g->draw->colourMap->texture->texture->unit << std::endl;
+          //Add a new empty texture container
+          textures[texfn] = std::make_shared<ImageLoader>();
+          textures[texfn]->fn = texfn;
+          //std::cout << "LOADED ADDITIONAL TEX " << label << " : " << texfn << std::endl;
+
+          //NOTE: hasTexture() on geom objects will return False, unless the
+          //drawing object has a texture set too, so need to set ["texture"] = True at least
+        }
+        //else
+          //std::cout << "FOUND ADDITIONAL TEX " << label << " : " << textures[texfn]->empty() << std::endl;
+        auto the_texture = textures[texfn];
+        TextureData* texture_data = draw->useTexture(the_texture);
+        if (texture_data)
+        {
+          if (!texture_data->unit)
+            texture_data->unit = textures.size()+2; //Set the texture unit, starting from 2 (1 reserved for 3d)
+          prog->setUniformi(label, texture_data->unit);
+          //printf("Texture unit set %d \n", texture_data->unit);
         }
         else
-          std::cerr << label << " : No colourmap texture available! " << prop << std::endl;
+          printf("Texture load failed, data is NULL!\n");
       }
       else if (!prop.is_null())
       {
@@ -1441,6 +1459,8 @@ void Geometry::setState(Geom_Ptr g)
   prog->setUniformf("uOpaque", allopaque || g->opaque);
   prog->setUniformf("uFlat", flat);
   //std::cout << i << " OPAQUE: " << allopaque << " || " << g->opaque << std::endl;
+  prog->setUniformi("uFrame", session.frame);
+  prog->setUniformf("uTime", session.time);
 
   if (texture)
     prog->setUniform("uTexture", (int)texture->unit);

{lavavu-1.8.60 → lavavu-1.8.62}/src/Geometry.h

@@ -318,7 +318,7 @@ public:
   unsigned int height;
   unsigned int depth;
   bool opaque;   //Flag for opaque geometry, render first, don't depth sort
-  Texture_Ptr texture;
+  Texture_Ptr texture;               //Default texture
   lucGeometryType type;   //Holds the object type
   int step = -1; //Holds the timestep
   unsigned int voffset = 0; //Vertex offset in VBO
@@ -556,6 +556,8 @@ protected:
   std::vector<Geom_Ptr> records;
   std::vector<Geom_Ptr> geom;
   std::vector<bool> hidden;
+  //Additional textures (stored by filename)
+  std::map<std::string, Texture_Ptr> textures;
   unsigned int elements;
   unsigned int drawcount;
   DrawingObject* cached;

{lavavu-1.8.60 → lavavu-1.8.62}/src/GraphicsUtil.cpp

@@ -747,11 +747,13 @@ void ImageLoader::loadPNG()
   if (!file)
   {
     debug_print("Cannot open '%s'\n", fn.full.c_str());
+    printf("Cannot open '%s'\n", fn.full.c_str());
     return;
   }
   newSource();
   source->pixels = (GLubyte*)read_png(file, source->channels, source->width, source->height);
   source->allocated = true; //Allocated by read_png()
+  //printf("Loaded, width %d, fn '%s'\n", source->width, fn.full.c_str());
 
   file.close();
 }

{lavavu-1.8.60 → lavavu-1.8.62}/src/LavaVu.cpp

@@ -2455,6 +2455,8 @@ void LavaVu::display(bool redraw)
 #endif
   {
     //Loop through all viewports and display each
+    //TODO: Using > 1 viewport KILLS the framerate < 10%
+    //Biggest drop is (a) reload, second is (b) viewSelect
     int selview = view;
     for (unsigned int v=0; v<amodel->views.size(); v++)
     {
@@ -2462,23 +2464,32 @@ void LavaVu::display(bool redraw)
       GL_Error_Check;
 
       //Require reload of object data for multiple viewports
-      if (amodel->views.size() > 1)
-        amodel->reloadRedraw(NULL, true);
+      //Only seems to be required for old databases, see: uw1-viewports test
+      //if (!viewer->visible && amodel->views.size() > 1)
+      if (amodel->views.size() > 1 && !aview->is3d)
+      {
+        //amodel->reload(); //(a)
+        //Flag redraw on all objects in passed viewport
+        for (unsigned int i=0; i < aview->objects.size(); i++)
+          amodel->reloadRedraw(aview->objects[i], true);
+      }
 
       // Default non-stereo render
       aview->projection(EYE_CENTRE);
-      drawSceneBlended(v > 0);
+      drawSceneBlended();
     }
 
     if (view != selview)
-    viewSelect(selview);
+      viewSelect(selview); //(b)
   }
 
+  auto now = std::chrono::system_clock::now();
+  std::chrono::duration<float> diff = now-frametime;
+  session.frame++;
+
   //Calculate FPS
   if (session.global("fps"))
   {
-    auto now = std::chrono::system_clock::now();
-    std::chrono::duration<float> diff = now-frametime;
     framecount++;
     if (diff.count() > 1.0f)
     {
@@ -2491,6 +2502,10 @@ void LavaVu::display(bool redraw)
     displayText(ss.str(), 1);
   }
 
+  //Get current time since started
+  diff = now-session.start;
+  session.time = (float)diff.count();
+
   if ((viewer->visible && !viewer->imagemode) || message[0] == ':')
   {
     //Print current info message (displayed for one frame only)
@@ -3626,6 +3641,13 @@ void LavaVu::addTimeStep(int step, std::string properties)
   amodel->setTimeStep(step);
 }
 
+void LavaVu::addViewport(float x, float y, float w, float h, bool replace, std::string properties)
+{
+  if (!amodel) return;
+  amodel->addViewport(x, y, w, h, replace, properties);
+  viewSelect(amodel->views.size()-1);
+}
+
 void LavaVu::setObject(DrawingObject* target, std::string properties)
 {
   if (!amodel || !target) return;

{lavavu-1.8.60 → lavavu-1.8.62}/src/LavaVu.h

@@ -236,6 +236,7 @@ public:
   std::string getState();
   std::string getTimeSteps();
   void addTimeStep(int step, std::string properties="");
+  void addViewport(float x, float y, float w, float h, bool replace, std::string properties);
 
   void setObject(DrawingObject* target, std::string properties);
   DrawingObject* createObject(std::string properties);

{lavavu-1.8.60 → lavavu-1.8.62}/src/LavaVuPython_wrap.cxx

@@ -24304,6 +24304,83 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_LavaVu_addViewport(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  LavaVu *arg1 = (LavaVu *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  bool arg6 ;
+  std::string arg7 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
+  PyObject *swig_obj[7] ;
+  
+  if (!SWIG_Python_UnpackTuple(args, "LavaVu_addViewport", 7, 7, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LavaVu, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LavaVu_addViewport" "', argument " "1"" of type '" "LavaVu *""'"); 
+  }
+  arg1 = reinterpret_cast< LavaVu * >(argp1);
+  ecode2 = SWIG_AsVal_float(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "LavaVu_addViewport" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(swig_obj[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "LavaVu_addViewport" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(swig_obj[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "LavaVu_addViewport" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(swig_obj[4], &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "LavaVu_addViewport" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  ecode6 = SWIG_AsVal_bool(swig_obj[5], &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "LavaVu_addViewport" "', argument " "6"" of type '" "bool""'");
+  } 
+  arg6 = static_cast< bool >(val6);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(swig_obj[6], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "LavaVu_addViewport" "', argument " "7"" of type '" "std::string""'"); 
+    }
+    arg7 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  {
+    try {
+      (arg1)->addViewport(arg2,arg3,arg4,arg5,arg6,arg7);
+    } catch (const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_LavaVu_setObject(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   LavaVu *arg1 = (LavaVu *) 0 ;
@@ -31476,6 +31553,7 @@ static PyMethodDef SwigMethods[] = {
 	 { "LavaVu_getTimeSteps", _wrap_LavaVu_getTimeSteps, METH_O, NULL},
 	 { "LavaVu_addTimeStep", _wrap_LavaVu_addTimeStep, METH_VARARGS, NULL},
 	 { "LavaVu_resetViews", _wrap_LavaVu_resetViews, METH_VARARGS, NULL},
+	 { "LavaVu_addViewport", _wrap_LavaVu_addViewport, METH_VARARGS, NULL},
 	 { "LavaVu_setObject", _wrap_LavaVu_setObject, METH_VARARGS, NULL},
 	 { "LavaVu_createObject", _wrap_LavaVu_createObject, METH_VARARGS, NULL},
 	 { "LavaVu_getObject", _wrap_LavaVu_getObject, METH_VARARGS, NULL},
@@ -31879,6 +31957,7 @@ static PyMethodDef SwigMethods_proxydocs[] = {
 	 { "LavaVu_getTimeSteps", _wrap_LavaVu_getTimeSteps, METH_O, NULL},
 	 { "LavaVu_addTimeStep", _wrap_LavaVu_addTimeStep, METH_VARARGS, NULL},
 	 { "LavaVu_resetViews", _wrap_LavaVu_resetViews, METH_VARARGS, NULL},
+	 { "LavaVu_addViewport", _wrap_LavaVu_addViewport, METH_VARARGS, NULL},
 	 { "LavaVu_setObject", _wrap_LavaVu_setObject, METH_VARARGS, NULL},
 	 { "LavaVu_createObject", _wrap_LavaVu_createObject, METH_VARARGS, NULL},
 	 { "LavaVu_getObject", _wrap_LavaVu_getObject, METH_VARARGS, NULL},

{lavavu-1.8.60 → lavavu-1.8.62}/src/Model.cpp

@@ -498,6 +498,21 @@ int Model::addFigure(std::string name, const std::string& state)
   return figures.size()-1;
 }
 
+void Model::addViewport(float x, float y, float w, float h, bool replace, std::string properties)
+{
+  //Create the view object and add to list
+  View* v = views.back();
+  if (!replace)
+  {
+    v = new View(session, x, y);
+    views.push_back(v);
+  }
+  v->w = w;
+  v->h = h;
+  session.parseSet(v->properties, properties);
+  debug_print("-- Viewport created at %f,%f %f x %f\n", v->x, v->y, v->w, v->h);
+}
+
 void Model::addObject(DrawingObject* obj)
 {
   //Check for duplicate names / objects
@@ -1992,6 +2007,13 @@ void Model::writeGeometry(Database& outdb, Geometry* g, DrawingObject* obj, int
       if (infostream) std::cerr << step << "] Writing geometry (type[" << data_type << "] * " << block->size()
                 << ") for object : " << obj->dbid << " => " << obj->name() << std::endl;
       writeGeometryRecord(outdb, g->type, (lucGeometryDataType)data_type, obj->dbid, data[i], block.get(), step);
+
+      /*/TODO: Has texture? write as values/rgba?
+      //if (g->hasTexture()
+      if (g->texture->loaded)
+      {
+
+      }*/
     }
     for (unsigned int j=0; j<data[i]->values.size(); j++)
     {

{lavavu-1.8.60 → lavavu-1.8.62}/src/Model.h

@@ -143,6 +143,7 @@ public:
   bool loadFigure(int fig, bool preserveGlobals=false);
   void storeFigure();
   int addFigure(std::string name="", const std::string& state="");
+  void addViewport(float x, float y, float w, float h, bool replace, std::string properties);
   void addObject(DrawingObject* obj);
   ColourMap* addColourMap(std::string name="", std::string colours="", std::string properties="");
   void updateColourMap(ColourMap* colourMap, std::string colours="", std::string properties="");

{lavavu-1.8.60 → lavavu-1.8.62}/src/Session.cpp

@@ -9,6 +9,9 @@ Session::Session() : shaders(), eng0(std::random_device()()), eng1(0), dist(0, 1
   // Saves arrays of x,y points on circle for set segment count
   x_coords = NULL;
   y_coords = NULL;
+  frame = 0;
+  time = 0.0;
+  start = std::chrono::system_clock::now();
 }
 
 Session::~Session()

{lavavu-1.8.60 → lavavu-1.8.62}/src/Session.h

@@ -33,6 +33,11 @@ public:
   std::vector<TimeStep*> timesteps; //Active model timesteps
   int gap;
 
+  //Animation
+  int frame;
+  std::chrono::time_point<std::chrono::system_clock> start;
+  float time;
+
   //Geometry
   float min[3], max[3], dims[3];
   float *x_coords, *y_coords;  // Saves arrays of x,y points on circle for set segment count

{lavavu-1.8.60 → lavavu-1.8.62}/src/View.cpp

@@ -1182,7 +1182,18 @@ void View::drawOverlay()
     Colour colour = session.fonts.setFont(properties, adjust);
     if (colour.a == 0.0) colour = textColour; //Use the user defined font colour if valid, otherwise default print colour
     session.fonts.colour = colour;
-    session.fonts.print(0.5 * (w - session.fonts.printWidth(title.c_str())), h - 3 - session.fonts.printWidth("W"), title.c_str());
+    //Left justify
+    if (title.at(0) == '-')
+      session.fonts.print(session.fonts.printWidth("I"),
+                          h - 3 - session.fonts.printWidth("W"), title.c_str()+1);
+    //Right justify
+    else if (title.at(0) == '+')
+      session.fonts.print(w - session.fonts.printWidth(title.c_str()),
+                          h - 3 - session.fonts.printWidth("W"), title.c_str()+1);
+    //Centred
+    else
+      session.fonts.print(0.5 * (w - session.fonts.printWidth(title.c_str())),
+                          h - 3 - session.fonts.printWidth("W"), title.c_str());
   }
 
   GL_Error_Check;

lavavu-1.8.62/src/version.cpp

@@ -0,0 +1,2 @@
+#include "version.h"
+const std::string version = "1.8.62";

lavavu-1.8.60/src/version.cpp

@@ -1,2 +0,0 @@
-#include "version.h"
-const std::string version = "1.8.60";