ezdxf 1.3.0__zip → 1.3.0b1__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezdxf
-Version: 1.3.0
+Version: 1.3.0b1
 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.0 → ezdxf-1.3.0b1}/src/ezdxf/acis/entities.py

@@ -119,7 +119,9 @@ 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
 
@@ -147,7 +149,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
@@ -208,7 +210,9 @@ 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:
@@ -218,7 +222,9 @@ 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)
 
@@ -232,9 +238,11 @@ 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)
@@ -284,7 +292,9 @@ 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)
@@ -326,7 +336,9 @@ 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)
@@ -378,10 +390,14 @@ 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)
@@ -463,7 +479,9 @@ 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())
@@ -496,7 +514,9 @@ 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)
@@ -557,7 +577,9 @@ 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)
@@ -596,7 +618,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:
@@ -627,7 +649,9 @@ 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:
@@ -666,7 +690,9 @@ 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)

{ezdxf-1.3.0 → ezdxf-1.3.0b1}/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 = sanitized_value(value)
+                value = value.lstrip('"')  # strings look like this: name="value
                 line_index += 1
             return value
 
@@ -745,18 +745,6 @@ 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.0 → ezdxf-1.3.0b1}/src/ezdxf/addons/drawing/pipeline.py

@@ -6,6 +6,7 @@ from typing import (
     Optional,
     Iterable,
     Tuple,
+    TYPE_CHECKING,
     Iterator,
     Callable,
 )
@@ -32,7 +33,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
@@ -40,6 +41,9 @@ 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]
 
@@ -238,7 +242,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)
@@ -284,18 +288,8 @@ class RenderPipeline2d(AbstractPipeline):
         m = vp.get_transformation_matrix()
         clipping_path = make_path(vp)
         if len(clipping_path):
-            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)
+            # TODO: flatten clipping path! max_sagitta = ?
+            clipping_shape = find_best_clipping_shape(clipping_path.control_vertices())
             self.clipping_portal.push(clipping_shape, m)
             return True
         return False

{ezdxf-1.3.0 → ezdxf-1.3.0b1}/src/ezdxf/document.py

@@ -12,7 +12,7 @@ from typing import (
     cast,
     Optional,
     Sequence,
-    Any,
+    Any
 )
 import abc
 import base64
@@ -64,7 +64,6 @@ 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,7 +110,6 @@ 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
@@ -224,7 +222,7 @@ class Drawing:
         self._create_required_dimstyles()
 
     def _set_required_layer_attributes(self):
-        for layer in self.layers:
+        for layer in self.layers:  # type: Layer
             layer.set_required_attributes()
 
     def _create_required_vports(self):
@@ -587,11 +585,6 @@ 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
-        # can be done.
-        self.commit_pending_changes()
-
         dxfversion = self.dxfversion
         if dxfversion == DXF12:
             handles = bool(self.header.get("$HANDLING", 0))
@@ -647,9 +640,6 @@ class Drawing:
 
         tagwriter.write_tag2(0, "EOF")
 
-    def commit_pending_changes(self) -> None:
-        self.messenger.broadcast(msgtypes.COMMIT_PENDING_CHANGES)
-
     def update_all(self) -> None:
         if self.dxfversion > DXF12:
             self.classes.add_required_classes(self.dxfversion)
@@ -1446,13 +1436,13 @@ def custom_export(doc: Drawing, tagwriter: AbstractTagWriter):
 
 def export_json_tags(doc: Drawing, compact=True) -> str:
     """Export a DXF document as JSON formatted tags.
+    
+    The `compact` format is a list of ``[group-code, value]`` pairs where each pair is 
+    a DXF tag. The group-code has to be an integer and the value has to be a string, 
+    integer, float or list of floats for vertices. 
 
-    The `compact` format is a list of ``[group-code, value]`` pairs where each pair is
-    a DXF tag. The group-code has to be an integer and the value has to be a string,
-    integer, float or list of floats for vertices.
-
-    The `verbose` format (`compact` is ``False``) is a list of ``[group-code, value]``
-    pairs where each pair is a 1:1 representation of a DXF tag. The group-code has to be
+    The `verbose` format (`compact` is ``False``) is a list of ``[group-code, value]`` 
+    pairs where each pair is a 1:1 representation of a DXF tag. The group-code has to be 
     an integer and the value has to be a string.
 
     """
