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

0001138: Use TypeId in Draft & Arch

Browse Source
This commit is contained in:
Yorik van Havre 2013-06-14 11:19:58 -03:00
parent 90292ecaaf
commit 6a88bcd870
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,7 @@ def getGroupNames():
glist = [] glist = []
doc = FreeCAD.ActiveDocument doc = FreeCAD.ActiveDocument
for obj in doc.Objects: for obj in doc.Objects:
if obj.Type == "App::DocumentObjectGroup": if obj.TypeId == "App::DocumentObjectGroup":
glist.append(obj.Name) glist.append(obj.Name)
return glist return glist
@ -680,61 +680,61 @@ def makeText(stringslist,point=Vector(0,0,0),screen=False):
def makeCopy(obj,force=None,reparent=False): def makeCopy(obj,force=None,reparent=False):
'''makeCopy(object): returns an exact copy of an object''' '''makeCopy(object): returns an exact copy of an object'''
if (getType(obj) == "Rectangle") or (force == "Rectangle"): if (getType(obj) == "Rectangle") or (force == "Rectangle"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Rectangle(newobj) _Rectangle(newobj)
if gui: if gui:
_ViewProviderRectangle(newobj.ViewObject) _ViewProviderRectangle(newobj.ViewObject)
elif (getType(obj) == "Dimension") or (force == "Dimension"): elif (getType(obj) == "Dimension") or (force == "Dimension"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Dimension(newobj) _Dimension(newobj)
if gui: if gui:
_ViewProviderDimension(newobj.ViewObject) _ViewProviderDimension(newobj.ViewObject)
elif (getType(obj) == "Wire") or (force == "Wire"): elif (getType(obj) == "Wire") or (force == "Wire"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Wire(newobj) _Wire(newobj)
if gui: if gui:
_ViewProviderWire(newobj.ViewObject) _ViewProviderWire(newobj.ViewObject)
elif (getType(obj) == "Circle") or (force == "Circle"): elif (getType(obj) == "Circle") or (force == "Circle"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Circle(newobj) _Circle(newobj)
if gui: if gui:
_ViewProviderDraft(newobj.ViewObject) _ViewProviderDraft(newobj.ViewObject)
elif (getType(obj) == "Polygon") or (force == "Polygon"): elif (getType(obj) == "Polygon") or (force == "Polygon"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Polygon(newobj) _Polygon(newobj)
if gui: if gui:
_ViewProviderDraft(newobj.ViewObject) _ViewProviderDraft(newobj.ViewObject)
elif (getType(obj) == "BSpline") or (force == "BSpline"): elif (getType(obj) == "BSpline") or (force == "BSpline"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_BSpline(newobj) _BSpline(newobj)
if gui: if gui:
_ViewProviderBSpline(newobj.ViewObject) _ViewProviderBSpline(newobj.ViewObject)
elif (getType(obj) == "Block") or (force == "BSpline"): elif (getType(obj) == "Block") or (force == "BSpline"):
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
_Block(newobj) _Block(newobj)
if gui: if gui:
_ViewProviderDraftPart(newobj.ViewObject) _ViewProviderDraftPart(newobj.ViewObject)
elif (getType(obj) == "Structure") or (force == "Structure"): elif (getType(obj) == "Structure") or (force == "Structure"):
import ArchStructure import ArchStructure
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
ArchStructure._Structure(newobj) ArchStructure._Structure(newobj)
if gui: if gui:
ArchStructure._ViewProviderStructure(newobj.ViewObject) ArchStructure._ViewProviderStructure(newobj.ViewObject)
elif (getType(obj) == "Wall") or (force == "Wall"): elif (getType(obj) == "Wall") or (force == "Wall"):
import ArchWall import ArchWall
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
ArchWall._Wall(newobj) ArchWall._Wall(newobj)
if gui: if gui:
ArchWall._ViewProviderWall(newobj.ViewObject) ArchWall._ViewProviderWall(newobj.ViewObject)
elif (getType(obj) == "Window") or (force == "Window"): elif (getType(obj) == "Window") or (force == "Window"):
import ArchWindow import ArchWindow
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
ArchWindow._Window(newobj) ArchWindow._Window(newobj)
if gui: if gui:
Archwindow._ViewProviderWindow(newobj.ViewObject) Archwindow._ViewProviderWindow(newobj.ViewObject)
elif (getType(obj) == "Cell") or (force == "Cell"): elif (getType(obj) == "Cell") or (force == "Cell"):
import ArchCell import ArchCell
newobj = FreeCAD.ActiveDocument.addObject(obj.Type,getRealName(obj.Name)) newobj = FreeCAD.ActiveDocument.addObject(obj.TypeId,getRealName(obj.Name))
ArchCell._Cell(newobj) ArchCell._Cell(newobj)
if gui: if gui:
ArchCell._ViewProviderCell(newobj.ViewObject) ArchCell._ViewProviderCell(newobj.ViewObject)
@ -758,7 +758,7 @@ def makeCopy(obj,force=None,reparent=False):
parents = obj.InList parents = obj.InList
if parents: if parents:
for par in parents: for par in parents:
if par.Type == "App::DocumentObjectGroup": if par.TypeId == "App::DocumentObjectGroup":
par.addObject(newobj) par.addObject(newobj)
else: else:
for prop in par.PropertiesList: for prop in par.PropertiesList:
@ -1067,7 +1067,7 @@ def scale(objectslist,delta=Vector(1,1,1),center=Vector(0,0,0),copy=False,legacy
newobj.Points = p newobj.Points = p
elif (obj.isDerivedFrom("Part::Feature")): elif (obj.isDerivedFrom("Part::Feature")):
newobj.Shape = sh newobj.Shape = sh
elif (obj.Type == "App::Annotation"): elif (obj.TypeId == "App::Annotation"):
factor = delta.x * delta.y * delta.z * obj.ViewObject.FontSize factor = delta.x * delta.y * delta.z * obj.ViewObject.FontSize
obj.ViewObject.Fontsize = factor obj.ViewObject.Fontsize = factor
if copy: formatObject(newobj,obj) if copy: formatObject(newobj,obj)
@ -1752,7 +1752,7 @@ def heal(objlist=None,delete=True,reparent=True):
for obj in objlist: for obj in objlist:
dtype = getType(obj) dtype = getType(obj)
ftype = obj.Type ftype = obj.TypeId
if ftype in ["Part::FeaturePython","App::FeaturePython","Part::Part2DObjectPython"]: if ftype in ["Part::FeaturePython","App::FeaturePython","Part::Part2DObjectPython"]:
if obj.ViewObject.Proxy == 1 and dtype in ["Unknown","Part"]: if obj.ViewObject.Proxy == 1 and dtype in ["Unknown","Part"]:
got = True got = True

2
src/Mod/Draft/DraftGui.py
View File

@ -868,7 +868,7 @@ class DraftToolBar:
b = float(self.color.blue()/255.0) b = float(self.color.blue()/255.0)
col = (r,g,b,0.0) col = (r,g,b,0.0)
for i in FreeCADGui.Selection.getSelection(): for i in FreeCADGui.Selection.getSelection():
if (i.Type == "App::Annotation"): if (i.TypeId == "App::Annotation"):
i.ViewObject.TextColor=col i.ViewObject.TextColor=col
else: else:
if "LineColor" in i.ViewObject.PropertiesList: if "LineColor" in i.ViewObject.PropertiesList:

2
src/Mod/Draft/importDXF.py
View File

@ -143,7 +143,7 @@ def calcBulge(v1,bulge,v2):
def getGroup(ob,exportList): def getGroup(ob,exportList):
"checks if the object is part of a group" "checks if the object is part of a group"
for i in exportList: for i in exportList:
if (i.Type == "App::DocumentObjectGroup"): if (i.TypeId == "App::DocumentObjectGroup"):
for j in i.Group: for j in i.Group:
if (j == ob): if (j == ob):
return i.Label return i.Label