ezdxf 1.3.0b1__zip → 1.3.1__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.3.0b1
+Version: 1.3.1
 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.1/integration_tests/test_acis_entites.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2024, Manfred Moitzi
+# License: MIT License
+import pytest
+import ezdxf
+
+from ezdxf.document import Drawing
+from ezdxf.math import Matrix44
+from ezdxf.render.forms import cube
+from ezdxf.acis.api import body_from_mesh, export_sab
+
+FILENAME = "3dsolid.dxf"
+
+
+@pytest.fixture
+def doc():
+    acis_body = body_from_mesh(cube())
+    _doc = ezdxf.new()
+    msp = _doc.modelspace()
+    dxf_3dsolid = msp.add_3dsolid()
+    dxf_3dsolid.sab = export_sab([acis_body])
+    dxf_3dsolid.transform(Matrix44.translate(10, 11, 12))
+    return _doc
+
+
+def test_apply_transformations_to_acis_entities(doc: Drawing):
+    # this is done automatically when exporting the DXF document
+    try:
+        doc.commit_pending_changes()
+    except Exception as e:
+        pytest.fail(f"commit_pending_changes() raises unexpected exception: {str(e)}")
+
+
+def test_export_and_reload_transformed_acis_entities(tmp_path, doc: Drawing):
+    file_path = tmp_path / FILENAME
+    doc.saveas(file_path)
+    del doc
+
+    doc2 = ezdxf.readfile(file_path)
+    # Do not test the current implementation, this may change in the future:
+    solids = doc2.query("3DSOLID")
+    assert len(solids) == 1
+
+    dxf_3dsolid = solids[0]
+    assert len(dxf_3dsolid.sab) > 16
+
+
+if __name__ == "__main__":
+    pytest.main([__file__])

ezdxf-1.3.1/integration_tests/test_xref_load_acis.py

@@ -0,0 +1,85 @@
+# Copyright (c) 2024, Manfred Moitzi
+# License: MIT License
+import pytest
+
+import ezdxf
+import ezdxf.xref
+from ezdxf.document import Drawing
+from ezdxf.entities import Solid3d
+from ezdxf.render import forms
+
+
+def source_doc_R2007() -> Drawing:
+    doc = ezdxf.new("R2007")
+    msp = doc.modelspace()
+    forms.cube().render_3dsolid(msp)
+    return doc
+
+
+def source_doc_R2013() -> Drawing:
+    doc = ezdxf.new("R2013")
+    msp = doc.modelspace()
+    forms.cube().render_3dsolid(msp)
+    return doc
+
+
+def test_load_acis_from_R2007():
+    target_doc = ezdxf.new("R2007")
+    source_doc = source_doc_R2007()
+    source_msp = source_doc.modelspace()
+    source_cube = source_msp[0]
+    assert isinstance(source_cube, Solid3d)
+
+    ezdxf.xref.load_modelspace(source_doc, target_doc)
+
+    target_msp = target_doc.modelspace()
+    loaded_cube = target_msp[0]
+    assert isinstance(loaded_cube, Solid3d)
+    assert loaded_cube.sat == source_cube.sat
+
+
+def test_load_acis_from_R2013():
+    target_doc = ezdxf.new("R2013")
+    source_doc = source_doc_R2013()
+    source_msp = source_doc.modelspace()
+    source_cube = source_msp[0]
+    assert isinstance(source_cube, Solid3d)
+
+    ezdxf.xref.load_modelspace(source_doc, target_doc)
+
+    target_msp = target_doc.modelspace()
+    loaded_cube = target_msp[0]
+    assert isinstance(loaded_cube, Solid3d)
+    sab = loaded_cube.sab
+    assert len(sab) > 1
+    assert sab == source_cube.sab
+
+
+def test_load_acis_from_2007_into_2013():
+    target_doc = ezdxf.new("R2013")  # SAB
+
+    source_doc = source_doc_R2007()
+    ezdxf.xref.load_modelspace(source_doc, target_doc)
+
+    target_msp = target_doc.modelspace()
+    loaded_cube = target_msp[0]
+    assert isinstance(loaded_cube, Solid3d)
+    assert len(loaded_cube.sat) == 0, "SAT data removed"
+    assert len(loaded_cube.sab) == 0
+
+
+def test_load_acis_from_2013_into_2007():
+    target_doc = ezdxf.new("R2007")  # SAT
+
+    source_doc = source_doc_R2013()
+    ezdxf.xref.load_modelspace(source_doc, target_doc)
+
+    target_msp = target_doc.modelspace()
+    loaded_cube = target_msp[0]
+    assert isinstance(loaded_cube, Solid3d)
+    assert len(loaded_cube.sat) == 0
+    assert len(loaded_cube.sab) == 0, "SAB data removed"
+
+
+if __name__ == "__main__":
+    pytest.main([__file__])

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/acis/api.py

@@ -1,5 +1,5 @@
-#  Copyright (c) 2022-2024, Manfred Moitzi
-#  License: MIT License
+# Copyright (c) 2022-2024, Manfred Moitzi
+# License: MIT License
 # Public API module (interface)
 """
 The main goals of this ACIS support library is:
@@ -24,7 +24,8 @@ from .const import (
     InvalidLinkStructure,
     ExportError,
 )
-from .mesh import mesh_from_body, body_from_mesh
+from .mesh import mesh_from_body, body_from_mesh, vertices_from_body
 from .entities import load, export_sat, export_sab, Body
 from .dbg import AcisDebugger, dump_sab_as_text
-from .dxf import export_dxf, load_dxf
+from .dxf import export_dxf, load_dxf
+from .cache import AcisCache

ezdxf-1.3.1/src/ezdxf/acis/cache.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2024, Manfred Moitzi
+# License: MIT License
+from __future__ import annotations
+from typing import TYPE_CHECKING, Sequence
+from .entities import Body, load
+from .type_hints import EncodedData
+
+if TYPE_CHECKING:
+    from ezdxf.entities import DXFEntity
+
+__all__ = ["AcisCache"]
+NO_BODIES: Sequence[Body] = tuple()
+
+
+class AcisCache:
+    """This cache manages ACIS bodies created from SAT or SAB data stored in DXF 
+    entities.
+    
+    Each entry is a list of ACIS bodies and is indexed by a hash calculated from the 
+    source content of the SAT or SAB data.
+
+    """
+    def __init__(self) -> None:
+        self._entries: dict[int, Sequence[Body]] = {}
+        self.hits: int = 0
+        self.misses: int = 0
+
+    @staticmethod
+    def hash_data(data: EncodedData) -> int:
+        if isinstance(data, list):
+            return hash(tuple(data))
+        elif isinstance(data, bytearray):
+            return hash(bytes(data))
+        return hash(data)
+
+    def __len__(self) -> int:
+        return len(self._entries)
+
+    def get_bodies(self, data: EncodedData) -> Sequence[Body]:
+        if not data:
+            return NO_BODIES
+        
+        hash_value = AcisCache.hash_data(data)
+        bodies = self._entries.get(hash_value, NO_BODIES)
+        if bodies is not NO_BODIES:
+            self.hits += 1
+            return bodies
+        
+        self.misses += 1
+        bodies = tuple(load(data))
+        self._entries[hash_value] = bodies
+        return bodies
+    
+    def from_dxf_entity(self, entity: DXFEntity) ->  Sequence[Body]:
+        from ezdxf.entities import Body as DxfBody
+
+        if not isinstance(entity, DxfBody):
+            return NO_BODIES
+        return self.get_bodies(entity.acis_data)

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/acis/entities.py

@@ -1,12 +1,13 @@
 #  Copyright (c) 2022-2024, Manfred Moitzi
 #  License: MIT License
 from __future__ import annotations
-from typing import Union, Callable, Type, Any, Sequence, Iterator
+from typing import Callable, Type, Any, Sequence, Iterator
 import abc
 
 from . import sab, sat, const, hdr
 from .const import Features
 from .abstract import DataLoader, AbstractEntity, DataExporter
+from .type_hints import EncodedData
 from ezdxf.math import Matrix44, Vec3, NULLVEC
 
 Factory = Callable[[AbstractEntity], "AcisEntity"]
@@ -15,7 +16,7 @@ ENTITY_TYPES: dict[str, Type[AcisEntity]] = {}
 INF = float("inf")
 
 
-def load(data: Union[str, Sequence[str], bytes, bytearray]) -> list[Body]:
+def load(data: EncodedData) -> list[Body]:
     """Returns a list of :class:`Body` entities from :term:`SAT` or :term:`SAB`
     data. Accepts :term:`SAT` data as a single string or a sequence of strings
     and :term:`SAB` data as bytes or bytearray.
