ezdxf 1.3.0rc0__zip → 1.3.1__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.3.0rc0
+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.0rc0 → 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.0rc0 → 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.
@@ -733,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] = {}
@@ -770,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
@@ -779,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
@@ -795,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.0rc0 → 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.0rc0 → 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.0rc0 → 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.0rc0 → 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.0rc0 → 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.0rc0 → 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")

{ezdxf-1.3.0rc0 → ezdxf-1.3.1}/src/ezdxf/document.py

@@ -52,7 +52,6 @@ from ezdxf.lldxf.tagwriter import (
     JSONTagWriter,
 )
 from ezdxf.query import EntityQuery
-from ezdxf.protocols import SupportsTemporaryTransformation
 from ezdxf.render.dimension import DimensionRenderer
 from ezdxf.sections.acdsdata import AcDsDataSection, new_acds_data_section
 from ezdxf.sections.blocks import BlocksSection
@@ -65,6 +64,7 @@ from ezdxf.tools import guid
 from ezdxf.tools.codepage import tocodepage, toencoding
 from ezdxf.tools.juliandate import juliandate
 from ezdxf.tools.text import safe_string, MAX_STR_LEN
+from ezdxf import messenger, msgtypes
 
 
 logger = logging.getLogger("ezdxf")
@@ -111,6 +111,7 @@ def _validate_handle_seed(seed: str) -> str:
 class Drawing:
     def __init__(self, dxfversion=DXF2013) -> None:
         self.entitydb = EntityDB()
+        self.messenger = messenger.Messenger(self)
         target_dxfversion = dxfversion.upper()
         self._dxfversion: str = const.acad_release_to_dxf_version.get(
             target_dxfversion, target_dxfversion
@@ -586,8 +587,8 @@ class Drawing:
             fmt: "asc" for ASCII DXF (default) or "bin" for binary DXF
 
         """
-        # These changes may alter the document content (create new entities, blocks ...) 
-        # and have to be done before the export and the update of internal structures 
+        # These changes may alter the document content (create new entities, blocks ...)
+        # and have to be done before the export and the update of internal structures
         # can be done.
         self.commit_pending_changes()
 
@@ -647,9 +648,7 @@ class Drawing:
         tagwriter.write_tag2(0, "EOF")
 
     def commit_pending_changes(self) -> None:
-        entities = list(self.entitydb.values())  # entitydb may change while iterating
-        for entity in entities:
-            entity.commit_pending_changes()
+        self.messenger.broadcast(msgtypes.COMMIT_PENDING_CHANGES)
 
     def update_all(self) -> None:
         if self.dxfversion > DXF12: