yapCAD 0.2.0__py2.py3-none-any.whl → 0.3.0__py2.py3-none-any.whl

yapcad/__init__.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from pkg_resources import get_distribution, DistributionNotFound
+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:
-    # 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
+    __version__ = version("yapCAD")
+except PackageNotFoundError:  # pragma: no cover - handled when package not installed
+    __version__ = "unknown"

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/ezdxf_drawable.py

@@ -27,6 +27,7 @@
 from yapcad.geom import *
 import yapcad.drawable as drawable
 import ezdxf
+from ezdxf.enums import TextEntityAlignment
 
 ## class to provide dxf drawing functionality
 class ezdxfDraw(drawable.Drawable):
@@ -137,6 +138,17 @@ class ezdxfDraw(drawable.Drawable):
         else:
             color = 256 # by layer
 
+        alignment = [];
+        if align == 'LEFT':
+            alignment = TextEntityAlignment.LEFT
+        elif align == 'CENTER':
+            alignment = TextEntityAlignment.CENTER
+        elif align == 'RIGHT':
+            alignment = TextEntityAlignment.RIGHT
+        else:
+            ## default alignment is left
+            alignment = TextEntityAlignment.LEFT
+        
         dxfattr = dict()
         if 'style' in attr:
             dxfattr['style'] = attr['style']
@@ -144,8 +156,12 @@ class ezdxfDraw(drawable.Drawable):
             dxfattr['height'] = attr['height']
         dxfattr.update({ 'layer': layer,
                          'color': color})
-        self.__msp.add_text(text,dxfattr).set_pos((location[0],location[1]),
-                                             align=align)
+        self.__msp.add_text(
+            text,
+            dxfattribs=dxfattr).set_placement(
+                (location[0],location[1]),
+                align=alignment
+            )
 
     def display(self):
         self.__doc.saveas("{}.dxf".format(self.filename))

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/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/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.0.dist-info → yapcad-0.3.0.dist-info}/METADATA

@@ -1,22 +1,28 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: yapCAD
-Version: 0.2.0
+Version: 0.3.0
 Summary: yet another procedural CAD and computational geometry system
-Home-page: https://github.com/rdevaul/yapCAD/
-Author: Richard DeVaul
-Author-email: richard.devaul@gmail.com
-License: mit
+Author-email: Richard DeVaul <richard.devaul@gmail.com>
+Project-URL: Homepage, https://github.com/rdevaul/yapCAD/
 Project-URL: Documentation, https://yapcad.readthedocs.io/en/latest/
-Platform: any
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python
-Description-Content-Type: text/x-rst; charset=UTF-8
-Requires-Dist: ezdxf
-Requires-Dist: pyglet
-Requires-Dist: mpmath
-Provides-Extra: testing
-Requires-Dist: pytest ; extra == 'testing'
-Requires-Dist: pytest-cov ; extra == 'testing'
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+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**
 ==========
@@ -108,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
 ----------------
 
@@ -456,5 +478,3 @@ Note
 
 This project has been set up using PyScaffold 3.2.3. For details and
 usage information on PyScaffold see https://pyscaffold.org/.
-
-

yapcad-0.3.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+yapcad/__init__.py,sha256=CUEd7EOL-ne31ggDprsi4lwLWMV1SRV5KYqkuDTdxrQ,400
+yapcad/combine.py,sha256=uC8QsFRGa198rIkKhNIOm-GhuDvezlGcX3nhEY2N2YE,13993
+yapcad/drawable.py,sha256=RKG8emMC0E6__-L89zrBVxAB1JiFUPA51cAweCu7zP8,14605
+yapcad/ezdxf_drawable.py,sha256=pZGLS9Dw108GG6ItahszSkkRopYLtgP9CDVWxHCrMrs,5948
+yapcad/geom.py,sha256=YSqG-C7Ti9VCkSyIC3VggJImx_tAlyxtN38SNUdGM5Q,108843
+yapcad/geom3d.py,sha256=W6gmo8UifgFwy3HHQvgvvgp96l2ahMqTVyTmbXqNEd8,2865
+yapcad/geometry.py,sha256=H-ahJG2nsXvV__6TqWf_ReRWVFZdL4bBPPPTYEnPvi0,2564
+yapcad/poly.py,sha256=Fku0ynBzYUSb5UZA6WY0yLPmDTc_Eg6BVE3DUKqiJqo,21447
+yapcad/pyglet_drawable.py,sha256=dV9dcwzZRlPwhx18Dv0CX7wQOCxnxwk4Si_FL9heNs8,18475
+yapcad/xform.py,sha256=It95Ql9JpMFqk95X8MvAmqYpCQu0VKp-JShmRTC0Ztk,9538
+yapcad-0.3.0.dist-info/licenses/AUTHORS.rst,sha256=JzvJA3p1aSIOTaaB3aCtB-ZrUQrVm869gdROUV5bRh8,84
+yapcad-0.3.0.dist-info/licenses/LICENSE,sha256=NkGvciCD5MEHmCtnivAi2PqcEhBYAkSAarP-bWAoknM,1071
+yapcad-0.3.0.dist-info/licenses/LICENSE.txt,sha256=FyT_Hxn5USuJ1Mu3-4Ou4T2x-Dzfiy06ZOnWkfdJ33o,1081
+yapcad-0.3.0.dist-info/METADATA,sha256=zfvxqcMOeJJsH2yp5Mw4TJkGeuyIAbeQ507n4f7PTdY,18999
+yapcad-0.3.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+yapcad-0.3.0.dist-info/top_level.txt,sha256=NAtnfsyeALrvhI63FGS3_TEUh26OKRvnm1_lCOOgjKA,7
+yapcad-0.3.0.dist-info/RECORD,,

