ezdxf 1.3.2__zip → 1.3.2b1__zip

{ezdxf-1.3.2/src/ezdxf.egg-info → ezdxf-1.3.2b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.3.2
+Version: 1.3.2b1
 Summary: A Python package to create/manipulate DXF drawings.
 Author-email: Manfred Moitzi <me@mozman.at>
 Project-URL: Repository, https://github.com/mozman/ezdxf

{ezdxf-1.3.2 → ezdxf-1.3.2b1}/src/ezdxf/addons/drawing/properties.py

@@ -356,10 +356,9 @@ class RenderContext:
             self.pdsize = doc.header.get("$PDSIZE", 1.0)
             self.pdmode = doc.header.get("$PDMODE", 0)
             if doc.filename is not None:
-                filename = doc.filename
-                if isinstance(filename, str):
-                    filename = filename.replace("\\", os.path.sep)
-                self.document_dir = pathlib.Path(filename).parent.resolve()
+                self.document_dir = pathlib.Path(
+                    doc.filename.replace("\\", os.path.sep)
+                ).parent.resolve()
             self._setup_text_styles(doc)
             try:
                 self.units = InsertUnits(doc.header.get("$INSUNITS", 0))

{ezdxf-1.3.2 → ezdxf-1.3.2b1}/src/ezdxf/addons/odafc.py

@@ -149,7 +149,7 @@ def readfile(
         out_file = Path(tmp_dir) / infile.with_suffix(".dxf").name
         if out_file.exists():
             doc = ezdxf.readfile(str(out_file))
-            doc.filename = str(infile.with_suffix(".dxf"))
+            doc.filename = infile.with_suffix(".dxf")
             return doc
     raise UnknownODAFCError("Failed to convert file: Unknown Error")
 

{ezdxf-1.3.2 → ezdxf-1.3.2b1}/src/ezdxf/edgeminer.py

@@ -37,7 +37,7 @@ Leaf
 Junction
     A junction is a vertex of degree greater 2.
     A junction has more than two adjacent edges.
-    A junction is an ambiguity when searching for open chains or closed loops.
+    A junction is an ambiguity when seaarching for open chains or closed loops.
     Graph Theory: multiple adjacency
 
 Chain
@@ -87,7 +87,7 @@ Forward Connection
     THE RELEASE IN EZDXF V1.4.
 
 .. _Graph Theory: https://en.wikipedia.org/wiki/Glossary_of_graph_theory
-.. _GeeksForGeeks: https://www.geeksforgeeks.org/graph-data-structure-and-algorithms/?ref=shm
+.. _GeeksforGeeks: https://www.geeksforgeeks.org/graph-data-structure-and-algorithms/?ref=shm
 
 """
 from __future__ import annotations
@@ -126,7 +126,7 @@ ABS_TOl = 1e-9
 TIMEOUT = 60.0  # in seconds
 
 
-class TimeoutError(Exception):  # noqa
+class TimeoutError(Exception):
     def __init__(self, msg: str, solutions: Sequence[Sequence[Edge]] = tuple()) -> None:
         super().__init__(msg)
         self.solutions = solutions
@@ -197,7 +197,7 @@ class Edge(NamedTuple):
 
     def reversed(self) -> Self:
         """Returns a reversed copy."""
-        return self.__class__(  # noqa
+        return self.__class__(
             self.id,  # edge and its reversed edge must have the same id!
             self.end,
             self.start,
@@ -224,7 +224,7 @@ id_generator = make_id_generator()
 def make_edge(
     start: UVec, end: UVec, length: float = -1.0, *, payload: Any = None
 ) -> Edge:
-    """Creates a new :class:`Edge` with a unique id."""
+    """Creates a new :class:`Edge` with an unique id."""
     start = Vec3(start)
     end = Vec3(end)
     if length < 0.0:
@@ -266,7 +266,7 @@ class Deposit:
         Different gap tolerances may yield different results.
 
         """
-        # no caching: result depends on gap_tol, which is mutable
+        # no caching: result depends on gap_tol, which is muteable
         counter: Counter[int] = Counter()
         search = functools.partial(
             self._search_index.vertices_in_sphere, radius=self.gap_tol
@@ -310,7 +310,7 @@ class Deposit:
         Ignores vertices that are close to another vertex (within the range of gap_tol).
         It is not determined which of the close vertices is returned.
 
-        e.g. if the vertices a, b are close together, you don't know if you get a or b,
+        e.g. if the vertices a, b are close together, you don't know if you get a or b
         but it's guaranteed that you only get one of them
         """
         return filter_close_vertices(self._search_index.rtree, self.gap_tol)
@@ -642,7 +642,7 @@ def unique_chains(chains: Sequence[Sequence[Edge]]) -> Iterator[Sequence[Edge]]:
     seen: set[frozenset[int]] = set()
     for chain in chains:
         key = frozenset(edge.id for edge in chain)
-        if key not in seen:
+        if not key in seen:
             yield chain
             seen.add(key)
 
@@ -755,15 +755,15 @@ class LoopFinder:
             if watchdog.has_timed_out:
                 raise TimeoutError(
                     "search process has timed out",
-                    solutions=tuple(self._solutions.values()),  # noqa
+                    solutions=tuple(self._solutions.values()),
                 )
             chain = todo.pop()
             last_edge = chain[-1]
             end_point = last_edge.end
             candidates = deposit.edges_linked_to(end_point, radius=gap_tol)
             # edges must be unique in a loop
-            survivors = set(candidates) - set(chain)
-            for edge in survivors:
+            survivers = set(candidates) - set(chain)
+            for edge in survivers:
                 if isclose(end_point, edge.start, gap_tol):
                     next_edge = edge
                 else:
@@ -949,7 +949,7 @@ def find_all_open_chains(deposit: Deposit, timeout=TIMEOUT) -> Sequence[Sequence
     """Returns all open chains from `deposit`.
 
     Returns only simple chains ending on both sides with a leaf.
-    A leaf is a vertex of degree 1 without further connections.
+    A leaf is an vertex of degree 1 without further connections.
     All vertices have a degree of 2 except for the leafs at the start and end.
     The result does not include reversed solutions or closed loops.
 
@@ -958,7 +958,7 @@ def find_all_open_chains(deposit: Deposit, timeout=TIMEOUT) -> Sequence[Sequence
         Recursive backtracking algorithm with time complexity of O(n!).
 
     Args:
-        deposit: EdgeDeposit
+        edosit: EdgeDeposit
         timeout: timeout in seconds
 
     Raises:
@@ -1119,8 +1119,7 @@ def sort_edges_to_base(
 
     Args:
         edges: list of edges to sort
-        base: base edge for sorting, represents 0-radian
-        gap_tol: maximum vertex distance to consider two edges as connected
+        base: base edge for sorting, represents 0-radians
 
     Raises:
         ValueError: edge is not connected to center
@@ -1161,18 +1160,18 @@ def find_loop_by_edge(deposit: Deposit, start: Edge, clockwise=True) -> Sequence
         end_point = last_edge.end
         candidates = deposit.edges_linked_to(end_point, radius=gap_tol)
         # edges must be unique in a loop
-        survivors = set(candidates) - chain_set
-        count = len(survivors)
+        survivers = set(candidates) - chain_set
+        count = len(survivers)
         if count == 0:
             return tuple()  # dead end
         if count > 1:
-            sorted_edges = sort_edges_to_base(survivors, last_edge, gap_tol)
+            sorted_edges = sort_edges_to_base(survivers, last_edge, gap_tol)
             if clockwise:
                 next_edge = sorted_edges[-1]  # first clockwise edge
             else:
                 next_edge = sorted_edges[0]  # first counter-clockwise edge
         else:
-            next_edge = survivors.pop()
+            next_edge = survivers.pop()
         if not isclose(next_edge.start, end_point, gap_tol):
             next_edge = next_edge.reversed()
         chain.append(next_edge)

{ezdxf-1.3.2 → ezdxf-1.3.2b1}/src/ezdxf/edgesmith.py

@@ -32,10 +32,10 @@ from ezdxf.math import (
 
 __all__ = [
     "chain_vertices",
+    "edge_from_entity",
     "edges_from_entities",
     "is_closed_entity",
     "lwpolyline_from_chain",
-    "make_edge",
     "polyline2d_from_chain",
 ]
 # Tolerances
@@ -44,7 +44,6 @@ DEG_TOL = 1e-9  # angles in degree
 RAD_TOL = 1e-9  # angles in radians
 
 
-# noinspection PyUnusedLocal
 @functools.singledispatch
 def is_closed_entity(entity: et.DXFEntity) -> bool:
     """Returns ``True`` if the given entity represents a closed loop."""
@@ -125,7 +124,6 @@ def _validate_edge(edge: em.Edge, gap_tol: float) -> em.Edge | None:
     return edge
 
 
-# noinspection PyUnusedLocal
 @functools.singledispatch
 def make_edge(entity: et.DXFEntity, gap_tol=em.GAP_TOL) -> em.Edge | None:
     """Makes an :class:`Edge` instance from the following DXF entity types:
@@ -174,7 +172,7 @@ def _edge_from_ellipse(entity: et.Ellipse, gap_tol=em.GAP_TOL) -> em.Edge | None
     if ct1.major_axis.magnitude < LEN_TOL or ct1.minor_axis.magnitude < LEN_TOL:
         return None
     span = ellipse_param_span(ct1.start_param, ct1.end_param)
-    num = max(3, round(span / 0.1745))  # resolution of ~1 deg
+    num = max(3, round(span / 0.1745))  #  resolution of ~1 deg
     # length of elliptic arc is an approximation:
     points = list(ct1.vertices(ct1.params(num)))
     length = sum(a.distance(b) for a, b in zip(points, points[1:]))
@@ -304,13 +302,13 @@ def polyline_points(edges: Sequence[em.Edge]) -> BulgePoints:
         return pts
 
     # bulge value is stored in the start vertex of the curved segment
-    points: list[Vec2] = [Vec2(edges[0].start)]
+    points: list[Vec3] = [edges[0].start]
     bulges: list[float] = [0.0]
     for edge in edges:
         current_end = points[-1]
         if edge.start.distance(current_end) < LEN_TOL:
             current_end = edge.start
-            points.append(Vec2(current_end))
+            points.append(current_end)
             bulges.append(0.0)
         entity = edge.payload
         if isinstance(entity, et.Arc):
@@ -336,6 +334,6 @@ def polyline_points(edges: Sequence[em.Edge]) -> BulgePoints:
                 vertices = reverse(vertices)
             extend(vertices)
             continue
-        points.append(Vec2(edge.end))
+        points.append(edge.end)
         bulges.append(0.0)
     return list(zip(points, bulges))

{ezdxf-1.3.2 → ezdxf-1.3.2b1}/src/ezdxf/entities/dxfgfx.py

@@ -179,6 +179,7 @@ class DXFGraphic(DXFEntity):
     """Common base class for all graphic entities, a subclass of
     :class:`~ezdxf.entities.dxfentity.DXFEntity`. These entities resides in
     entity spaces like modelspace, paperspace or block.
+
     """
 
     DXFTYPE = "DXFGFX"
@@ -216,8 +217,7 @@ class DXFGraphic(DXFEntity):
         return dxf
 
     def post_new_hook(self) -> None:
-        """Post-processing and integrity validation after entity creation.
-
+        """Post-processing and integrity validation after entity creation
         (internal API)
         """
         if self.doc:
@@ -227,26 +227,20 @@ class DXFGraphic(DXFEntity):
                 )
 
     @property
-    def rgb(self) -> tuple[int, int, int] | None:
-        """Returns RGB true color as (r, g, b) tuple or None if true_color is not set."""
+    def rgb(self) -> Optional[clr.RGB]:
+        """Returns RGB true color as (r, g, b) tuple or None if true_color is
+        not set.
+        """
         if self.dxf.hasattr("true_color"):
             return clr.int2rgb(self.dxf.get("true_color"))
-        return None
+        else:
+            return None
 
     @rgb.setter
-    def rgb(self, rgb: clr.RGB | tuple[int, int, int]) -> None:
-        """Set RGB true color as (r, g , b) tuple e.g. (12, 34, 56).
-
-        Raises:
-            TypeError: input value `rgb` has invalid type
-        """
+    def rgb(self, rgb: clr.RGB) -> None:
+        """Set RGB true color as (r, g , b) tuple e.g. (12, 34, 56)."""
         self.dxf.set("true_color", clr.rgb2int(rgb))
 
-    @rgb.deleter
-    def rgb(self) -> None:
-        """Delete RGB true color value."""
-        self.dxf.discard("true_color")
-
     @property
     def transparency(self) -> float:
         """Get transparency as float value between 0 and 1, 0 is opaque and 1
@@ -280,6 +274,7 @@ class DXFGraphic(DXFEntity):
     def graphic_properties(self) -> dict:
         """Returns the important common properties layer, color, linetype,
         lineweight, ltscale, true_color and color_name as `dxfattribs` dict.
+
         """
         attribs = dict()
         for key in GRAPHIC_PROPERTIES:
@@ -291,6 +286,7 @@ class DXFGraphic(DXFEntity):
         """Returns object coordinate system (:ref:`ocs`) for 2D entities like
         :class:`Text` or :class:`Circle`, returns a pass-through OCS for
         entities without OCS support.
+
         """
         # extrusion is only defined for 2D entities like Text, Circle, ...
         if self.dxf.is_supported("extrusion"):
@@ -381,6 +377,7 @@ class DXFGraphic(DXFEntity):
         It is more efficient to call the
         :meth:`~ezdxf.layouts.BaseLayout.unlink_entity` method of the associated
         layout, especially if you have to unlink more than one entity.
+
         """
         if not self.is_alive:
             raise TypeError("Can not unlink destroyed entity.")
@@ -409,6 +406,7 @@ class DXFGraphic(DXFEntity):
 
         Raises:
             DXFStructureError: for moving between different DXF drawings
+
         """
         if source is None:
             source = self.get_layout()
@@ -427,6 +425,7 @@ class DXFGraphic(DXFEntity):
 
         Raises:
             DXFStructureError: for copying between different DXF drawings
+
         """
         if self.doc != layout.doc:
             raise const.DXFStructureError(
@@ -448,6 +447,7 @@ class DXFGraphic(DXFEntity):
                 auditor.trash(entity)
 
             to delete invalid entities after auditing automatically.
+
         """
         assert self.doc is auditor.doc, "Auditor for different DXF document."
         if not self.is_alive:
@@ -474,6 +474,7 @@ class DXFGraphic(DXFEntity):
 
         Args:
              m: 4x4 transformation matrix (:class:`ezdxf.math.Matrix44`)
+
         """
         raise NotImplementedError()
 
@@ -493,18 +494,21 @@ class DXFGraphic(DXFEntity):
 
         Basic implementation uses the :meth:`transform` interface, subclasses
         may have faster implementations.
+
         """
         return self.transform(Matrix44.translate(dx, dy, dz))
 
     def scale(self, sx: float, sy: float, sz: float) -> Self:
         """Scale entity inplace about `dx` in x-axis, `dy` in y-axis and `dz`
         in z-axis, returns `self` (floating interface).
+
         """
         return self.transform(Matrix44.scale(sx, sy, sz))
 
     def scale_uniform(self, s: float) -> Self:
         """Scale entity inplace uniform about `s` in x-axis, y-axis and z-axis,
         returns `self` (floating interface).
+
         """
         return self.transform(Matrix44.scale(s))
 
@@ -515,6 +519,7 @@ class DXFGraphic(DXFEntity):
         Args:
             axis: rotation axis as tuple or :class:`Vec3`
             angle: rotation angle in radians
+
         """
         return self.transform(Matrix44.axis_rotate(axis, angle))
 
@@ -524,6 +529,7 @@ class DXFGraphic(DXFEntity):
 
         Args:
             angle: rotation angle in radians
+
         """
         return self.transform(Matrix44.x_rotate(angle))
 
@@ -533,6 +539,7 @@ class DXFGraphic(DXFEntity):
 
         Args:
             angle: rotation angle in radians
+
         """
         return self.transform(Matrix44.y_rotate(angle))
 
@@ -542,6 +549,7 @@ class DXFGraphic(DXFEntity):
 
         Args:
             angle: rotation angle in radians
+
         """
         return self.transform(Matrix44.z_rotate(angle))
 
@@ -681,6 +689,7 @@ def add_entity(entity: DXFGraphic, layout: BaseLayout) -> None:
 def replace_entity(source: DXFGraphic, target: DXFGraphic, layout: BaseLayout) -> None:
     """Add `target` entity to the entity database and to the given `layout`
     and replace the `source` entity by the `target` entity.
+
     """
     assert target.dxf.handle is None
     assert layout is not None