From eb6c4a5d4f41951e095ac38e4e2d1454444c7c7c Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 28 Feb 2014 10:05:44 -0300 Subject: [PATCH 1/2] Draft: Small typo fix --- src/Mod/Draft/Draft.py | 2 +- src/Mod/Draft/DraftTools.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 507fb6ece8..a7ad1a9933 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -946,7 +946,7 @@ def makeCopy(obj,force=None,reparent=False): newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name)) ArchWindow._Window(newobj) if gui: - Archwindow._ViewProviderWindow(newobj.ViewObject) + ArchWindow._ViewProviderWindow(newobj.ViewObject) elif (getType(obj) == "Sketch") or (force == "Sketch"): newobj = FreeCAD.ActiveDocument.addObject("Sketcher::SketchObject",getRealName(obj.Name)) for geo in obj.Geometries: diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 9fb4265e2c..76c994abfa 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -4105,6 +4105,7 @@ class Draft_Clone(Modifier): for obj in FreeCADGui.Selection.getSelection(): Draft.clone(obj) FreeCAD.ActiveDocument.commitTransaction() + FreeCAD.ActiveDocument.recompute() self.finish() From 442a70b666fa4b1d2b5b2f85bb3c49f054251abf Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 28 Feb 2014 15:53:09 -0300 Subject: [PATCH 2/2] Draft: Fixed PropertyAngles - fixes #1451 --- src/Mod/Draft/Draft.py | 14 +++++++------- src/Mod/Draft/DraftTools.py | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index a7ad1a9933..4bb99ed0aa 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -3405,17 +3405,17 @@ class _ViewProviderAngularDimension(_ViewProviderDraft): else: norm = obj.Normal radius = (obj.Dimline.sub(obj.Center)).Length - self.circle = Part.makeCircle(radius,obj.Center,norm,obj.FirstAngle,obj.LastAngle) + self.circle = Part.makeCircle(radius,obj.Center,norm,obj.FirstAngle.Value,obj.LastAngle.Value) self.p2 = self.circle.Vertexes[0].Point self.p3 = self.circle.Vertexes[-1].Point mp = DraftGeomUtils.findMidpoint(self.circle.Edges[0]) ray = mp.sub(obj.Center) # set text value - if obj.LastAngle > obj.FirstAngle: - a = obj.LastAngle - obj.FirstAngle + if obj.LastAngle.Value > obj.FirstAngle.Value: + a = obj.LastAngle.Value - obj.FirstAngle.Value else: - a = (360 - obj.FirstAngle) + obj.LastAngle + a = (360 - obj.FirstAngle.Value) + obj.LastAngle.Value if hasattr(obj.ViewObject,"Decimals"): fstring = "%." + str(obj.ViewObject.Decimals) + "f" else: @@ -3667,8 +3667,8 @@ class _Circle(_DraftObject): def execute(self, obj): import Part plm = obj.Placement - shape = Part.makeCircle(obj.Radius.Value,Vector(0,0,0),Vector(0,0,1),obj.FirstAngle,obj.LastAngle) - if obj.FirstAngle == obj.LastAngle: + shape = Part.makeCircle(obj.Radius.Value,Vector(0,0,0),Vector(0,0,1),obj.FirstAngle.Value,obj.LastAngle.Value) + if obj.FirstAngle.Value == obj.LastAngle.Value: shape = Part.Wire(shape) shape = Part.Face(shape) obj.Shape = shape @@ -4267,7 +4267,7 @@ class _Array(_DraftObject): sh = self.rectArray(obj.Base.Shape,obj.IntervalX,obj.IntervalY, obj.IntervalZ,obj.NumberX,obj.NumberY,obj.NumberZ) else: - sh = self.polarArray(obj.Base.Shape,obj.Center,obj.Angle,obj.NumberPolar,obj.Axis) + sh = self.polarArray(obj.Base.Shape,obj.Center,obj.Angle.Value,obj.NumberPolar,obj.Axis) obj.Shape = sh if not DraftGeomUtils.isNull(pl): obj.Placement = pl diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 76c994abfa..e9a72192e6 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -3974,6 +3974,7 @@ class Array(Modifier): FreeCAD.ActiveDocument.openTransaction("Array") Draft.makeArray(obj,Vector(1,0,0),Vector(0,1,0),2,2) FreeCAD.ActiveDocument.commitTransaction() + FreeCAD.ActiveDocument.recompute() self.finish() class PathArray(Modifier):