{yapCAD-0.2.0.dist-info → yapcad-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.33.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

yapCAD-0.2.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-yapcad/__init__.py,sha256=Wi3rOCWkiWUKzXbHatCZ7t6RHrGZXCoxpvTjyv4o1jc,363
-yapcad/acdxf.py,sha256=auHSE-iUnToqhcMhBbvUCXjcL0gklDuWeab8aFciRE0,3563
-yapcad/combine.py,sha256=N7NPfvKHm00ejWlUFJITzAJ6D4zcFb1ihwKvh5s-EeU,13925
-yapcad/drawable.py,sha256=RKG8emMC0E6__-L89zrBVxAB1JiFUPA51cAweCu7zP8,14605
-yapcad/ezdxf_drawable.py,sha256=Dhx2gOpRpOQsq_W8htQifecyMD_h3-KIMqb6sUBt-_A,5478
-yapcad/geom.py,sha256=nzCPYIsse6Z66AIYxWVoD7IddtrCNcwGWZDX06Mh-_w,108801
-yapcad/geom3d.py,sha256=W6gmo8UifgFwy3HHQvgvvgp96l2ahMqTVyTmbXqNEd8,2865
-yapcad/geometry.py,sha256=hCVnJvZXX6R4c8bWTwsWGq0tzTUJtzB974Q7s8vO28U,2549
-yapcad/poly.py,sha256=Fku0ynBzYUSb5UZA6WY0yLPmDTc_Eg6BVE3DUKqiJqo,21447
-yapcad/pyglet_drawable.py,sha256=dV9dcwzZRlPwhx18Dv0CX7wQOCxnxwk4Si_FL9heNs8,18475
-yapcad/xform.py,sha256=kL2xAsTlbhZplPwpWERbNp6Izkr2l90sRUf_fSfL3uw,9235
-yapCAD-0.2.0.dist-info/AUTHORS.rst,sha256=JzvJA3p1aSIOTaaB3aCtB-ZrUQrVm869gdROUV5bRh8,84
-yapCAD-0.2.0.dist-info/LICENSE,sha256=NkGvciCD5MEHmCtnivAi2PqcEhBYAkSAarP-bWAoknM,1071
-yapCAD-0.2.0.dist-info/LICENSE.txt,sha256=FyT_Hxn5USuJ1Mu3-4Ou4T2x-Dzfiy06ZOnWkfdJ33o,1081
-yapCAD-0.2.0.dist-info/METADATA,sha256=fJHMA91Wp6AYjsVgjEkxqAL9s81XnF6x-IQmDQZWiF4,18142
-yapCAD-0.2.0.dist-info/WHEEL,sha256=HX-v9-noUkyUoxyZ1PMSuS7auUxDAR4VBdoYLqD0xws,110
-yapCAD-0.2.0.dist-info/top_level.txt,sha256=NAtnfsyeALrvhI63FGS3_TEUh26OKRvnm1_lCOOgjKA,7
-yapCAD-0.2.0.dist-info/RECORD,,

yapcad/acdxf.py

@@ -1,120 +0,0 @@
-## yapCAD support functions for working with Autodesk's DXF file format
-## Created on Fri Oct  9 16:06:08 PDT 2020
-## Copyright (c) 2020 Richard W. DeVaul
-## Copyright (c) 2020 yapCAD contributors
-## All rights reserved
-## See licensing terms here: https://github.com/rdevaul/yapCAD/blob/master/LICENSE
-
-from yapcad.geom import *
-import math
-
-## eqivalent to autoLISP polar function
-## note this function works in radians
-def polar(p,ang,r):
-    x = math.cos(ang)*r
-    y = math.sin(ang)*r
-    return add(p,point(x,y))
-
-## equivalent to autoLISP angle function
-## note this function returns radians
-def angle(p1,p2):
-    if vclose(p1,p2):
-        raise ValueError('coincident points')
-    pp = sub(p2,p1)
-    return atan2(pp[1],pp[0])
-
-## utility functions for radian/degree conversions
-def rad2deg(theta):
-    return theta*360.0/pi2
-
-def deg2rad(theta):
-    return theta*pi2/360.0
-
-## function to convert from DXF Polyline "bulge" representation to
-## a yapCAD arc.
-## Thanks to Lee Mac for autoLISP code examples
-## http://www.lee-mac.com/bulgeconversion.html
-def bulge2arc(p1,p2,b):
-    a = 2.0 * math.atan(b)
-    r = dist(p1,p2) / (math.sin(a)*2.0)
-    c = polar(p1, ((math.pi/2.0 - a) + angle(p1, p2)),r)
-    a1 = rad2deg(angle(c,p1))
-    a2 = rad2deg(angle(c,p2))
-    if b < 0.0:
-        return arc(c,abs(r),a2,a1)
-    else:
-        return arc(c,abs(r),a1,a2)
-
-## function to convert from a yapCAD arc to a DXF Polyline "bulge"
-## representaiton.
-## Thanks to Lee Mac for autoLISP code examples
-def arc2bulge(ac):
-    c = ac[0]
-    r= ac[1][0]
-    a1=deg2rad(ac[1][1])
-    a2=deg2rad(ac[1][2])
-    
-    b = math.tan(((a2-a1)%pi2)/4.0)
-
-    return [polar(c,a1,r),polar(c,a2,r),b]
-
-
-## Function to convert a yapCAD poly (point list) to an internal DXF
-## polyline representation
-def yappoly2acpoly(plist):
-    dxfpoly=[]
-    for i in range(len(plist)-1):
-        p=plist[i]
-        dxfpoly.append([p[0],p[1],0,-2])
-    p = plist[-1]
-    dxfpoly.append([p[0],p[1],0,-2])
-    return dxfpoly
-
-## funtion to convert a yapCAD geometry list to a list of DXF
-## polylines. Each contiguous sequence of yapCAD lines, arcs, and
-## polys will be converted into a DXF polyline.
-
-## If there are elements, such as circles, that aren't convertable to
-## a DXF polyline representation, they will be added to a separate
-## "nonconvertable" yapCAD geometry list.
-
-## Return value ( dxfpolys , nonconvertable ), where dxfpolys is a
-## list of contiguous dxf bulge polyline representations, and
-## nonconvertable is a yapCAD geometry list of remainders
-
-def yapgeom2acpoly(glist):
-    ## internal function to take a non-zero-length geometry list and
-    ## return one or more contiguous geometry lists
-    def gl2contig(gl):
-        nonconv=[]
-        ggl=[]
-        cl=[gl[0]]
-        ep = sample(cl[0],1.0) # find endpoint of first element
-        for i in range(1,len(gl)):
-            g = gl[i]
-            sp = sample(g,0.0) # find start of current element
-            if vclose(sp,ep): # are they close?
-                cl.append(g) # yep, append
-            else:
-                ggl.append(cl) #nope, finish out current list, start
-                               #new one
-                cl=g
-            ep = sample(g,1.0)
-        return ggl
-    if not isgeomlist(glist):
-        return False
-    
-    ypgls = gl2contig(glist)
-    dxfgls = []
-    dxfgl = []
-    for ypgl in ypgls:
-        dxfpoly=[]
-        for i in range(1,len(ypgl)):
-            if ispoint(gl):
-                ## bogus, unfinished function
-                return
-
-        return
-
-
-