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

FreeCAD · Nov 25, 2013 · cbbf3ee · cbbf3ee
2 parents a98c967 + 932647e
commit cbbf3ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py
@@ -1040,7 +1040,7 @@ def connect(edges,closed=False):
                                 nedges.append(Part.Line(v1,v2).toShape())
                 elif geomType(curr) == "Circle":
                         if v1 != v2:
-                                nedges.append(Part.Arc(v1,findMidPoint(curr),v2))
+                                nedges.append(Part.Arc(v1,findMidpoint(curr),v2))
         try:
                 return Part.Wire(nedges)
         except:

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