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

Arch: Added MDF presets to panel

Browse Source
This commit is contained in:
Yorik van Havre 2015-05-10 11:30:01 -03:00
parent d4f3cb7277
commit bcec2d45ad
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Arch/ArchPanel.py
View File

@ -35,13 +35,15 @@ __title__="FreeCAD Panel"
__author__ = "Yorik van Havre" __author__ = "Yorik van Havre"
__url__ = "http://www.freecadweb.org" __url__ = "http://www.freecadweb.org"
# Description l w t
Presets = [None, Presets = [None,
["Plywoood 12mm, 1220 x 2440",1200,2400,18], ["Plywood 12mm, 1220 x 2440",1200,2400,12],
["Plywoood 15mm, 1220 x 2440",1200,2400,18], ["Plywood 15mm, 1220 x 2440",1200,2400,15],
["Plywoood 18mm, 1220 x 2440",1200,2400,18], ["Plywood 18mm, 1220 x 2440",1200,2400,18],
["Plywoood 25mm, 1220 x 2440",1200,2400,18]] ["Plywood 25mm, 1220 x 2440",1200,2400,25],
["MDF 3mm, 900 x 600", 900, 600, 3],
["MDF 6mm, 900 x 600", 900, 600, 6]]
def makePanel(baseobj=None,length=0,width=0,thickness=0,placement=None,name="Panel"): def makePanel(baseobj=None,length=0,width=0,thickness=0,placement=None,name="Panel"):
'''makePanel([obj],[length],[width],[thickness],[placement]): creates a '''makePanel([obj],[length],[width],[thickness],[placement]): creates a

5
src/Mod/Arch/importIFC.py
View File

@ -148,6 +148,7 @@ def explore(filename=None):
entities += ifc.by_type("IfcPlacement") entities += ifc.by_type("IfcPlacement")
entities += ifc.by_type("IfcProperty") entities += ifc.by_type("IfcProperty")
entities += ifc.by_type("IfcPhysicalSimpleQuantity") entities += ifc.by_type("IfcPhysicalSimpleQuantity")
entities += ifc.by_type("IfcMaterial")
entities = sorted(entities, key=lambda eid: eid.id()) entities = sorted(entities, key=lambda eid: eid.id())
done = [] done = []
@ -183,6 +184,8 @@ def explore(filename=None):
item.setIcon(1,QtGui.QIcon(":icons/Draft_Draft.svg")) item.setIcon(1,QtGui.QIcon(":icons/Draft_Draft.svg"))
elif entity.is_a() in ["IfcPropertySingleValue","IfcQuantityArea","IfcQuantityVolume"]: elif entity.is_a() in ["IfcPropertySingleValue","IfcQuantityArea","IfcQuantityVolume"]:
item.setIcon(1,QtGui.QIcon(":icons/Tree_Annotation.svg")) item.setIcon(1,QtGui.QIcon(":icons/Tree_Annotation.svg"))
elif entity.is_a() in ["IfcMaterial"]:
item.setIcon(1,QtGui.QIcon(":icons/Arch_Material.svg"))
item.setText(2,str(entity.is_a())) item.setText(2,str(entity.is_a()))
item.setFont(2,bold); item.setFont(2,bold);
@ -615,7 +618,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
# Materials # Materials
if DEBUG and materials: print "Creating materials..." if DEBUG and materials: print "Creating materials..."
for material in materials: for material in materials:
name = material.Name or "Material" name = material.Name or "Material"
mat = Arch.makeMaterial(name=name) mat = Arch.makeMaterial(name=name)