PyPI - ProjectiveGeometry23 - Versions diffs - 0.1.0__tar.gz → 1.1.0__tar.gz - Mend

ProjectiveGeometry23 0.1.0tar.gz → 1.1.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

projectivegeometry23-1.1.0/.github/workflows/publish.yml ADDED Viewed

@@ -0,0 +1,87 @@
+name: Build and Publish to PyPI
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  release:
+    types: [published]
+permissions:
+  contents: read
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.12"]
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0  # Fetch full history for setuptools-scm
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build pytest
+          pip install -e .
+      - name: Test package installation
+        run: |
+          python -c "import ProjectiveGeometry23; print('Package imported successfully')"
+          python -c "from ProjectiveGeometry23 import utils; print('Package module imported successfully')"
+      - name: Run tests
+        run: pytest
+      - name: Build package
+        run: python -m build
+      - name: Check distribution
+        run: |
+          python -m pip install --upgrade pip
+          pip install twine
+          twine check dist/*
+  publish:
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published'
+    environment:
+      name: pypi
+      url: https://pypi.org/project/ProjectiveGeometry23
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0  # Fetch full history for setuptools-scm
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+      - name: Build package
+        run: python -m build
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

projectivegeometry23-1.1.0/.github/workflows/test.yml ADDED Viewed

@@ -0,0 +1,24 @@
+name: Test
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+      - name: Run tests
+        run: |
+          python -m unittest discover tests

projectivegeometry23-1.1.0/.gitignore ADDED Viewed

@@ -0,0 +1,129 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+# C extensions
+*.so
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+# Translations
+*.mo
+*.pot
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+# Flask stuff:
+instance/
+.webassets-cache
+# Scrapy stuff:
+.scrapy
+# Sphinx documentation
+docs/_build/
+# PyBuilder
+target/
+# Jupyter Notebook
+.ipynb_checkpoints
+# IPython
+profile_default/
+ipython_config.py
+# pyenv
+.python-version
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+# SageMath parsed files
+*.sage.py
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+# Spyder project settings
+.spyderproject
+.spyproject
+# Rope project settings
+.ropeproject
+# mkdocs documentation
+/site
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+# Pyre type checker
+.pyre/

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/MANIFEST.in RENAMED Viewed

@@ -1,3 +1,4 @@
 include README.md
 include LICENSE
 recursive-include ProjectiveGeometry23 *.py
+include source_detector_geometry.png

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/PKG-INFO RENAMED Viewed

@@ -1,33 +1,29 @@
 Metadata-Version: 2.4
 Name: ProjectiveGeometry23
-Version: 0.1.0
-Summary: Projective geometry in 2D and 3D with homogeneous and Plücker coordinates, projection matrices, and visualization.
+Version: 1.1.0
+Summary: A 2D and 3D projective geometry library with Plücker coordinates and projection matrix, including (X-ray) source-detector geometry model.
 Home-page: https://github.com/aaichert/ProjectiveGeometry23
 Author: Andre Aichert
-Author-email: aaichert@gmail.com
-License: MIT
+Author-email: Andre Aichert <aaichert@gmail.com>
+License-Expression: Apache-2.0
+Keywords: projective-geometry,homogeneous-coordinates,plucker-coordinates,pinhole-camera,projection-matrix,computer-vision,xray-geometry,computed-tomography,camera-calibration,multiple-view-geometry,epipolar-geometry
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering :: Mathematics
+Classifier: Topic :: Scientific/Engineering :: Image Processing
+Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
-Provides-Extra: svg
-Requires-Dist: svg_snip; extra == "svg"
 Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
 Dynamic: requires-python
-Dynamic: summary
 # ProjectiveGeometry23
 ## Projective Geometry of Two- and Three-space

projectivegeometry23-1.1.0/ProjectiveGeometry23/_version.py ADDED Viewed

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)
+__commit_id__ = commit_id = 'g25c3f32d1'

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/ProjectiveGeometry23/svg_utils.py RENAMED Viewed

@@ -1,5 +1,5 @@
 """
-Interactive drawing of points, lines in 2d and 3D, as well as vidualizing X-ray source-detector geometries.
+Interactive drawing of points, lines in 2d and 3D, as well as visualizing X-ray source-detector geometries.
 Usage:
     !pip install svg_vis
@@ -9,13 +9,13 @@ Usage:
     from svg.Renderer import RenderSVG
     target = ProjectionMatrix([...], detector_size_px, spacing)
     vis = CanvasWithOverlay(target.image_size[0], target.image_size[1])
     # World transformation
     ax, az = 0.5, 0.5
     s = 0.2
     def handle_draw(vis):
         global ax
         global az
@@ -25,26 +25,26 @@ Usage:
             ax += vis.mouse_state.dy * 0.01
         svg = RenderSVG((vis.w, vis.h))
         svg.add(svg_world_geometry)
         svg.add(svg_source_detector, projection=target,
                 draw_on_detector=svg_world_geometry,
                 label_source='C0', label_detector='I0(u,v)')
         T = scale(s) @ rotation_x(ax) @ rotation_z(az)
         raw_svg_code = svg.render(P=target.P@T)
         vis.html_overlay.value = raw_svg_code
     vis.handle_draw = handle_draw
     vis.display()
 Author: André Aichert
 Date: Dec 11th, 2023
 """
 from svg_snip.Composer import Composer
+from svg_snip.Composer import Group
 import svg_snip.Elements as e2d
 import svg_snip.Elements3D as e3d
@@ -55,35 +55,34 @@ from ProjectiveGeometry23.central_projection import ProjectionMatrix
 from ProjectiveGeometry23.source_detector_geometry import SourceDetectorGeometry
-def svg_coordinate_frame(P, size=100, **kwargs):
+def svg_coordinate_frame(P, size=100, composer=None, **kwargs):
     """Draw a coordinate system of default size 100."""
-    el = [
-        '<g>',
-        # Coordinate frame
-        e3d.line(P=P, X1=[0,0,0,1], X2=[size,0,0,1], stroke='red', **kwargs),
-        e3d.line(P=P, X1=[0,0,0,1], X2=[0,size,0,1], stroke='green', **kwargs),
-        e3d.line(P=P, X1=[0,0,0,1], X2=[0,0,size,1], stroke='blue', **kwargs)
-    ]
-    return '\n  '.join(el) + '\n</g>\n'
+    group = Group("Coordinate Frame")
+    # Coordinate frame axes
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[size,0,0,1], stroke='red')
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[0,size,0,1], stroke='green')
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[0,0,size,1], stroke='blue')
+    return group
-def svg_world_geometry(P, **kwargs):
+def svg_world_geometry(P, composer=None, **kwargs):
     """Draw a coordinate system of size 100 and a wire cube
     of the same size centered in the origin."""
-    el = [
-        '<g>',
-        # Coordinate frame
-        e3d.line(P=P, X1=[0,0,0,1], X2=[100,0,0,1], stroke='red', **kwargs),
-        e3d.line(P=P, X1=[0,0,0,1], X2=[0,100,0,1], stroke='green', **kwargs),
-        e3d.line(P=P, X1=[0,0,0,1], X2=[0,0,100,1], stroke='blue', **kwargs),
-        # a cube with size 100
-        e3d.wire_cube(P=P, min=[-50,-50,-50], max=[50,50,50], stroke='black', **kwargs)
-    ]
-    return '\n  '.join(el) + '\n</g>\n'
-def svg_source_detector(P, projection: ProjectionMatrix, draw_on_detector=None, **kwargs):
-    """Draw X-ray source-detector geometry.
+    group = Group("World Geometry")
+    # Coordinate frame axes
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[100,0,0,1], stroke='red')
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[0,100,0,1], stroke='green')
+    group.add(e3d.arrow, P=P, X1=[0,0,0,1], X2=[0,0,100,1], stroke='blue')
+    # A wireframe cube with size 100
+    group.add(e3d.wire_cube, P=P, min=[-50,-50,-50], max=[50,50,50], stroke='black')
+    return group
+def svg_source_detector(P, projection: ProjectionMatrix, draw_on_detector=None, composer=None, **kwargs):
+    """Draw X-ray source-detector geometry.
     Define draw_on_detector as any SVG drawing function to project
     additional 3D geometry to the detector plane."""
     sdg = SourceDetectorGeometry(projection)
@@ -92,50 +91,54 @@ def svg_source_detector(P, projection: ProjectionMatrix, draw_on_detector=None,
     U = pgu.cvec(sdg.axis_direction_Upx) * projection.image_size[0]
     V = pgu.cvec(sdg.axis_direction_Vpx) * projection.image_size[1]
-    el = [
-        '<g>\n',
-        # Source position
-        e3d.point(P=P, X=C, r=1, fill="black", **kwargs),
-        # Detector frame
-        e3d.polygon(P=P, Xs=[O, O+U, O+V+U ,O+V],
-                    fill="#00000020", stroke="#00000040", **kwargs),
-        e3d.line(P=P, X1=O, X2=O + U, stroke="magenta", **kwargs),
-        e3d.line(P=P, X1=O, X2=O + V, stroke="cyan", **kwargs),
-        # Frustum
-        e3d.line(P=P, X1=C, X2=O, stroke="#00000020", **kwargs),
-        e3d.line(P=P, X1=C, X2=O+V, stroke="#00000020", **kwargs),
-        e3d.line(P=P, X1=C, X2=O+U, stroke="#00000020", **kwargs),
-        e3d.line(P=P, X1=C, X2=O+V+U, stroke="#00000020", **kwargs)
-    ]
-    if 'label_source' in kwargs:
-        el += [e3d.text(P=P, X=C, content=kwargs['label_source'], **kwargs)]
-    if 'label_detector' in kwargs:
-        el += [e3d.text(P=P, X=O, content=kwargs['label_detector'], **kwargs)]
+    group = Group("Source Detector Geometry")
+    # Handle projection tracking on detector if geometry function is passed
     if draw_on_detector is not None:
         T_detector = sdg.central_projection_3d
-        detector = draw_on_detector(P=P@T_detector, **kwargs)
-    else:
-        detector = ""
-    return '\n<!-->Source Detector Geometry<-->\n' + detector + '\n  '.join(el) + '\n</g>\n'
+        group.add(draw_on_detector, P=P@T_detector, **kwargs)
+    # Source position
+    group.add(e3d.point, P=P, X=C, r=1, fill="black")
+    # Detector frame plane and directional axes
+    group.add(e3d.polygon, P=P, Xs=[O, O+U, O+V+U, O+V], fill="#00000020", stroke="#00000040")
+    group.add(e3d.arrow, P=P, X1=O, X2=O + U, stroke="magenta")
+    group.add(e3d.arrow, P=P, X1=O, X2=O + V, stroke="cyan")
+    # Projection Frustum boundary lines
+    group.add(e3d.line, P=P, X1=C, X2=O, stroke="#00000020")
+    group.add(e3d.line, P=P, X1=C, X2=O+V, stroke="#00000020")
+    group.add(e3d.line, P=P, X1=C, X2=O+U, stroke="#00000020")
+    group.add(e3d.line, P=P, X1=C, X2=O+V+U, stroke="#00000020")
+    # Optional descriptive annotations
+    if 'label_source' in kwargs:
+        group.add(e3d.text, P=P, X=C, content=kwargs['label_source'])
+    if 'label_detector' in kwargs:
+        group.add(e3d.text, P=P, X=O, content=kwargs['label_detector'])
+    return group
 def svg_homogeneous_line(l, composer: Composer, stroke="yellow", **kwargs):
     """Draw a 2D line given in homogeneous coordinates.
-        Note: composer is passed in automatically via svg.Renderer.
+    Note: composer is passed in automatically via svg.Renderer.
     """
+    if composer is None:
+        return ""
+    group = Group("Homogeneous Line")
     w, h = composer.image_size
     l = pgu.cvec(l)
     x1, y1, x2, y2 = pgu.intersectLineWithRect(l, w, h)
     if not all(isinstance(v, float) for v in [x1, y1, x2, y2]):
         return ""
-    return e2d.line(x1=x1, y1=y1, x2=x2, y2=y2, composer=composer, stroke=stroke, **kwargs)
+    group.add(e2d.line, x1=x1, y1=y1, x2=x2, y2=y2, stroke=stroke, **kwargs)
+    return group
-def svg_pluecker_line(P, L, **kwargs):
+def svg_pluecker_line(P, L, composer=None, **kwargs):
     """Draw a 3D line given in plucker coordinates."""
     l = pluecker.project(L, P)
-    return svg_homogeneous_line(l, **kwargs)
+    group = Group("Plücker Line")
+    group.add(svg_homogeneous_line, l, **kwargs)
+    return group

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/ProjectiveGeometry23.egg-info/PKG-INFO RENAMED Viewed

@@ -1,33 +1,29 @@
 Metadata-Version: 2.4
 Name: ProjectiveGeometry23
-Version: 0.1.0
-Summary: Projective geometry in 2D and 3D with homogeneous and Plücker coordinates, projection matrices, and visualization.
+Version: 1.1.0
+Summary: A 2D and 3D projective geometry library with Plücker coordinates and projection matrix, including (X-ray) source-detector geometry model.
 Home-page: https://github.com/aaichert/ProjectiveGeometry23
 Author: Andre Aichert
-Author-email: aaichert@gmail.com
-License: MIT
+Author-email: Andre Aichert <aaichert@gmail.com>
+License-Expression: Apache-2.0
+Keywords: projective-geometry,homogeneous-coordinates,plucker-coordinates,pinhole-camera,projection-matrix,computer-vision,xray-geometry,computed-tomography,camera-calibration,multiple-view-geometry,epipolar-geometry
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering :: Mathematics
+Classifier: Topic :: Scientific/Engineering :: Image Processing
+Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
-Provides-Extra: svg
-Requires-Dist: svg_snip; extra == "svg"
 Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
 Dynamic: requires-python
-Dynamic: summary
 # ProjectiveGeometry23
 ## Projective Geometry of Two- and Three-space

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/ProjectiveGeometry23.egg-info/SOURCES.txt RENAMED Viewed

@@ -1,9 +1,16 @@
+.gitignore
 LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
+requirements.txt
 setup.py
+source_detector_geometry.png
+v1.1.0
+.github/workflows/publish.yml
+.github/workflows/test.yml
 ProjectiveGeometry23/__init__.py
+ProjectiveGeometry23/_version.py
 ProjectiveGeometry23/central_projection.py
 ProjectiveGeometry23/estimation.py
 ProjectiveGeometry23/homography.py

projectivegeometry23-1.1.0/ProjectiveGeometry23.egg-info/requires.txt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ numpy
2	+ scipy

projectivegeometry23-1.1.0/pyproject.toml ADDED Viewed

@@ -0,0 +1,48 @@
+[build-system]
+requires = [
+    "setuptools>=64",
+    "setuptools-scm[toml]>=8.0"
+]
+build-backend = "setuptools.build_meta"
+[project]
+name = "ProjectiveGeometry23"
+readme = "README.md"
+dynamic = ["version"]
+description = "A 2D and 3D projective geometry library with Plücker coordinates and projection matrix, including (X-ray) source-detector geometry model."
+requires-python = ">=3.6"
+license = "Apache-2.0"
+authors = [
+    {name = "Andre Aichert", email = "aaichert@gmail.com"},
+]
+keywords = [
+    "projective-geometry",
+    "homogeneous-coordinates",
+    "plucker-coordinates",
+    "pinhole-camera",
+    "projection-matrix",
+    "computer-vision",
+    "xray-geometry",
+    "computed-tomography",
+    "camera-calibration",
+    "multiple-view-geometry",
+    "epipolar-geometry"
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Topic :: Scientific/Engineering :: Mathematics",
+    "Topic :: Scientific/Engineering :: Image Processing",
+    "Topic :: Scientific/Engineering :: Medical Science Apps.",
+]
+dependencies = [
+    "numpy",
+    "scipy",
+]
+[tool.setuptools_scm]
+write_to = "ProjectiveGeometry23/_version.py"
+fallback_version = "0.0.1-local"

projectivegeometry23-1.1.0/requirements.txt ADDED Viewed

@@ -0,0 +1,4 @@
+numpy
+scipy
+# Optional for visualization
+svg_snip

{projectivegeometry23-0.1.0 → projectivegeometry23-1.1.0}/setup.py RENAMED Viewed

@@ -2,7 +2,6 @@ from setuptools import setup, find_packages
 setup(
     name='ProjectiveGeometry23',
-    version='0.1.0',
     description='Projective geometry in 2D and 3D with homogeneous and Plücker coordinates, projection matrices, and visualization.',
     author='Andre Aichert',
     author_email='aaichert@gmail.com',
@@ -25,4 +24,4 @@ setup(
     license='MIT',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-)
+)