@@ -1464,9 +1454,9 @@ def export_json_tags(doc: Drawing, compact=True) -> str:
 
 def load_json_tags(data: Sequence[Any]) -> Drawing:
     """Load DXF document from JSON formatted tags.
-
-    The expected JSON format is a list of [group-code, value] pairs where each pair is
-    a DXF tag. The `compact` and the `verbose` format is supported.
+    
+    The expected JSON format is a list of [group-code, value] pairs where each pair is 
+    a DXF tag. The `compact` and the `verbose` format is supported. 
 
     Args:
         data: JSON data structure as a sequence of [group-code, value] pairs

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

@@ -99,6 +99,7 @@ class ACADProxyEntity(DXFGraphic):
             for e in ProxyGraphic(self.proxy_graphic, doc=self.doc).virtual_entities():
                 e.set_source_of_copy(self)
                 yield e
+        return []
 
     def virtual_entities(self) -> Iterator[DXFGraphic]:
         """Yields proxy graphic as "virtual" entities."""

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

@@ -2,7 +2,6 @@
 # License: MIT License
 from __future__ import annotations
 from typing import TYPE_CHECKING, Iterable, Optional, Iterator
-from typing_extensions import Self
 import copy
 from ezdxf.math import Vec3, Matrix44
 from ezdxf.lldxf.tags import Tags, group_tags
@@ -250,7 +249,7 @@ class AcadTable(DXFGraphic):
         super().__init__()
         self.data = None
 
-    def copy_data(self, entity: Self, copy_strategy=default_copy) -> None:
+    def copy_data(self, entity: DXFEntity, copy_strategy=default_copy) -> None:
         """Copy data."""
         assert isinstance(entity, AcadTable)
         entity.data = copy.deepcopy(self.data)
@@ -446,12 +445,10 @@ def read_acad_table_content(table: DXFTagStorage) -> list[list[str]]:
         raise const.DXFTypeError(f"Expected ACAD_TABLE entity, got {str(table)}")
     acdb_table = table.xtags.get_subclass("AcDbTable")
 
+    values = [tag.value for tag in acdb_table.find_all(302)]
     nrows = acdb_table.get_first_value(91, 0)
     ncols = acdb_table.get_first_value(92, 0)
-    split_code = 171  # DXF R2004
-    if acdb_table.has_tag(302):
-        split_code = 301  # DXF R2007 and later
-    values = _load_table_values(acdb_table, split_code)
+    values = _load_table_values(acdb_table)
     if nrows * ncols == 0:
         return [values]
     content: list[list[str]] = []
@@ -461,17 +458,18 @@ def read_acad_table_content(table: DXFTagStorage) -> list[list[str]]:
     return content
 
 
-def _load_table_values(tags: Tags, split_code: int) -> list[str]:
+def _load_table_values(tags: Tags) -> list[str]:
     values: list[str] = []
-    for group in group_tags(tags, splitcode=split_code):
+    for group in group_tags(tags, splitcode=301):
         g_tags = Tags(group)
-        if g_tags.has_tag(302):  # DXF R2007 and later
+        if g_tags.has_tag(302):
             # contains all text as one long string, with more than 66000 chars tested
             values.append(g_tags.get_first_value(302))
-        else:  
-            # DXF R2004
-            # Text is divided into chunks (2, 2, 2, ..., 1) or (3, 3, 3, ..., 1)
-            # DXF reference says group code 2, BricsCAD writes group code 3
-            s = "".join(tag.value for tag in g_tags if 1 <= tag.code <= 3)
+        elif g_tags.has_tag(2):
+            # text is divided into chunks (2, 2, 2, ..., 1)
+            s = "".join(t.value for t in g_tags.find_all(2))
+            s += g_tags.get_first_value(1, "")
             values.append(s)
+        else:  # unknown tag structure
+            values.append("")
     return values