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

FreeCAD · Mar 3, 2014 · 170265c · 170265c
2 parents 874f61e + 80f2a3a
commit 170265c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
@@ -1434,6 +1434,7 @@ def getRadius(obj,delta):
         else:
             newobj = Part.Face(obj.Shape.Wires[0])
     elif copy:
+        newobj = None
         if sym: return None
         if getType(obj) == "Wire":
             newobj = makeWire(p)
@@ -1453,13 +1454,18 @@ def getRadius(obj,delta):
             newobj.Radius = getRadius(obj,delta)
             newobj.DrawMode = obj.DrawMode
             newobj.Placement = pl
-        elif getType(obj) == "Part":
-            newobj = makeWire(p)
-            newobj.Closed = obj.Shape.isClosed()
         elif getType(obj) == "BSpline":
             newobj = makeBSpline(delta)
             newobj.Closed = obj.Closed
-        formatObject(newobj,obj)
+        else:
+            # try to offset anyway
+            try:
+                newobj = makeWire(p)
+                newobj.Closed = obj.Shape.isClosed()
+            except:
+                pass
+        if newobj:
+            formatObject(newobj,obj)
     else:
         if sym: return None
         if getType(obj) == "Wire":
@@ -4528,8 +4534,9 @@ def execute(self,obj):
         if shapes:
             if len(shapes) == 1:
                 obj.Shape = shapes[0]
+                obj.Placement = shapes[0].Placement
             else:
-                obj.Shape = Part.makeCompound(shapes)   
+                obj.Shape = Part.makeCompound(shapes)
         if not DraftGeomUtils.isNull(pl):
             obj.Placement = pl
 

diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
@@ -3945,6 +3945,7 @@ def proceed(self):
                     if (len(obj.Shape.Wires) == 1) or (len(obj.Shape.Edges) == 1):
                         Draft.makeSketch(obj,autoconstraints=False)
             FreeCAD.ActiveDocument.commitTransaction()
+            FreeCAD.ActiveDocument.recompute()
         self.finish()