suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc updates to the Draft module

Browse Source 
+ added an Axis property to Array objects, for polar arrays
+ added Draft.clone() API function
+ changed icon of Draft clone,array and block objects
This commit is contained in:
Yorik van Havre 2012-01-04 18:02:00 -02:00
parent 2c1265f14f
commit 24ff289b65
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Mod/Draft/Draft.py
View File

@ -200,7 +200,6 @@ def shapify(obj):
non-parametric and returns the new object'''
if not (obj.isDerivedFrom("Part::Feature")): return None
if not "Shape" in obj.PropertiesList: return None
if obj.Type == "Part::Feature": return obj
shape = obj.Shape
name = getRealName(obj.Name)
FreeCAD.ActiveDocument.removeObject(obj.Name)
@ -515,7 +514,7 @@ def makeCopy(obj):
_ViewProviderBSpline(newobj.ViewObject)
elif getType(obj) == "Block":
_Block(newobj)
_ViewProviderBlock(newobj.ViewObject)
_ViewProviderDraftPart(newobj.ViewObject)
elif getType(obj) == "Structure":
import Structure
Structure._Structure(newobj)
@ -539,7 +538,7 @@ def makeBlock(objectslist):
'''makeBlock(objectslist): Creates a Draft Block from the given objects'''
obj = FreeCAD.ActiveDocument.addObject("Part::Part2DObjectPython","Block")
_Block(obj)
_ViewProviderBlock(obj.ViewObject)
_ViewProviderDraftPart(obj.ViewObject)
obj.Components = objectslist
for o in objectslist:
o.ViewObject.Visibility = False
@ -557,7 +556,7 @@ def makeArray(baseobject,arg1,arg2,arg3,arg4=None):
The result is a parametric Draft Array.'''
obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Array")
_Array(obj)
_ViewProviderDraft(obj.ViewObject)
_ViewProviderDraftPart(obj.ViewObject)
obj.Base = baseobject
if arg4:
obj.ArrayType = "ortho"
@ -797,7 +796,7 @@ def scale(objectslist,delta=Vector(1,1,1),center=Vector(0,0,0),copy=False,legacy
else:
obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Scale")
_Clone(obj)
_ViewProviderDraft(obj.ViewObject)
_ViewProviderDraftPart(obj.ViewObject)
obj.Objects = objectslist
obj.Scale = delta
corr = Vector(center.x,center.y,center.z)
@ -1323,6 +1322,21 @@ def makePoint(X=0, Y=0, Z=0,color=(0,1,0),name = "Point", point_size= 5):
obj.ViewObject.Visibility = True
FreeCAD.ActiveDocument.recompute()
return obj
def clone(obj,delta=None):
'''clone(obj,[delta]): makes a clone of the given object(s). The clone is an exact,
linked copy of the given object. If the original object changes, the final object
changes too. Optionally, you can give a delta Vector to move the clone from the
original position.'''
if not isinstance(obj,list):
obj = [obj]
cl = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Clone")
_Clone(cl)
_ViewProviderDraftPart(cl.ViewObject)
cl.Objects = obj
if delta:
cl.Placement.move(delta)
return cl
#---------------------------------------------------------------------------
# Python Features definitions
@ -1376,6 +1390,8 @@ class _ViewProviderDraft:
objs.append(self.Object.Base)
if hasattr(self.Object,"Objects"):
objs.extend(self.Object.Objects)
if hasattr(self.Object,"Components"):
objs.extend(self.Object.Components)
return objs
class _Dimension:
@ -2268,14 +2284,6 @@ class _Block:
fp.Shape = shape
fp.Placement = plm
class _ViewProviderBlock(_ViewProviderDraft):
"A View Provider for the Block object"
def __init__(self,obj):
_ViewProviderDraft.__init__(self,obj)
def claimChildren(self):
return self.Object.Components
class _Shape2DView:
"The Shape2DView object"
@ -2315,6 +2323,8 @@ class _Array:
"The base object that must be duplicated")
obj.addProperty("App::PropertyEnumeration","ArrayType","Base",
"The type of array to create")
obj.addProperty("App::PropertyVector","Axis","Base",
"The axis direction for polar arrays")
obj.addProperty("App::PropertyInteger","NumberX","Base",
"Number of copies in X direction (ortho arrays)")
obj.addProperty("App::PropertyInteger","NumberY","Base",
@ -2338,6 +2348,7 @@ class _Array:
obj.IntervalX = Vector(1,0,0)
obj.IntervalY = Vector(0,1,0)
obj.Angle = 360
obj.Axis = Vector(0,0,1)
def execute(self,obj):
self.createGeometry(obj)
@ -2353,7 +2364,7 @@ class _Array:
if obj.ArrayType == "ortho":
sh = self.rectArray(obj.Base.Shape,obj.IntervalX,obj.IntervalY,obj.NumberX,obj.NumberY)
else:
sh = self.polarArray(obj.Base.Shape,obj.Center,obj.Angle,obj.NumberPolar)
sh = self.polarArray(obj.Base.Shape,obj.Center,obj.Angle,obj.NumberPolar,obj.Axis)
obj.Shape = sh
if not fcgeo.isNull(pl):
obj.Placement = pl
@ -2376,14 +2387,14 @@ class _Array:
base.append(nshape)
return Part.makeCompound(base)
def polarArray(self,shape,center,angle,num):
def polarArray(self,shape,center,angle,num,axis):
import Part
fraction = angle/num
base = [shape.copy()]
for i in range(num):
currangle = fraction + (i*fraction)
nshape = shape.copy()
nshape.rotate(fcvec.tup(center), (0,0,1), currangle)
nshape.rotate(fcvec.tup(center), fcvec.tup(axis), currangle)
base.append(nshape)
return Part.makeCompound(base)
@ -2463,4 +2474,12 @@ class _Clone:
if not fcgeo.isNull(pl):
obj.Placement = pl
class _ViewProviderDraftPart(_ViewProviderDraft):
"a view provider that displays a Part icon instead of a Draft icon"
def __init__(self,vobj):
_ViewProviderDraft.__init__(self,vobj)
def getIcon(self):
return ":/icons/Tree_Part.svg"