kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Daft: fix cleanProjection (used by Draft_Shape2DView and DXF export)

Browse Source
This commit is contained in:
Roy-043
2021-10-15 22:11:40 +02:00
committed by GitHub
parent 346ff3815d
commit fa80866a0e
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Mod/Draft/draftgeoutils/wires.py
View File

@@ -354,56 +354,35 @@ def removeInterVertices(wire):
def cleanProjection(shape, tessellate=True, seglength=0.05):
"""Return a valid compound of edges, by recreating them.
"""Return a compound of edges, optionally tesselate ellipses, splines
and bezcurves.
This is because the projection algorithm somehow creates wrong shapes.
They display fine, but on loading the file the shape is invalid.
Now with tanderson's fix to `ProjectionAlgos`, that isn't the case,
but this function can be used for tessellating ellipses and splines
for DXF output-DF.
The function was formerly used to workaround bugs in the projection
algorithm. These bugs have since been fixed. Now the function is only
used when tessalation of ellipses, splines and bezcurves is required
(DXF output and Draft_Shape2DView).
"""
oldedges = shape.Edges
newedges = []
for e in oldedges:
typ = geomType(e)
try:
if geomType(e) == "Line":
newedges.append(e.Curve.toShape())
elif geomType(e) == "Circle":
if len(e.Vertexes) > 1:
mp = findMidpoint(e)
a = Part.Arc(e.Vertexes[0].Point,
mp,
e.Vertexes[-1].Point).toShape()
newedges.append(a)
else:
newedges.append(e.Curve.toShape())
elif geomType(e) == "Ellipse":
if typ in ["Line", "Circle"]:
newedges.append(e)
elif typ == "Ellipse":
if tessellate:
newedges.append(Part.Wire(curvetowire(e, seglength)))
else:
if len(e.Vertexes) > 1:
a = Part.Arc(e.Curve,
e.FirstParameter,
e.LastParameter).toShape()
newedges.append(a)
else:
newedges.append(e.Curve.toShape())
elif (geomType(e) == "BSplineCurve"
or geomType(e) == "BezierCurve"):
if tessellate:
newedges.append(e)
elif typ in ["BSplineCurve", "BezierCurve"]:
if isLine(e.Curve):
line = Part.LineSegment(e.Vertexes[0].Point,
e.Vertexes[-1].Point)
newedges.append(line)
elif tessellate:
newedges.append(Part.Wire(curvetowire(e, seglength)))
else:
if isLine(e.Curve):
line = Part.LineSegment(e.Vertexes[0].Point,
e.Vertexes[-1].Point).toShape()
newedges.append(line)
else:
newedges.append(e.Curve.toShape(e.FirstParameter,
e.LastParameter))
newedges.append(e)
else:
newedges.append(e)
except Part.OCCError:
@@ -527,4 +506,4 @@ def get_extended_wire(wire, offset_start, offset_end):
wire = Part.Wire(wire.OrderedEdges + [new_edge])
return wire
## @}
## @}