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

FEM: Import all materials in init instead of on-demand import

Browse Source 
On-demand import is no longer good enough as we have 3 different
material directories and materials may have non-unique names.
A material is now identified by a full file path.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-04-11 09:55:44 +01:00 committed by wmayer
parent 343225dcc2
commit 8113463e1e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Fem/MechanicalMaterial.py
View File

@ -133,7 +133,7 @@ class _MechanicalMaterialTaskPanel:
QtCore.QObject.connect(self.form.pushButton_MatWeb, QtCore.SIGNAL("clicked()"), self.goMatWeb)
QtCore.QObject.connect(self.form.comboBox_MaterialsInDir, QtCore.SIGNAL("activated(int)"), self.chooseMat)
self.previous_material = self.obj.Material
self.fillMaterialCombo()
self.import_materials()
matmap = self.obj.Material
if 'General_name' in matmap:
material_name = matmap['General_name']
@ -183,9 +183,8 @@ class _MechanicalMaterialTaskPanel:
def chooseMat(self, index):
if index < 0:
return
import Material
name = self.pathList[index]
self.obj.Material = Material.importFCMat(str(name))
mat_file_path = self.form.comboBox_MaterialsInDir.itemData(index)
self.obj.Material = self.materials[mat_file_path]
self.form.comboBox_MaterialsInDir.setCurrentIndex(index)
self.set_mat_params_in_combo_box(self.obj.Material)
gen_mat_desc = ""
@ -197,15 +196,18 @@ class _MechanicalMaterialTaskPanel:
def add_mat_dir(self, mat_dir, icon):
import glob
import os
import Material
mat_file_extension = ".FCMat"
ext_len = len(mat_file_extension)
dir_path_list = glob.glob(mat_dir + '/*' + mat_file_extension)
self.pathList = self.pathList + dir_path_list
for i in dir_path_list:
material_name = os.path.basename(i[:-ext_len])
self.form.comboBox_MaterialsInDir.addItem(QtGui.QIcon(icon), material_name)
for a_path in dir_path_list:
material_name = os.path.basename(a_path[:-ext_len])
self.form.comboBox_MaterialsInDir.addItem(QtGui.QIcon(icon), material_name, a_path)
self.materials[a_path] = Material.importFCMat(a_path)
def fillMaterialCombo(self):
def import_materials(self):
self.materials = {}
self.pathList = []
self.form.comboBox_MaterialsInDir.clear()
system_mat_dir = FreeCAD.getResourceDir() + "/Mod/Material/StandardMaterial"