Draft: Fixed offset of arcs - fixes #1993

FreeCAD · Dec 8, 2015 · c67b2be · c67b2be
1 parent c0ee5fb
commit c67b2be
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
@@ -2573,16 +2573,28 @@ def finish(self,closed=False):
     def numericRadius(self,rad):
         '''this function gets called by the toolbar when
         valid radius have been entered there'''
+        #print "dvec:",self.dvec
+        #print "rad:",rad
         if self.dvec:
-            self.dvec.normalize()
-            self.dvec.multiply(rad)
-            copymode = False
-            occmode = self.ui.occOffset.isChecked()
-            if self.ui.isCopy.isChecked(): copymode = True
             if isinstance(self.dvec,float):
-                d = str(self.dvec)
+                if self.mode == "Circle":
+                    r1 = self.shape.Edges[0].Curve.Radius
+                    r2 = self.ghost.getRadius()
+                    if r2 >= r1:
+                        rad = r1 + rad
+                    else:
+                        rad = r1 - rad
+                    d = str(rad)
+                else:
+                    print "Draft.Offset error: Unhandled case"
             else:
+                self.dvec.normalize()
+                self.dvec.multiply(rad)
                 d = DraftVecUtils.toString(self.dvec)
+            copymode = False
+            occmode = self.ui.occOffset.isChecked()
+            if self.ui.isCopy.isChecked(): 
+                copymode = True
             FreeCADGui.addModule("Draft")
             self.commit(translate("draft","Offset"),
                         ['Draft.offset(FreeCAD.ActiveDocument.'+self.sel.Name+','+d+',copy='+str(copymode)+',occ='+str(occmode)+')',