suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

importDXF: provide polygon fallback for splines

Browse Source 
with invalid multiplicities
This commit is contained in:
Sebastian Hoogen 2015-01-16 17:14:22 +01:00 committed by Yorik van Havre
parent ad54783016
commit c90c2441d2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Draft/importDXF.py
View File

@ -563,16 +563,17 @@ def drawSolid(solid):
warn(solid)
return None
def drawSplineIterpolation(verts,closed=False,forceShape=False):
def drawSplineIterpolation(verts,closed=False,forceShape=False,\
alwaysDiscretize=False):
if (dxfCreateDraft or dxfCreateSketch) and (not forceShape):
if dxfDiscretizeCurves:
if dxfDiscretizeCurves or alwaysDiscretize:
ob = Draft.makeWire(verts)
else:
ob = Draft.makeBSpline(verts)
ob.Closed = closed
return ob
else:
if dxfDiscretizeCurves:
if dxfDiscretizeCurves or alwaysDiscretize:
sh = Part.makePolygon(verts+[verts[0]])
else:
sp = Part.BSplineCurve()
@ -693,6 +694,12 @@ non-parametric curve"""
previousknot = knotvalue
knotvector.append(knotvalue)
multvector.append(mult)
innermults = multvector[:] if periodic else multvector[1:-1]
if any(m>degree for m in innermults):
#raise ValueError('Invalid multiplicities')
#warn('polygon fallback on %s' %spline)
return drawSplineIterpolation(controlpoints,closed=closed,\
forceShape=forceShape,alwaysDiscretize=True)
try:
bspline=Part.BSplineCurve()
bspline.buildFromPolesMultsKnots(poles=controlpoints,mults=multvector,\