@@ -119,9 +120,7 @@ class AcisEntity(NoneEntity):
         self.restore_common(loader, entity_factory)
         self.restore_data(loader)
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         """Load the common part of an ACIS entity."""
         pass
 
@@ -149,7 +148,7 @@ class AcisEntity(NoneEntity):
         pass
 
     def entities(self) -> Iterator[AcisEntity]:
-        """Yield all attributes of this entity of type AcisEntity. """
+        """Yield all attributes of this entity of type AcisEntity."""
         for e in vars(self).values():
             if isinstance(e, AcisEntity):
                 yield e
@@ -210,9 +209,7 @@ class AsmHeader(AcisEntity):
     def __init__(self, version: str = ""):
         self.version = version
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         self.version = loader.read_str()
 
     def write_common(self, exporter: DataExporter) -> None:
@@ -222,9 +219,7 @@ class AsmHeader(AcisEntity):
 class SupportsPattern(AcisEntity):
     pattern: Pattern = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         if loader.version >= Features.PATTERN:
             self.pattern = restore_entity("pattern", loader, entity_factory)
 
@@ -238,11 +233,9 @@ class Body(SupportsPattern):
     pattern: Pattern = NONE_REF
     lump: Lump = NONE_REF
     wire: Wire = NONE_REF
-    transform: "Transform" = NONE_REF
+    transform: Transform = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.lump = restore_entity("lump", loader, entity_factory)
         self.wire = restore_entity("wire", loader, entity_factory)
@@ -292,9 +285,7 @@ class Lump(SupportsPattern):
     shell: Shell = NONE_REF
     body: Body = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.next_lump = restore_entity("lump", loader, entity_factory)
         self.shell = restore_entity("shell", loader, entity_factory)
@@ -336,9 +327,7 @@ class Shell(SupportsPattern):
     wire: Wire = NONE_REF
     lump: Lump = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.next_shell = restore_entity("next_shell", loader, entity_factory)
         self.subshell = restore_entity("subshell", loader, entity_factory)
@@ -390,14 +379,10 @@ class Face(SupportsPattern):
     surface: Surface = NONE_REF
     # sense: face normal with respect to the surface
     sense = False  # True = reversed; False = forward
-    double_sided = (
-        False  # True = double (hollow body); False = single (solid body)
-    )
+    double_sided = False  # True = double (hollow body); False = single (solid body)
     containment = False  # if double_sided: True = in, False = out
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.next_face = restore_entity("face", loader, entity_factory)
         self.loop = restore_entity("loop", loader, entity_factory)
@@ -479,9 +464,7 @@ class Plane(Surface):
     # False: "forward_v" - the normal vector follows right-hand rule
     reverse_v = False
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.origin = Vec3(loader.read_vec3())
         self.normal = Vec3(loader.read_vec3())
@@ -514,9 +497,7 @@ class Loop(SupportsPattern):
     coedge: Coedge = NONE_REF
     face: Face = NONE_REF  # parent/owner
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.next_loop = restore_entity("loop", loader, entity_factory)
         self.coedge = restore_entity("coedge", loader, entity_factory)
@@ -577,9 +558,7 @@ class Coedge(SupportsPattern):
     unknown: int = 0  # only in SAB file!?
     pcurve: PCurve = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.next_coedge = restore_entity("coedge", loader, entity_factory)
         self.prev_coedge = restore_entity("coedge", loader, entity_factory)
@@ -618,7 +597,7 @@ class Coedge(SupportsPattern):
         pass
 
     def partner_coedges(self) -> list[Coedge]:
