jan/masque
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

[dxf] improve dxf reader (ezdxf 1.4 related LWPolyLine changes)

Browse source
This commit is contained in:
jan 2026-03-09 11:16:30 -07:00
commit 3792248cd1
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
masque/file/dxf.py
View file

@ -218,28 +218,36 @@ def _read_block(block: ezdxf.layouts.BlockLayout | ezdxf.layouts.Modelspace) ->
layer = attr.get('layer', DEFAULT_LAYER) layer = attr.get('layer', DEFAULT_LAYER)
width = 0 width = 0
if points.shape[1] > 2: if isinstance(element, LWPolyline):
if (points[0, 2] != points[:, 2]).any(): # ezdxf 1.4+ get_points() returns (x, y, start_width, end_width, bulge)
raise PatternError('PolyLine has non-constant width (not yet representable in masque!)') if points.shape[1] >= 5:
if points.shape[1] == 4 and (points[:, 3] != 0).any(): if (points[:, 4] != 0).any():
raise PatternError('LWPolyLine has bulge (not yet representable in masque!)') raise PatternError('LWPolyline has bulge (not yet representable in masque!)')
if (points[:, 2] != points[:, 3]).any() or (points[:, 2] != points[0, 2]).any():
raise PatternError('LWPolyline has non-constant width (not yet representable in masque!)')
width = points[0, 2]
elif points.shape[1] == 3:
# width used to be in column 2
width = points[0, 2]
width = points[0, 2] if width == 0:
if width == 0: width = attr.get('const_width', 0)
width = attr.get('const_width', 0)
is_closed = element.closed is_closed = element.closed
# If the last point is a repeat of the first, drop it. verts = points[:, :2]
if len(points) > 1 and numpy.allclose(points[0, :2], points[-1, :2]): if is_closed and (len(verts) < 2 or not numpy.allclose(verts[0], verts[-1])):
verts = points[:-1, :2] verts = numpy.vstack((verts, verts[0]))
else:
verts = points[:, :2]
shape: Path | Polygon shape: Path | Polygon
if width == 0 and is_closed and len(verts) >= 3: if width == 0 and is_closed:
shape = Polygon(vertices=verts) # Use Polygon if it has at least 3 unique vertices
shape_verts = verts[:-1] if len(verts) > 1 else verts
if len(shape_verts) >= 3:
shape = Polygon(vertices=shape_verts)
else:
shape = Path(width=width, vertices=verts)
else: else:
shape = Path(width=width, vertices=points[:, :2]) shape = Path(width=width, vertices=verts)
pat.shapes[layer].append(shape) pat.shapes[layer].append(shape)
elif isinstance(element, Solid | Trace): elif isinstance(element, Solid | Trace):