Draft: Fixed PropertyAngles - fixes #1451
This commit is contained in:
parent
810555d2ab
commit
363b62a891
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue
Block a user