-        """Returns all partner coedges of this coedge without `self`. """
+        """Returns all partner coedges of this coedge without `self`."""
         coedges: list[Coedge] = []
         partner_coedge = self.partner_coedge
         if partner_coedge.is_none:
@@ -649,9 +628,7 @@ class Edge(SupportsPattern):
     sense: bool = False
     convexity: str = "unknown"
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.start_vertex = restore_entity("vertex", loader, entity_factory)
         if loader.version >= Features.TOL_MODELING:
@@ -690,9 +667,7 @@ class Vertex(SupportsPattern):
     ref_count: int = 0  # only in SAB files
     point: Point = NONE_REF
 
-    def restore_common(
-        self, loader: DataLoader, entity_factory: Factory
-    ) -> None:
+    def restore_common(self, loader: DataLoader, entity_factory: Factory) -> None:
         super().restore_common(loader, entity_factory)
         self.edge = restore_entity("edge", loader, entity_factory)
         self.ref_count = loader.read_int(skip_sat=0)
@@ -759,7 +734,7 @@ class Point(SupportsPattern):
 
 
 class FileLoader(abc.ABC):
-    records: Sequence[Union[sat.SatEntity, sab.SabEntity]]
+    records: Sequence[sat.SatEntity | sab.SabEntity]
 
     def __init__(self, version: int):
         self.entities: dict[int, AcisEntity] = {}
@@ -796,7 +771,7 @@ class FileLoader(abc.ABC):
 
 
 class SabLoader(FileLoader):
-    def __init__(self, data: Union[bytes, bytearray]):
+    def __init__(self, data: bytes | bytearray):
         builder = sab.parse_sab(data)
         super().__init__(builder.header.version)
         self.records = builder.entities
@@ -805,14 +780,14 @@ class SabLoader(FileLoader):
         return sab.SabDataLoader(data, self.version)
 
     @classmethod
-    def load(cls, data: Union[bytes, bytearray]) -> list[Body]:
+    def load(cls, data: bytes | bytearray) -> list[Body]:
         loader = cls(data)
         loader.load_entities()
         return loader.bodies()
 
 
 class SatLoader(FileLoader):
-    def __init__(self, data: Union[str, Sequence[str]]):
+    def __init__(self, data: str | Sequence[str]):
         builder = sat.parse_sat(data)
         super().__init__(builder.header.version)
         self.records = builder.entities
@@ -821,7 +796,7 @@ class SatLoader(FileLoader):
         return sat.SatDataLoader(data, self.version)
 
     @classmethod
-    def load(cls, data: Union[str, Sequence[str]]) -> list[Body]:
+    def load(cls, data: str | Sequence[str]) -> list[Body]:
         loader = cls(data)
         loader.load_entities()
         return loader.bodies()

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/acis/mesh.py

@@ -333,3 +333,83 @@ def make_vertices(vertices: Iterable[Vec3]) -> Iterator[entities.Vertex]:
         vertex = entities.Vertex()
         vertex.point = point
         yield vertex
