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

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
wmayer 2013-11-25 10:26:42 +01:00
commit cbbf3ee390
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Draft/DraftGeomUtils.py
View File

@ -1040,7 +1040,7 @@ def connect(edges,closed=False):
nedges.append(Part.Line(v1,v2).toShape()) nedges.append(Part.Line(v1,v2).toShape())
elif geomType(curr) == "Circle": elif geomType(curr) == "Circle":
if v1 != v2: if v1 != v2:
nedges.append(Part.Arc(v1,findMidPoint(curr),v2)) nedges.append(Part.Arc(v1,findMidpoint(curr),v2))
try: try:
return Part.Wire(nedges) return Part.Wire(nedges)
except: except:

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

@ -1491,18 +1491,16 @@ def writeShape(sh,ob,dxfobject,nospline=False,lwPoly=False):
layer=getGroup(ob))) layer=getGroup(ob)))
else: else:
if (lwPoly): if (lwPoly):
if hasattr(dxfLibrary,"LwPolyLine"): if hasattr(dxfLibrary,"LwPolyLine"):
dxfobject.append(dxfLibrary.LwPolyLine(getWire(wire,nospline), [0.0,0.0], dxfobject.append(dxfLibrary.LwPolyLine(getWire(wire,nospline), [0.0,0.0],
int(DraftGeomUtils.isReallyClosed(wire)), color=getACI(ob), int(DraftGeomUtils.isReallyClosed(wire)), color=getACI(ob),
layer=getGroup(ob))) layer=getGroup(ob)))
else: else:
FreeCAD.Console.PrintWarning("LwPolyLine support not found. Please delete dxfLibrary.py from your FreeCAD user directory to force auto-update\n") FreeCAD.Console.PrintWarning("LwPolyLine support not found. Please delete dxfLibrary.py from your FreeCAD user directory to force auto-update\n")
else :
else :
dxfobject.append(dxfLibrary.PolyLine(getWire(wire,nospline), [0.0,0.0,0.0], dxfobject.append(dxfLibrary.PolyLine(getWire(wire,nospline), [0.0,0.0,0.0],
int(DraftGeomUtils.isReallyClosed(wire)), color=getACI(ob), int(DraftGeomUtils.isReallyClosed(wire)), color=getACI(ob),
layer=getGroup(ob))) layer=getGroup(ob)))
if len(processededges) < len(sh.Edges): # lone edges if len(processededges) < len(sh.Edges): # lone edges
loneedges = [] loneedges = []
for e in sh.Edges: for e in sh.Edges: