yapCAD 0.2.5__tar.gz → 0.3.0__tar.gz

{yapCAD-0.2.5 → yapcad-0.3.0}/.gitignore

@@ -48,6 +48,11 @@ MANIFEST
 
 # Per-project virtualenvs
 .venv*/
+venv/
+v_*/
+
+#cached python version for pyenv
+.python-version
 
 # generated DXF files in examples
 examples/*.dxf

{yapCAD-0.2.5 → yapcad-0.3.0}/CHANGELOG.rst

@@ -2,6 +2,27 @@
 Changelog
 =========
 
+Version 0.3.0
+=============
+
+what's new:
+-----------
+
+- Require Python 3.10+ and align dependency metadata with current
+  interpreter and library versions.
+- Pin pyglet to 1.x rendering backend and add fallback
+  guards to every OpenGL-enabled example so they degrade gracefully on
+  systems without a working pyglet/Cocoa stack.
+- Sphinx documentation now builds even when optional themes are
+  missing, and `sphinx-apidoc` no longer depends on ``pkg_resources``.
+
+Known problems
+--------------
+
+- Incomplete documentation, especially outside the ``yapcad.geom`` module.
+- Occasional problems with complex boolean operations.
+- Incomplete functionality around 3D modeling.
+
 Version 0.1.5
 =============
 

{yapCAD-0.2.5 → yapcad-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: yapCAD
-Version: 0.2.5
+Version: 0.3.0
 Summary: yet another procedural CAD and computational geometry system
 Author-email: Richard DeVaul <richard.devaul@gmail.com>
 Project-URL: Homepage, https://github.com/rdevaul/yapCAD/
@@ -8,13 +8,21 @@ Project-URL: Documentation, https://yapcad.readthedocs.io/en/latest/
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-Provides-Extra: testing
-Provides-Extra: tests
 License-File: LICENSE
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
+Requires-Dist: ezdxf>=1.1
+Requires-Dist: pyglet<2,>=1.5
+Requires-Dist: mpmath>=1.2
+Requires-Dist: pyobjc-core; platform_system == "Darwin"
+Requires-Dist: pyobjc-framework-Cocoa; platform_system == "Darwin"
+Requires-Dist: pyobjc-framework-Quartz; platform_system == "Darwin"
+Provides-Extra: tests
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Dynamic: license-file
 
 **yapCAD**
 ==========
@@ -106,6 +114,22 @@ supported by Sphinx. See the `Sphinx
 documentation <https://www.sphinx-doc.org/en/master/>`__ for more
 information.
 
+running tests
+~~~~~~~~~~~~~
+
+The repository includes a small pytest suite that exercises the core
+geometry primitives. Install the testing dependencies and run pytest
+from the project root with the source tree on ``PYTHONPATH``::
+
+   python3 -m pip install pytest pytest-cov
+   PYTHONPATH=./src python3 -m pytest
+
+The default configuration enables coverage reporting via
+``pytest-cov``. If you prefer to skip coverage, you can override the
+options::
+
+   PYTHONPATH=./src python3 -m pytest --override-ini addopts=
+
 **yapCAD** goals
 ----------------
 

{yapCAD-0.2.5 → yapcad-0.3.0}/README.md

@@ -68,6 +68,25 @@ supported by Sphinx.  See the [Sphinx
 documentation](https://www.sphinx-doc.org/en/master/) for more
 information.
 
+### running tests
+
+The repository includes a small pytest suite that exercises the core
+geometry primitives. Install the testing dependencies and run pytest
+from the project root with the source tree on `PYTHONPATH`:
+
+```bash
+python3 -m pip install pytest pytest-cov
+PYTHONPATH=./src python3 -m pytest
+```
+
+The default configuration enables coverage reporting via
+`pytest-cov`. If you prefer to skip coverage, you can override the
+options:
+
+```bash
+PYTHONPATH=./src python3 -m pytest --override-ini addopts=
+```
+
 ## **yapCAD** goals
 
 The purpose of **yapCAD** is to support 2D and 3D computational

{yapCAD-0.2.5 → yapcad-0.3.0}/README.rst

@@ -88,6 +88,22 @@ supported by Sphinx. See the `Sphinx
 documentation <https://www.sphinx-doc.org/en/master/>`__ for more
 information.
 
+running tests
+~~~~~~~~~~~~~
+
+The repository includes a small pytest suite that exercises the core
+geometry primitives. Install the testing dependencies and run pytest
+from the project root with the source tree on ``PYTHONPATH``::
+
+   python3 -m pip install pytest pytest-cov
+   PYTHONPATH=./src python3 -m pytest
+
+The default configuration enables coverage reporting via
+``pytest-cov``. If you prefer to skip coverage, you can override the
+options::
+
+   PYTHONPATH=./src python3 -m pytest --override-ini addopts=
+
 **yapCAD** goals
 ----------------
 

{yapCAD-0.2.5 → yapcad-0.3.0}/docs/README.rst

@@ -88,6 +88,22 @@ supported by Sphinx. See the `Sphinx
 documentation <https://www.sphinx-doc.org/en/master/>`__ for more
 information.
 
+running tests
+~~~~~~~~~~~~~
+
+The repository includes a small pytest suite that exercises the core
+geometry primitives. Install the testing dependencies and run pytest
+from the project root with the source tree on ``PYTHONPATH``::
+
+   python3 -m pip install pytest pytest-cov
+   PYTHONPATH=./src python3 -m pytest
+
+The default configuration enables coverage reporting via
+``pytest-cov``. If you prefer to skip coverage, you can override the
+options::
+
+   PYTHONPATH=./src python3 -m pytest --override-ini addopts=
+
 **yapCAD** goals
 ----------------
 

{yapCAD-0.2.5 → yapcad-0.3.0}/docs/conf.py

@@ -13,7 +13,12 @@ import sys
 import inspect
 import shutil
 
-import sphinx_rtd_theme
+try:
+    import sphinx_rtd_theme  # optional theme used on RTD
+    _has_rtd_theme = True
+except ImportError:
+    sphinx_rtd_theme = None
+    _has_rtd_theme = False
 
 __location__ = os.path.join(os.getcwd(), os.path.dirname(
     inspect.getfile(inspect.currentframe())))
@@ -45,13 +50,17 @@ except FileNotFoundError:
 
 try:
     import sphinx
-    from pkg_resources import parse_version
 
     cmd_line_template = "sphinx-apidoc -f -o {outputdir} {moduledir}"
     cmd_line = cmd_line_template.format(outputdir=output_dir, moduledir=module_dir)
 
     args = cmd_line.split(" ")
-    if parse_version(sphinx.__version__) >= parse_version('1.7'):
+    # sphinx-apidoc switched to a subcommand style interface in 1.7
+    try:
+        major, minor, *_ = (int(x) for x in sphinx.__version__.split('.')[:2])
+    except ValueError:
+        major, minor = 1, 7
+    if (major, minor) >= (1, 7):
         args = args[1:]
 
     apidoc.main(args)
@@ -68,7 +77,10 @@ except Exception as e:
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
               'sphinx.ext.autosummary', 'sphinx.ext.viewcode', 'sphinx.ext.coverage',
               'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
-              'sphinx.ext.napoleon', 'sphinx_rtd_theme']
+              'sphinx.ext.napoleon']
+
+if _has_rtd_theme:
+    extensions.append('sphinx_rtd_theme')
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -138,7 +150,7 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #html_theme = 'alabaster'
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'sphinx_rtd_theme' if _has_rtd_theme else 'alabaster'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

{yapCAD-0.2.5 → yapcad-0.3.0}/docs/index.rst

@@ -11,7 +11,7 @@ pretty early state, though we hope you will find it useful.
     **yapCAD** was created to solve some fairly specific problems in
     procedural CAD and `parametric design`_ , and at present is most
     developed for generating 2D drawings in the `AutoCad DXF`_ format.
-    If you don't know what procedural CAD or paramaterized design
+    If you don't know what procedural CAD or parameterized design
     might be useful for, this may not be the tool for you.
 
     On the other hand, if you are tired of manually editing your CAD

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/boxcut/boxcut.py

@@ -561,8 +561,17 @@ if __name__ == "__main__":
     dd.display()
 
     if ogl:
-        from yapcad.pyglet_drawable import *
-        dd2 = pygletDraw()
+        try:
+            from yapcad.pyglet_drawable import *
+            dd2 = pygletDraw()
+        except RuntimeError as err:
+            print("\nSkipping 3D visualization: {}".format(err))
+            ogl = False
+        except Exception as err:
+            print("\nSkipping 3D visualization due to unexpected error: {}".format(err))
+            ogl = False
+
+    if ogl:
         # magnification factor for text
         dd2.magnify=1.5
         # compute the camera distance assuming a 60 degree (pi/6) FOV
@@ -571,13 +580,9 @@ if __name__ == "__main__":
         dist = ((maxd/2) / math.sin(pi/6))*math.cos(pi/6)
         dd2.cameradist = dist-box_height*2
 
-        
         twoDDraw(polys,dd2,-box_height*2)
 
         oglGeom = makeOglGeom()
-        #print("oglGeom: ",oglGeom)
-
-        #oglGeom = translate(oglGeom,point(0,0,box_height))
 
         dd2.layer='PATHS'
         for i in range(len(oglGeom)):
@@ -587,8 +592,6 @@ if __name__ == "__main__":
                 dd2.linecolor = 'aqua'
             else:
                 dd2.linecolor = 'fuchsia'
-                
             dd2.draw(oglGeom[i])
         dd2.display()
     print("done")
-

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example1.py

@@ -7,7 +7,11 @@ from yapcad.geom import *
 
 #set up openGL rendering
 def setupGL():
-    dGl =pygletDraw()
+    try:
+        dGl = pygletDraw()
+    except RuntimeError as err:
+        print("\nSkipping OpenGL rendering: {}".format(err))
+        return None
     dGl.magnify = 1.0
     dGl.linecolor = 'white'
     dGl.cameradist = 25
@@ -107,15 +111,18 @@ if __name__ == "__main__":
     ## add a drawing legend in the OpenGL rendering, setting the
     ## color eplicitly to yellow
     
-    dGl.linecolor = 'yellow'
-    legend(dGl)
+    if dGl:
+        dGl.linecolor = 'yellow'
+        legend(dGl)
     
     ## draw the geometry in OpenGL
-    drawGlist(geomlist,dGl)
+    if dGl:
+        drawGlist(geomlist,dGl)
 
     ## write out the DXF file as example1-out.dxf
     d.display()
 
     ## create the interactive OpenGL rendering -- do this last
-    dGl.display()
+    if dGl:
+        dGl.display()
     

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example10.py

@@ -203,17 +203,30 @@ if __name__ == "__main__":
             quit()
     if len(sys.argv) > 2 and renderOgl==False:
         filename = sys.argv[2]+".dxf"
-    dd = []
+    requestedOgl = renderOgl
+    dd = None
     if renderOgl:
         print("OpenGL rendering selected")
-        from yapcad.pyglet_drawable import *
-        dd=pygletDraw()
-    else:
-        print("DXF rendering selected")
+        try:
+            from yapcad.pyglet_drawable import *
+            dd=pygletDraw()
+        except RuntimeError as err:
+            print("\nSkipping OpenGL rendering: {}".format(err))
+            renderOgl = False
+        except Exception as err:
+            print("\nSkipping OpenGL rendering due to unexpected error: {}".format(err))
+            renderOgl = False
+
+    if not renderOgl or dd is None:
+        if requestedOgl and dd is None:
+            print("Falling back to DXF rendering")
+        else:
+            print("DXF rendering selected")
         from yapcad.ezdxf_drawable import *
         #set up DXF rendering
         dd=ezdxfDraw()
         dd.filename = filename
+        renderOgl = False
     print("rendering...")
     testAndDraw(dd)
     print("done")

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example11.py

@@ -106,17 +106,30 @@ if __name__ == "__main__":
             quit()
     if len(sys.argv) > 2 and renderOgl==False:
         filename = sys.argv[2]+".dxf"
-    dd = []
+    requestedOgl = renderOgl
+    dd = None
     if renderOgl:
         print("OpenGL rendering selected")
-        from yapcad.pyglet_drawable import *
-        dd=pygletDraw()
-    else:
-        print("DXF rendering selected")
+        try:
+            from yapcad.pyglet_drawable import *
+            dd=pygletDraw()
+        except RuntimeError as err:
+            print("\nSkipping OpenGL rendering: {}".format(err))
+            renderOgl = False
+        except Exception as err:
+            print("\nSkipping OpenGL rendering due to unexpected error: {}".format(err))
+            renderOgl = False
+
+    if not renderOgl or dd is None:
+        if requestedOgl and dd is None:
+            print("Falling back to DXF rendering")
+        else:
+            print("DXF rendering selected")
         from yapcad.ezdxf_drawable import *
         #set up DXF rendering
         dd=ezdxfDraw()
         dd.filename = filename
+        renderOgl = False
     print("rendering...")
     testAndDraw(dd)
     print("done")

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example12.py

@@ -44,6 +44,7 @@ def geometry():
     jigsaw=makeJigsawPiece(poly=True)
     bigc= makeCircle(point(0,0,0),20)
     nb = Boolean('union',[logopoly,bigc])
+    nb = nb.scale(0.8,poly=True)
     nb = nb.translate(point(0,-50),poly=True)
     docGeomList.append(nb.geom())
 
@@ -74,6 +75,8 @@ def testAndDraw(dd):
     else:
         dd.linecolor = 'aqua'
     dd.draw(geom2)
+    dd.linecolor = 'red'
+    dd.draw(translate(geom,point(0,0,5)))
 
     if not renderOgl:
         dd.layer = 'DOCUMENTATION'
@@ -114,20 +117,32 @@ if __name__ == "__main__":
             quit()
     if len(sys.argv) > 2 and renderOgl==False:
         filename = sys.argv[2]+".dxf"
-    dd = []
+    requestedOgl = renderOgl
+    dd = None
     if renderOgl:
         print("OpenGL rendering selected")
-        from yapcad.pyglet_drawable import *
-        dd=pygletDraw()
-        dd.cameradist=170.0
-        
-    else:
-        print("DXF rendering selected")
+        try:
+            from yapcad.pyglet_drawable import *
+            dd=pygletDraw()
+            dd.cameradist=170.0
+        except RuntimeError as err:
+            print("\nSkipping OpenGL rendering: {}".format(err))
+            renderOgl = False
+        except Exception as err:
+            print("\nSkipping OpenGL rendering due to unexpected error: {}".format(err))
+            renderOgl = False
+
+    if not renderOgl or dd is None:
+        if requestedOgl and dd is None:
+            print("Falling back to DXF rendering")
+        else:
+            print("DXF rendering selected")
         from yapcad.ezdxf_drawable import *
         #set up DXF rendering
         dd=ezdxfDraw()
         dd.filename = filename
         drawLegend(dd)
+        renderOgl = False
     print("rendering...")
     
     testAndDraw(dd)

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example8-gl.py

@@ -1,5 +1,6 @@
 ## yapCAD poly() intersecton and drawing examples
 
+import sys
 from yapcad.geom import *
 from yapcad.poly import *
 import random
@@ -14,8 +15,15 @@ if __name__ == "__main__":
  making and then mirroring random "flowers."  Renders output interactively with OpenGL.
     """)
 
-    from yapcad.pyglet_drawable import *
-    dd=pygletDraw()
+    try:
+        from yapcad.pyglet_drawable import *
+        dd=pygletDraw()
+    except RuntimeError as err:
+        print("\nSkipping OpenGL rendering: {}".format(err))
+        sys.exit(0)
+    except Exception as err:
+        print("\nSkipping OpenGL rendering due to unexpected error: {}".format(err))
+        sys.exit(1)
     dd.cameradist=150.0
     glist = mirrorArray()
 

{yapCAD-0.2.5 → yapcad-0.3.0}/examples/example9.py

@@ -117,7 +117,16 @@ def sphere(diameter,center=point(0,0,0),depth=2):
 
         
 if __name__ == "__main__":
-    from yapcad.pyglet_drawable import *
+    import sys
+    try:
+        from yapcad.pyglet_drawable import *
+        dd=pygletDraw()
+    except RuntimeError as err:
+        print("\nSkipping OpenGL rendering: {}".format(err))
+        sys.exit(0)
+    except Exception as err:
+        print("\nSkipping OpenGL rendering due to unexpected error: {}".format(err))
+        sys.exit(1)
     print("example9.py -- yapCAD 3D geometry demonstration")
     print("""
 This is a demonstration of the creation and rendering of
@@ -127,7 +136,6 @@ engine.
 In this example we create an icosohedron centered at the orign and
 tesellate it spherically""")
 
-    dd=pygletDraw()
     dd.linecolor = 'white'
 
     verts,normals,faces = sphere(50.0,point(0,0,0),3)

{yapCAD-0.2.5 → yapcad-0.3.0}/pyproject.toml

@@ -1,22 +1,25 @@
 [project]
 name = "yapCAD"
-version = "0.2.5"
+version = "0.3.0"
 authors = [
   { name="Richard DeVaul", email="richard.devaul@gmail.com" },
 ]
 description = "yet another procedural CAD and computational geometry system"
 readme = "README.rst"
-requires-python = ">=3.7"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 dependencies = [
-	      "ezdxf",
-	      "pyglet < 2",
-	      "mpmath"
-	      ]
+      "ezdxf>=1.1",
+      "pyglet>=1.5,<2",
+      "mpmath>=1.2",
+      "pyobjc-core; platform_system == 'Darwin'",
+      "pyobjc-framework-Cocoa; platform_system == 'Darwin'",
+      "pyobjc-framework-Quartz; platform_system == 'Darwin'"
+      ]
 
 [project.optional-dependencies]
 tests = [

{yapCAD-0.2.5 → yapcad-0.3.0}/requirements.txt

@@ -15,6 +15,9 @@
 # numpy==1.13.3
 # scipy==1.0
 #
-ezdxf
-pyglet<2
-mpmath
+ezdxf>=1.1
+pyglet>=1.5,<2
+mpmath>=1.2
+pyobjc-core; platform_system == "Darwin"
+pyobjc-framework-Cocoa; platform_system == "Darwin"
+pyobjc-framework-Quartz; platform_system == "Darwin"

{yapCAD-0.2.5 → yapcad-0.3.0}/setup.cfg

@@ -7,7 +7,14 @@ include_package_data = True
 package_dir = 
 	=src
 setup_requires = pyscaffold>=3.2a0,<3.3a0
-install_requires = ezdxf; pyglet<2; mpmath
+install_requires = 
+	ezdxf>=1.1
+	pyglet>=1.5,<2
+	mpmath>=1.2
+	pyobjc-core; platform_system == "Darwin"
+	pyobjc-framework-Cocoa; platform_system == "Darwin"
+	pyobjc-framework-Quartz; platform_system == "Darwin"
+python_requires = >=3.10
 
 [options.packages.find]
 where = src

{yapCAD-0.2.5 → yapcad-0.3.0}/src/yapCAD.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: yapCAD
-Version: 0.2.5
+Version: 0.3.0
 Summary: yet another procedural CAD and computational geometry system
 Author-email: Richard DeVaul <richard.devaul@gmail.com>
 Project-URL: Homepage, https://github.com/rdevaul/yapCAD/
@@ -8,13 +8,21 @@ Project-URL: Documentation, https://yapcad.readthedocs.io/en/latest/
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-Provides-Extra: testing
-Provides-Extra: tests
 License-File: LICENSE
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
+Requires-Dist: ezdxf>=1.1
+Requires-Dist: pyglet<2,>=1.5
+Requires-Dist: mpmath>=1.2
+Requires-Dist: pyobjc-core; platform_system == "Darwin"
+Requires-Dist: pyobjc-framework-Cocoa; platform_system == "Darwin"
+Requires-Dist: pyobjc-framework-Quartz; platform_system == "Darwin"
+Provides-Extra: tests
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Dynamic: license-file
 
 **yapCAD**
 ==========
@@ -106,6 +114,22 @@ supported by Sphinx. See the `Sphinx
 documentation <https://www.sphinx-doc.org/en/master/>`__ for more
 information.
 
+running tests
+~~~~~~~~~~~~~
+
+The repository includes a small pytest suite that exercises the core
+geometry primitives. Install the testing dependencies and run pytest
+from the project root with the source tree on ``PYTHONPATH``::
+
+   python3 -m pip install pytest pytest-cov
+   PYTHONPATH=./src python3 -m pytest
+
+The default configuration enables coverage reporting via
+``pytest-cov``. If you prefer to skip coverage, you can override the
+options::
+
+   PYTHONPATH=./src python3 -m pytest --override-ini addopts=
+
 **yapCAD** goals
 ----------------
 

yapcad-0.3.0/src/yapCAD.egg-info/requires.txt

@@ -0,0 +1,12 @@
+ezdxf>=1.1
+pyglet<2,>=1.5
+mpmath>=1.2
+
+[:platform_system == "Darwin"]
+pyobjc-core
+pyobjc-framework-Cocoa
+pyobjc-framework-Quartz
+
+[tests]
+pytest
+pytest-cov

yapcad-0.3.0/src/yapcad/__init__.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+try:  # Python >= 3.8
+    from importlib.metadata import PackageNotFoundError, version
+except ModuleNotFoundError:  # pragma: no cover - for Python < 3.8
+    from importlib_metadata import PackageNotFoundError, version
+
+
+try:
+    __version__ = version("yapCAD")
+except PackageNotFoundError:  # pragma: no cover - handled when package not installed
+    __version__ = "unknown"

{yapCAD-0.2.5 → yapcad-0.3.0}/src/yapcad/combine.py

@@ -10,16 +10,22 @@ class Boolean(IntersectGeometry):
 
     types = ('union','intersection','difference')
     
-    def __init__(self,type='union',polys=[]):
+    def __init__(self, type='union', polys=None):
+        super().__init__()
+        if type not in self.types:
+            raise ValueError('invalid type passed to Boolean(): {}'.format(type))
+
+        if polys is None:
+            polys = []
+
         for p in polys:
-            if not ( isinstance(p,Polygon) or isinstance(p,Boolean) ):
+            if not (isinstance(p, Polygon) or isinstance(p, Boolean)):
                 raise ValueError('non-poly or non-boolean passed to Boolean(): {}'.format(p))
-            if not type in self.types:
-                raise ValueError('invalid type passed to Boolean(): {}'.format(tpe))
-            self._elem=list(polys)
-            self._type=type
-            self._update=True
-            self._outline=[]
+
+        self._elem = list(polys)
+        self._type = type
+        self._update = True
+        self._outline = []
 
 
     def combine_geom(self,g1,g2):

{yapCAD-0.2.5 → yapcad-0.3.0}/src/yapcad/geom.py

@@ -1870,7 +1870,6 @@ def isinsidepolyXY(a,p):
 
     """
     closed=False
-
     if len(a) > 2 and dist(a[0],a[-1]) < epsilon:
         closed = True
 
@@ -1887,12 +1886,11 @@ def isinsidepolyXY(a,p):
     if not isinsidebbox(bb,p):
         return False
     ## inside the bounding box, do intersection testing
-    p2 = add([1,1,0,1],bb[1])
+    p2 = add([0.01,0.01,0,1],bb[1])
     if vclose(p2,p): ## did we randomly pick an outside point near the
-                     ## test point?
-        p2 = sub(bb[0],[1,1,0,1])
+                     ## test point? If so, test point is outside bb
+        return False
     l = line(p,p2)
-
     pp = intersectSimplePolyXY(l,a)
     if pp == False:
         return False
@@ -2285,10 +2283,10 @@ def isinsidegeomlistXY(a,p):
     bb = geomlistbbox(a)
     if not isinsidebbox(bb,p):
         return False
-    p2 = add([1,1,0,1],bb[1])
+    p2 = add([0.1,0.1,0,1],bb[1])
     if vclose(p2,p): ## did we randomly pick an outside point near the
-                     ## test point?
-        p2 = sub(bb[0],[1,1,0,1])
+                     ## test point? If so, test point is outside bb
+        return False
     l = line(p,p2)
 
     pp = intersectGeomListXY(l,a)
@@ -2365,7 +2363,7 @@ def intersectGeomListXY(g,gl,inside=True,params=False):
             raise ValueError('bad gtype in intersectGeomListXY, this should never happen')
         
     dst = 0.0
-    if len(gl) > 2:
+    if len(gl) > 1:
         for i in range(len(gl)):
             g2 = gl[i]
             uu = []
@@ -2389,12 +2387,12 @@ def intersectGeomListXY(g,gl,inside=True,params=False):
             elif gtype == 'poly' and gtype2 == 'poly':
                 zz1 = []
                 zz2 = []
-                for i in range(1,len(g)):
-                    zz = intersectSimplePolyXY(line(g[i-1],g[i]),
+                for j in range(1,len(g)):
+                    zz = intersectSimplePolyXY(line(g[j-1],g[j]),
                                                g2, params=True)
                     if not isinstance(zz,bool):
-                        zz1.append(zz[0])
-                        zz2.append(zz[1])
+                        zz1 = zz1 + zz[0]
+                        zz2 = zz2 + zz[1]
                 if len(zz1) > 0:
                     uu = [ zz1,zz2 ]
             elif gtype == 'simple' and gtype2 == 'glist':
@@ -2543,7 +2541,7 @@ def center(x):
         pl = []
         for g in x:
             pl.append(center(g))
-        return polycenter(pl)
+        return center(pl)
     else:
         raise ValueError("inappropriate type for center(): ",format(x))
     

{yapCAD-0.2.5 → yapcad-0.3.0}/src/yapcad/geometry.py

@@ -18,7 +18,7 @@
 ## classically-definalble gap (or the possibility thereof) then
 ## implement Geometry instead
 
-import copy
+from copy import deepcopy
 from yapcad.geom import *
 
 
@@ -43,7 +43,7 @@ class Geometry:
         return
 
     def geom(self):
-        if self.update:
+        if self._update:
             self._updateInternals()
         return deepcopy(self._elem)
 

{yapCAD-0.2.5 → yapcad-0.3.0}/src/yapcad/xform.py

@@ -165,11 +165,17 @@ class Matrix:
             self.m[j] = x
         
 
-    # matrix multiply.  If x is a matrix, compute MX.  If X is a
+    # matrix multiply.  If x is a matrix, compute MX.  If x is a
     # vector, compute Mx. If x is a scalar, compute xM. If x isn't any
-    # of these, return False.  Respects transpose flag.
-    
+    # of these, a ValueError is raised.  Respects transpose flag.
+
     def mul(self,x):
+        """Return the product of this matrix and ``x``.
+
+        ``x`` may be another :class:`Matrix`, a 4D vector, or a scalar. In
+        each case the appropriate matrix multiplication is performed. If
+        ``x`` is none of these types, a :class:`ValueError` is raised.
+        """
         if isinstance(x,Matrix):
             result = Matrix()
             for i in range(4):
@@ -232,7 +238,7 @@ def Rotation(axis,angle,inverse=False):
 
 def Translation(delta,inverse=False):
     if inverse:
-        delta = mul(delta,-1.0)
+        delta = geom.scale3(delta, -1.0)
     dx = delta[0]
     dy = delta[1]
     dz = delta[2]

{yapCAD-0.2.5 → yapcad-0.3.0}/tests/test_xform.py

@@ -26,6 +26,16 @@ class TestXform:
         ## homogeneous coordinates test
         assert(geom.homo(foo.mul(baz)) ==
                [18.0/102.0, 46.0/102.0, 74.0/102.0, 1.0])
+
+    def test_translation(self):
+        p = geom.vect(1,2,3)
+        dx = 4
+        dy = -2
+        dz = 1
+        T = Translation([dx,dy,dz])
+        assert(T.mul(p) == geom.vect(1+dx,2+dy,3+dz))
+        Tinv = Translation([dx,dy,dz],inverse=True)
+        assert(Tinv.mul(p) == geom.vect(1-dx,2-dy,3-dz))
     
     
 

yapCAD-0.2.5/src/yapCAD.egg-info/requires.txt

@@ -1,11 +0,0 @@
-ezdxf
-pyglet<2
-mpmath
-
-[testing]
-pytest
-pytest-cov
-
-[tests]
-pytest
-pytest-cov

yapCAD-0.2.5/src/yapcad/__init__.py

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from pkg_resources import get_distribution, DistributionNotFound
-
-try:
-    # Change here if project is renamed and does not equal the package name
-    dist_name = 'yapCAD'
-    __version__ = get_distribution(dist_name).version
-except DistributionNotFound:
-    __version__ = 'unknown'
-finally:
-    del get_distribution, DistributionNotFound