+
+
+def vertices_from_body(body: Body) -> list[Vec3]:
+    """Returns all stored vertices in the given :class:`Body` entity.
+    The result is not optimized, meaning the vertices are in no particular order and
+    there are duplicates.
+
+    This function can be useful to determining the approximate bounding box of an 
+    :term:`ACIS` entity.  The result is exact for polyhedra with flat faces with 
+    straight edges, but not for bodies with curved edges and faces.
+
+    Args:
+        body: ACIS entity of type :class:`Body`
+
+    Raises:
+        TypeError: given `body` entity has invalid type
+
+    """
+
+    if not isinstance(body, Body):
+        raise TypeError(f"expected a body entity, got: {type(body)}")
+    lump = body.lump
+    transform = body.transform
+    vertices: list[Vec3] = []
+
+    m: Optional[Matrix44] = None
+    if not transform.is_none:
+        m = transform.matrix
+    while not lump.is_none:
+        vertices.extend(vertices_from_lump(lump, m))
+        lump = lump.next_lump
+    return vertices
+
+
+def vertices_from_lump(lump: Lump, m: Matrix44 | None = None) -> list[Vec3]:
+    """Returns all stored vertices from a given :class:`Lump` entity. 
+    Applies the transformation :class:`~ezdxf.math.Matrix44` `m` to all vertices if not 
+    ``None``.
+
+    Args:
+        lump: :class:`Lump` entity
+        m: optional transformation matrix
+
+    Raises:
+        TypeError: `lump` has invalid ACIS type
+
+    """
+    if not isinstance(lump, Lump):
+        raise TypeError(f"expected a lump entity, got: {type(lump)}")
+
+    vertices: list[Vec3] = []
+    shell = lump.shell
+    if shell.is_none:
+        return vertices  # not a shell
+
+    face = shell.face
+    while not face.is_none:
+        first_coedge = NONE_REF
+        try:
+            first_coedge = face.loop.coedge
+        except AttributeError:  # loop is a none-entity
+            pass
+        coedge = first_coedge
+        while not coedge.is_none:  # invalid coedge or face is not closed
+            # the edge entity contains the vertices and the curve type
+            edge = coedge.edge
+            try:
+                vertices.append(edge.start_vertex.point.location)
+                vertices.append(edge.end_vertex.point.location)
+            except AttributeError:
+                # one of the involved entities is a none-entity or an
+                # incompatible entity type -> ignore this face!
+                break
+            coedge = coedge.next_coedge
+            if coedge is first_coedge:  # a valid closed face
+                break
+        face = face.next_face
+    if m is not None:
+        return list(m.transform_vertices(vertices))
+    return vertices

ezdxf-1.3.1/src/ezdxf/acis/type_hints.py

@@ -0,0 +1,7 @@
+# Copyright (c) 2024, Manfred Moitzi
+# License: MIT License
+from __future__ import annotations
+from typing import Sequence, Union
+from typing_extensions import TypeAlias
+
+EncodedData: TypeAlias = Union[str, Sequence[str], bytes, bytearray]

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/addons/acadctb.py

@@ -725,7 +725,7 @@ class PlotStyleFileParser:
                 return get_mapping()
             else:  # it's a simple name=value line
                 value: str = line.split("=", 1)[1]
-                value = value.lstrip('"')  # strings look like this: name="value
+                value = sanitized_value(value)
                 line_index += 1
             return value
 
@@ -745,6 +745,18 @@ class PlotStyleFileParser:
         return self.data.get(name, default)
 
 
