kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: Add icons to materials

Browse Source 
Add icons to distinguish where the material is from. FreeCAD icon for
build-in materials, notmal material icon for materials from user
preferences directory which is "~/.FreeCAD/Materials" on linux or
from an user defined location defined in FEM preferences.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt
2015-04-09 13:54:25 +01:00
committed by wmayer
parent 33b4579d72
commit 6848c9a9ca
3 changed files with 651 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,10 @@ import FreeCAD
if FreeCAD.GuiUp:
import FreeCADGui
import FemGui
from PySide import QtGui
from PySide import QtCore
__title__ = "Machine-Distortion FemSetGeometryObject managment"
__author__ = "Juergen Riegel"
__url__ = "http://www.freecadweb.org"
@@ -199,20 +201,20 @@ class _MechanicalMaterialTaskPanel:
l = len(mat_file_extension)
for i in self.pathList:
material_name = os.path.basename(i[:-l])
self.form.comboBox_MaterialsInDir.addItem(material_name)
self.form.comboBox_MaterialsInDir.addItem(QtGui.QIcon(":/icons/freecad.svg"), material_name)
user_mat_dir = FreeCAD.getUserAppDataDir() + "/Materials"
user_mat_path_list = glob.glob(user_mat_dir + '/*' + mat_file_extension)
for i in user_mat_path_list:
material_name = os.path.basename(i[:-l])
self.form.comboBox_MaterialsInDir.addItem(material_name)
self.form.comboBox_MaterialsInDir.addItem(QtGui.QIcon(":/icons/preferences-general.svg"), material_name)
self.pathList = self.pathList + user_mat_path_list
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
custom_mat_dir = self.fem_prefs.GetString("CustomMaterialsDir","")
custom_mat_path_list = glob.glob(custom_mat_dir + '/*' + mat_file_extension)
for i in custom_mat_path_list:
material_name = os.path.basename(i[:-l])
self.form.comboBox_MaterialsInDir.addItem(material_name)
self.form.comboBox_MaterialsInDir.addItem(QtGui.QIcon(":/icons/user.svg"), material_name)
self.pathList = self.pathList + custom_mat_path_list
FreeCADGui.addCommand('Fem_MechanicalMaterial',_CommandMechanicalMaterial())