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

Merge pull request #53 from wood-galaxy/equipement-fix

Browse Source 
Arch : Fix ViewProviderComponent if vobj have not DiffuseColor attribute
This commit is contained in:
Yorik van Havre 2015-09-25 15:23:55 -03:00
commit 6a93d1392d
2 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Arch/ArchComponent.py
View File

@ -709,9 +709,10 @@ class ViewProviderComponent:
vobj.update() vobj.update()
elif prop == "ShapeColor": elif prop == "ShapeColor":
# restore DiffuseColor after overridden by ShapeColor # restore DiffuseColor after overridden by ShapeColor
if len(vobj.DiffuseColor) > 1: if hasattr(vobj,"DiffuseColor"):
d = vobj.DiffuseColor if len(vobj.DiffuseColor) > 1:
vobj.DiffuseColor = d d = vobj.DiffuseColor
vobj.DiffuseColor = d
return return
def attach(self,vobj): def attach(self,vobj):

6
src/Mod/Arch/ArchEquipment.py
View File

@ -235,9 +235,9 @@ class _Equipment(ArchComponent.Component):
"The Equipment object" "The Equipment object"
def __init__(self,obj): def __init__(self,obj):
ArchComponent.Component.__init__(self,obj) ArchComponent.Component.__init__(self,obj)
obj.addProperty("Part::PropertyPartShape","TopView","Arch",translate("Arch","an optional 2D shape representing a top view of this equipment")) #obj.addProperty("Part::PropertyPartShape","TopView","Arch",translate("Arch","an optional 2D shape representing a top view of this equipment"))
obj.addProperty("Part::PropertyPartShape","FrontView","Arch",translate("Arch","an optional 2D shape representing a front view of this equipment")) #obj.addProperty("Part::PropertyPartShape","FrontView","Arch",translate("Arch","an optional 2D shape representing a front view of this equipment"))
obj.addProperty("Part::PropertyPartShape","SideView","Arch",translate("Arch","an optional 2D shape representing a side view of this equipment")) #obj.addProperty("Part::PropertyPartShape","SideView","Arch",translate("Arch","an optional 2D shape representing a side view of this equipment"))
obj.addProperty("App::PropertyString","Model","Arch",translate("Arch","The model description of this equipment")) obj.addProperty("App::PropertyString","Model","Arch",translate("Arch","The model description of this equipment"))
obj.addProperty("App::PropertyString","Url","Arch",translate("Arch","The url of the product page of this equipment")) obj.addProperty("App::PropertyString","Url","Arch",translate("Arch","The url of the product page of this equipment"))
self.Type = "Equipment" self.Type = "Equipment"