+def sanitized_value(value: str) -> str:
+    value = value.strip()
+    if value.startswith('"'):  # strings: <name>="string
+        return value[1:]
+
+    # remove unknown appendix like this: "0.0076200000000 (+7.Z+"8V?S_LC )"
+    # the pattern is "<float|int> (<some data>)", see issue #1069
+    if value.endswith(")"):
+        return value.split(" ")[0]
+    return value
+
+
 def int2color(color: int) -> tuple[int, int, int, int]:
     """Convert color integer value from CTB-file to ``(r, g, b, color_type)
     tuple.

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/addons/drawing/frontend.py

@@ -851,6 +851,8 @@ class UniversalFrontend:
                 entity, segments=self.config.circle_approximation_count // 2
             )
             for polygon in trace.polygons():  # polygon is a sequence of Vec2()
+                if len(polygon) < 3:
+                    continue
                 if transform:
                     points = ocs.points_to_wcs(
                         Vec3(v.x, v.y, elevation) for v in polygon
@@ -861,8 +863,9 @@ class UniversalFrontend:
                 properties.filling = Filling()
                 self.pipeline.draw_filled_polygon(points, properties)
             return
-
-        self.pipeline.draw_path(make_path(entity), properties)
+        polyline_path = make_path(entity)
+        if len(polyline_path):
+            self.pipeline.draw_path(polyline_path, properties)
 
     def draw_composite_entity(self, entity: DXFGraphic, properties: Properties) -> None:
         def draw_insert(insert: Insert):

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/addons/drawing/pipeline.py

@@ -6,7 +6,6 @@ from typing import (
     Optional,
     Iterable,
     Tuple,
-    TYPE_CHECKING,
     Iterator,
     Callable,
 )
@@ -33,7 +32,7 @@ from ezdxf.tools.clipping_portal import (
     ClippingShape,
     find_best_clipping_shape,
 )
-
+from ezdxf.layouts import Layout
 from .backend import BackendInterface, BkPath2d, BkPoints2d, ImageData
 from .config import LinePolicy, TextPolicy, ColorPolicy, Configuration
 from .properties import BackendProperties, Filling
@@ -41,9 +40,6 @@ from .properties import Properties, RenderContext
 from .type_hints import Color
 from .unified_text_renderer import UnifiedTextRenderer
 
-if TYPE_CHECKING:
-    from ezdxf.layouts import Layout
-
 PatternKey: TypeAlias = Tuple[str, float]
 DrawEntitiesCallback: TypeAlias = Callable[[RenderContext, Iterable[DXFGraphic]], None]
 
@@ -242,7 +238,7 @@ class RenderPipeline2d(AbstractPipeline):
 
     def set_config(self, config: Configuration) -> None:
         self.backend.configure(config)
-        self.config = config      
+        self.config = config
         stage = self._pipeline
         while True:
             stage.set_config(config)
@@ -288,8 +284,18 @@ class RenderPipeline2d(AbstractPipeline):
         m = vp.get_transformation_matrix()
         clipping_path = make_path(vp)
         if len(clipping_path):
-            # TODO: flatten clipping path! max_sagitta = ?
-            clipping_shape = find_best_clipping_shape(clipping_path.control_vertices())
+            vertices = clipping_path.control_vertices()
+            if clipping_path.has_curves:
+                layout = vp.get_layout()
+                if isinstance(layout, Layout):
+                    # plot paper units:
+                    #   0: inches, max sagitta = 1/254 = 0.1 mm
+                    #   1: millimeters, max sagitta = 0.1 mm
+                    #   2: pixels, max sagitta = 0.1 pixel
+                    units = layout.dxf.get("plot_paper_units", 1)
+                    max_sagitta = 1.0 / 254.0 if units == 0 else 0.1
+                    vertices = list(clipping_path.flattening(max_sagitta))
+            clipping_shape = find_best_clipping_shape(vertices)
             self.clipping_portal.push(clipping_shape, m)
             return True
         return False

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/addons/dxf2code.py

@@ -762,7 +762,7 @@ class _SourceCodeGenerator:
             add_line(f"e.set_seed_points({entity.seeds})")
         if entity.pattern:
             self.add_list_source_code(
-                entity.pattern.lines,
+                map(str, entity.pattern.lines),
                 prolog="e.set_pattern_definition([",
                 epilog="])",
             )

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

@@ -131,7 +131,10 @@ def readfile(
     infile = Path(filename).absolute()
     if not infile.is_file():
         raise FileNotFoundError(f"No such file: '{infile}'")
-    version = _detect_version(filename) if version is None else version
+    if isinstance(version, str):
+        version = map_version(version)
+    else:
+        version = _detect_version(filename)
 
     with tempfile.TemporaryDirectory(prefix="odafc_") as tmp_dir:
         args = _odafc_arguments(

{ezdxf-1.3.0b1 → ezdxf-1.3.1}/src/ezdxf/audit.py

@@ -41,6 +41,7 @@ class AuditError(IntEnum):
     REMOVED_STANDALONE_ATTRIB_ENTITY = 13
     MISPLACED_ROOT_DICT = 14
     ROOT_DICT_NOT_FOUND = 15
+    REMOVED_ENTITY_WITH_INVALID_OWNER_HANDLE = 16
 
     UNDEFINED_LINETYPE = 100
     UNDEFINED_DIMENSION_STYLE = 101
@@ -89,6 +90,7 @@ class AuditError(IntEnum):
     INVALID_TRANSPARENCY = 223
     INVALID_CREASE_VALUE_COUNT = 224
     INVALID_ELLIPSE_RATIO = 225
+    INVALID_HATCH_BOUNDARY_PATH = 226
 
 
 REQUIRED_ROOT_DICT_ENTRIES = ("ACAD_GROUP", "ACAD_PLOTSTYLENAME")