diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py index 38e122d53..2b870e1a1 100644 --- a/src/Mod/Arch/ArchPanel.py +++ b/src/Mod/Arch/ArchPanel.py @@ -35,13 +35,15 @@ __title__="FreeCAD Panel" __author__ = "Yorik van Havre" __url__ = "http://www.freecadweb.org" +# Description l w t Presets = [None, - ["Plywoood 12mm, 1220 x 2440",1200,2400,18], - ["Plywoood 15mm, 1220 x 2440",1200,2400,18], - ["Plywoood 18mm, 1220 x 2440",1200,2400,18], - ["Plywoood 25mm, 1220 x 2440",1200,2400,18]] - + ["Plywood 12mm, 1220 x 2440",1200,2400,12], + ["Plywood 15mm, 1220 x 2440",1200,2400,15], + ["Plywood 18mm, 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"): '''makePanel([obj],[length],[width],[thickness],[placement]): creates a diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 2f83d198b..6e7c866cb 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -148,6 +148,7 @@ def explore(filename=None): entities += ifc.by_type("IfcPlacement") entities += ifc.by_type("IfcProperty") entities += ifc.by_type("IfcPhysicalSimpleQuantity") + entities += ifc.by_type("IfcMaterial") entities = sorted(entities, key=lambda eid: eid.id()) done = [] @@ -183,6 +184,8 @@ def explore(filename=None): item.setIcon(1,QtGui.QIcon(":icons/Draft_Draft.svg")) elif entity.is_a() in ["IfcPropertySingleValue","IfcQuantityArea","IfcQuantityVolume"]: 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.setFont(2,bold); @@ -615,7 +618,7 @@ def insert(filename,docname,skip=[],only=[],root=None): # Materials if DEBUG and materials: print "Creating materials..." - + for material in materials: name = material.Name or "Material" mat = Arch.makeMaterial(name=name)