lavavu 1.8.62__tar.gz → 1.8.74__tar.gz

{lavavu-1.8.62 → lavavu-1.8.74}/Makefile

@@ -129,7 +129,7 @@ vpath %.cc src
 #When releasing, just build with the clean version from setup.py
 ifneq ($(LV_RELEASE), 1)
 #Otherwise update version using git tag
-TMP := $(shell $(PYTHON) _getversion.py)
+TMP := $(shell $(PYTHON) setup.py version)
 endif
 
 SRC := $(wildcard src/*.cpp) $(wildcard src/Main/*Viewer.cpp) $(wildcard src/jpeg/*.cpp)
@@ -186,24 +186,25 @@ $(LIBRARY): $(ALLOBJS) | paths
 	$(CXX) -o $(LIBRARY) $(LIBBUILD) $(LIBINSTALL) $(ALLOBJS) $(LIBS)
 
 #Emscripten build steps...
-#curl -L https://github.com/emscripten-core/emsdk/archive/2.0.14.tar.gz --output emscripten.tar.gz
-#tar -zxf emscripten.tar.gz
-#rm emscripten.tar.gz
-#cd emsdk-2.0.14/
+#(em++/emcc now included in ubuntu but fails when we try and add LIBPNG)
+#curl -L https://github.com/emscripten-core/emsdk/archive/refs/heads/main.zip --output emscripten.zip
+#unzip emscripten.zip
+#rm emscripten.zip
+#cd emsdk-main/
 #./emsdk install latest
 #./emsdk activate latest
 #source emsdk_env.sh
 #cd ../LavaVu
 #make emscripten -j5
-#source ~/emsdk-2.0.14/emsdk_env.sh
 emscripten: DEFINES = -DGLES2 -DHAVE_GLFW -DUSE_FONTS
 emscripten: CXX = em++
 emscripten: CC = emcc
 emscripten: LIBS = -ldl -lpthread -lm -lGL -lglfw
-emscripten: LINKFLAGS = -s USE_WEBGL2=1 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s DISABLE_EXCEPTION_CATCHING=0 -s LEGACY_GL_EMULATION=0 -s USE_GLFW=3 -s ALLOW_MEMORY_GROWTH=1 -s FETCH=1 -s EXTRA_EXPORTED_RUNTIME_METHODS=[FS]
+emscripten: LINKFLAGS = -lidbfs.js -s ASYNCIFY -s USE_WEBGL2=1 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s DISABLE_EXCEPTION_CATCHING=0 -s LEGACY_GL_EMULATION=0 -s USE_GLFW=3 -s ALLOW_MEMORY_GROWTH=1 -s FETCH=1 -s EXPORTED_RUNTIME_METHODS=[FS]
 #emscripten:  -s MODULARIZE=1 -s 'EXPORT_NAME="createLavaVuModule"' #Would need this to load multiple instances on a page without IFrames
 emscripten: LINKFLAGS += --preload-file lavavu/dict.json@dict.json --preload-file lavavu/shaders@/shaders  --preload-file lavavu/font.bin@font.bin
 EM_FLAGS =
+#--use-port=libpng
 #EM_FLAGS = -pthread
 ifeq ($(CONFIG),debug)
 	#Debugging - better detection of segfaults etc

lavavu-1.8.74/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: lavavu
+Version: 1.8.74
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

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

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

lavavu-1.8.74/lavavu.egg-info/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: lavavu
+Version: 1.8.74
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

{lavavu-1.8.62 → lavavu-1.8.74}/lavavu.egg-info/SOURCES.txt

@@ -4,27 +4,12 @@ Makefile
 README.md
 pyproject.toml
 requirements.txt
-setup.cfg
 setup.py
-lavavu/LavaVuPython.py
-lavavu/__init__.py
-lavavu/__main__.py
-lavavu/amalgamate.py
-lavavu/aserver.py
-lavavu/control.py
-lavavu/convert.py
 lavavu/dict.json
 lavavu/font.bin
-lavavu/lavavu.py
-lavavu/points.py
-lavavu/server.py
-lavavu/tracers.py
-lavavu/vutils.py
 lavavu.egg-info/PKG-INFO
 lavavu.egg-info/SOURCES.txt
 lavavu.egg-info/dependency_links.txt
-lavavu.egg-info/entry_points.txt
-lavavu.egg-info/requires.txt
 lavavu.egg-info/top_level.txt
 lavavu/html/LavaVu-amalgamated.css
 lavavu/html/OK-min.js

lavavu-1.8.74/pyproject.toml

@@ -0,0 +1,82 @@
+[project]
+name = "lavavu"
+authors = [
+    {name = "Owen Kaluza", email = "owen@kaluza.id.au"},
+]
+description = "Python interface to LavaVu OpenGL 3D scientific visualisation utilities"
+readme = "README.md"
+license = {file = "LICENSE.md"}
+classifiers = [
+    'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
+    'Intended Audience :: Developers',
+    'Intended Audience :: Science/Research',
+    'Operating System :: POSIX :: Linux',
+    'Operating System :: MacOS',
+    'Operating System :: Microsoft :: Windows',
+    'Environment :: X11 Applications',
+    'Environment :: MacOS X :: Cocoa',
+    'Environment :: Win32 (MS Windows)',
+    'Topic :: Multimedia :: Graphics :: 3D Rendering',
+    'Topic :: Scientific/Engineering :: Visualization',
+    'Development Status :: 5 - Production/Stable',
+    'Programming Language :: C++',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3 :: Only',
+    'Framework :: Jupyter',
+    'Framework :: IPython'
+]
+requires-python = ">=3.5"
+dynamic = ["version", "dependencies"]
+#dynamic = ["version", "description", "dependencies"]
+
+[project.urls]
+Documentation = "https://lavavu.github.io"
+Source = "https://github.com/lavavu/LavaVu"
+
+#[project.scripts]
+[project.gui-scripts]
+LavaVu = 'lavavu.__main__:main'
+
+[tool.setuptools]
+include-package-data = false
+#packages = ["lavavu"]
+#package-dir = {'lavavu' = 'lavavu'}
+#exclude = ["html", "shaders"]
+
+[tool.setuptools.packages.find]
+include = ["lavavu*"]
+exclude = ["html*", "shaders*"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+version = {attr = "setup.version"}
+
+[tool.setuptools.package-data]
+lavavu = ['font.bin', 'dict.json', 'shaders/*', 'html/*', '*.dll']
+
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = [
+    "wheel",
+    "setuptools>=61.2",
+    "packaging",
+    "numpy==1.13.3; python_version=='3.6'",
+    "numpy==1.14.5; python_version=='3.7'",
+    "numpy==1.24.4; python_version=='3.8'",
+    "numpy==2.0.0; python_version=='3.9'",
+    "numpy==2.0.0; python_version=='3.10'",
+    "numpy==2.0.0; python_version=='3.11'",
+    "numpy==2.0.0; python_version=='3.12'",
+]
+
+[project.entry-points."gui_scripts"]
+LV = 'lavavu.__main__:main'
+LavaVu = 'lavavu.__main__:main'
+

lavavu-1.8.74/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

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

@@ -1,11 +1,7 @@
 import os
 import sys
 from setuptools import setup
-from setuptools.command.install import install
-from setuptools.command.develop import develop
-from setuptools.command.egg_info import egg_info
 from setuptools import Extension
-from setuptools import find_packages
 try:
     from setuptools import _distutils as distutils
     from setuptools._distutils import sysconfig
@@ -23,7 +19,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.8.62"
+version = "1.8.74"
 
 """
 To release a new verison:
@@ -97,7 +93,7 @@ if sys.argv[-1] == 'check':
     webbrowser.open("docs/index.html")
     sys.exit()
 #Run with "tag" arg to create a release tag
-if sys.argv[-1] == 'release':
+elif sys.argv[-1] == 'release':
     #Commit and push docs
     wd = os.getcwd()
     os.chdir("docs")
@@ -117,13 +113,13 @@ if sys.argv[-1] == 'release':
     sys.exit()
 
 #Run with "publish" arg to upload the release
-if sys.argv[-1] == 'publish':
+elif sys.argv[-1] == 'publish':
     os.system("python setup.py sdist")
     os.system("twine upload dist/lavavu-%s.tar.gz" % version)
     sys.exit()
 
 # Just output the wheel name for current arch + environment
-if sys.argv[-1] == 'wheelname':
+elif sys.argv[-1] == 'wheelname':
     # https://stackoverflow.com/a/60644659/866759
     from setuptools.dist import Distribution
     lavavu = Extension('lavavu', [])
@@ -136,6 +132,26 @@ if sys.argv[-1] == 'wheelname':
     print(wheel_name)
     sys.exit()
 
+elif sys.argv[-1] == 'version':
+    #Replaces _getversion.py, 
+    #Get current git tag version
+    git_version = os.popen("git describe --tags --always 2> /dev/null").read()
+    if len(git_version) == 0:
+        #Just report the current release version
+        #Still need to write if file doesn't exist
+        if os.path.exists('src/version.cpp'):
+            print(version)
+            exit()
+    else:
+        #Strip trailing newline
+        version = version.rstrip('\r\n')
+        #Replace first - with .
+        version = version.replace('-', '.', 1)
+
+    #Update version.cpp
+    write_version()
+    exit()
+
 #Get extra lib and include dirs
 inc_dirs = []
 lib_dirs = []
@@ -257,25 +273,6 @@ if __name__ == "__main__":
         else:
             cflags += ['-g', '-O0']
 
-    #Parallel build
-    num_jobs = 1
-    if not 'arm' in platform.machine():
-        try:
-            num_jobs = os.cpu_count()
-        except AttributeError:
-            import multiprocessing
-            num_jobs = multiprocessing.cpu_count()
-
-    if num_jobs > 1:
-        try:
-            from numpy.distutils.ccompiler import CCompiler_compile
-            from setuptools._distutils import ccompiler
-            ccompiler.CCompiler.compile = CCompiler_compile
-            os.environ['NPY_NUM_BUILD_JOBS'] = str(num_jobs)
-            print('Using parallel build, jobs: ', num_jobs)
-        except ImportError:
-            print("Numpy not found, parallel compile not available")
-
     #OS Specific
     if P == 'Windows':
         #Windows - include all dependencies
@@ -337,12 +334,14 @@ if __name__ == "__main__":
         cflags += ['-std=c++0x']
         #Build sqlite3
         #Don't compile when just running 'setup.py egg_info'
-        if len(sys.argv) < 2 or sys.argv[1] == 'egg_info':
-            sqlite3 = 'build/src/sqlite3/sqlite3.o'
+        sqlite3 = 'build/src/sqlite3/sqlite3.o'
+        if len(sys.argv) < 2 or sys.argv[1] == 'egg_info' or os.path.exists(sqlite3):
+            pass
         else:
-            sqlite3 = build_sqlite3(sqlite3_path)
+            #sqlite3 = build_sqlite3(sqlite3_path)
+            build_sqlite3(sqlite3_path)
         inc_dirs += [sqlite3_path]
-        extra_objects = sqlite3
+        extra_objects = [sqlite3]
 
         # Optional external libraries - check if installed
         if find_library('png') and check_libraries(['png', 'z'], ['png.h', 'zlib.h']):
@@ -436,9 +435,9 @@ if __name__ == "__main__":
     #Binary package data for wheels
     #Package_data works for wheels(binary) only - so add everything we need for the wheels here
     #(MANIFEST.in contents will be included with sdist only unless include_package_data is enabled)
-    package_data = {'lavavu': ['font.bin', 'dict.json', 'shaders/*', 'html/*']}
-    if P == 'Windows':
-        package_data['lavavu'] += ['*.dll']
+    #package_data = {'lavavu': ['font.bin', 'dict.json', 'shaders/*', 'html/*']}
+    #if P == 'Windows':
+    #    package_data['lavavu'] += ['*.dll']
 
     dist_name = "lavavu"
     #Rename package so can be distributed as an alternative (eg: lavavu-osmesa)
@@ -446,46 +445,8 @@ if __name__ == "__main__":
         dist_name = os.environ['LV_PACKAGE']
 
     setup(name = dist_name,
-          author            = "Owen Kaluza",
-          author_email      = "owen.kaluza@monash.edu",
-          url               = "https://github.com/lavavu/LavaVu",
-          version           = version,
-          license           = "LGPL-3",
-          description       = "Python interface to LavaVu OpenGL 3D scientific visualisation utilities",
-          long_description  = 'See https://github.com/lavavu/LavaVu for more info',
-          packages          = ['lavavu'],
-          package_dir       = {'lavavu': 'lavavu'},
-          package_data      = package_data,
-          install_requires  = requirements,
-          platforms         = ['any'],
-          entry_points      = {
-              'gui_scripts': [
-                  'LV = lavavu.__main__:main',
-                  'LavaVu = lavavu.__main__:main'
-              ]
-          },
-          #Use below to include files from MANIFEST.in or specify package_data, not both
-          #include_package_data = True,
-          classifiers = [
-            'Intended Audience :: Developers',
-            'Intended Audience :: Science/Research',
-            'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
-            'Operating System :: POSIX :: Linux',
-            'Operating System :: MacOS',
-            'Operating System :: Microsoft :: Windows',
-            'Environment :: X11 Applications',
-            'Environment :: MacOS X :: Cocoa',
-            'Environment :: Win32 (MS Windows)',
-            'Topic :: Multimedia :: Graphics :: 3D Rendering',
-            'Topic :: Scientific/Engineering :: Visualization',
-            'Development Status :: 5 - Production/Stable',
-            'Programming Language :: C++',
-            'Programming Language :: Python :: 3.6',
-            'Programming Language :: Python :: 3.7',
-            'Programming Language :: Python :: 3.8',
-            'Framework :: Jupyter',
-            'Framework :: IPython',
-          ],
+          version = version,
           ext_modules = [lv]
           )
 
+

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

@@ -35,6 +35,9 @@
 
 #include "DrawingObject.h"
 #include "Model.h"
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
 
 DrawingObject::DrawingObject(Session& session, std::string name, std::string props, unsigned int id)
   : session(session), dbid(id), properties(session.globals, session.defaults)
@@ -240,6 +243,14 @@ TextureData* DrawingObject::useTexture(Texture_Ptr tex)
     {
       //printf("Load texture from property\n");
       std::string texfn = properties["texture"];
+#if defined(__EMSCRIPTEN__)
+      for (int i=0; i<100; i++)
+      {
+        if (FileExists(texfn)) break;
+        printf("Waiting for texture to download");
+        emscripten_sleep(100);
+      }
+#endif
       if (texfn.length() > 0 && FileExists(texfn))
       {
         bool flip = properties["fliptexture"];
@@ -283,8 +294,10 @@ TextureData* DrawingObject::useTexture(Texture_Ptr tex)
 
         if (texfn.length() > 0)
           debug_print("Texture File: %s not found!\n", texfn.c_str());
+#if not defined(__EMSCRIPTEN__)
         //If load failed, skip from now on
         properties.data["texture"] = "";
+#endif
       }
     }
     //else