diff --git a/src/Mod/Fem/Gui/Resources/ui/Material.ui b/src/Mod/Fem/Gui/Resources/ui/Material.ui index 7efe5269b8..41bdf99b9a 100755 --- a/src/Mod/Fem/Gui/Resources/ui/Material.ui +++ b/src/Mod/Fem/Gui/Resources/ui/Material.ui @@ -15,122 +15,7 @@ - - - - 16777215 - 1677215 - - - - Material - - - - - - - - Category - - - - - - - - - - - - - - Material card - - - - - - - - choose... - - - - - - - - Material name - - - - - - - TextLabel - - - - - - - - - Material Description - - - true - - - - - - - - - - - 16777215 - 1677215 - - - - Editing material - - - - - - - - Use FreeCAD material editor - - - - - - - - 0 - 0 - - - - Qt::RightToLeft - - - Use this task panel - - - false - - - - - - - + @@ -149,15 +34,15 @@ QFormLayout::AllNonFixedFieldsGrow - + - Density + Density: - - + + false @@ -170,27 +55,20 @@ 80 - 20 - - 0 kg/m^3 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 + 1.000000000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 kg/m^3 - - 3 - 0.000000000000000 @@ -226,7 +104,7 @@ - + false @@ -239,27 +117,20 @@ 80 - 20 - - 0 Pa - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 + 1.000000000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 Pa - - 3 - 0.000000000000000 @@ -273,7 +144,7 @@ - + false @@ -286,14 +157,10 @@ 80 - 20 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter 1.000000000000000 @@ -302,7 +169,7 @@ 0.100000000000000 - 0.300000000000000 + 0.000000000000000 @@ -336,7 +203,7 @@ - + false @@ -349,27 +216,20 @@ 80 - 20 - - 0 m^2/s - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter 0.000001000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 m^2/s - - 6 - 0.000000000000000 @@ -405,7 +265,7 @@ - + false @@ -418,27 +278,20 @@ 80 - 20 - - 0 W/m/K - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 + 1.000000000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 W/m/K - - 3 - 0.000000000000000 @@ -452,7 +305,7 @@ - + false @@ -465,27 +318,20 @@ 80 - 20 - - 0 m/m/K - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 + 1.000000000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 m/m/K - - 3 - 0.000000000000000 @@ -499,7 +345,7 @@ - + false @@ -512,74 +358,20 @@ 80 - 20 - - 0 J/kg/K - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 + 1.000000000000000 - 99999999999.000000000000000 + 100000000000.00000000000000 J/kg/K - - 3 - - - 0.000000000000000 - - - - - - - Vol Expansion Coeff - - - - - - - false - - - - 0 - 0 - - - - - 80 - 20 - - - - 0 m/m/K - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.001000000000000 - - - 1.000000000000000 - - - m/m/K - - - 6 - 0.000000000000000 @@ -590,26 +382,34 @@ - - - - Qt::Vertical + + + + + 0 + 0 + - - - 20 - 40 - + + Use this task panel - + + false + + - Gui::InputField - QLineEdit -
Gui/InputField.h
+ Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ + + MatGui::MaterialTreeWidget + QWidget +
Mod/Material/Gui/MaterialTreeWidget.h
 @@ -617,7 +417,7 @@ chbu_allow_edit toggled(bool) - input_fd_density + qsb_density setEnabled(bool) @@ -633,7 +433,7 @@ chbu_allow_edit toggled(bool) - input_fd_young_modulus + qsb_young_modulus setEnabled(bool) @@ -649,7 +449,7 @@ chbu_allow_edit toggled(bool) - spinBox_poisson_ratio + qsb_poisson_ratio setEnabled(bool) @@ -665,7 +465,7 @@ chbu_allow_edit toggled(bool) - input_fd_kinematic_viscosity + qsb_kinematic_viscosity setEnabled(bool) @@ -681,7 +481,7 @@ chbu_allow_edit toggled(bool) - input_fd_thermal_conductivity + qsb_thermal_conductivity setEnabled(bool) @@ -697,7 +497,7 @@ chbu_allow_edit toggled(bool) - input_fd_expansion_coefficient + qsb_expansion_coefficient setEnabled(bool) @@ -713,7 +513,7 @@ chbu_allow_edit toggled(bool) - input_fd_specific_heat + qsb_specific_heat setEnabled(bool) diff --git a/src/Mod/Fem/femobjects/material_common.py b/src/Mod/Fem/femobjects/material_common.py index f230b843cc..10011c7978 100644 --- a/src/Mod/Fem/femobjects/material_common.py +++ b/src/Mod/Fem/femobjects/material_common.py @@ -70,6 +70,16 @@ class MaterialCommon(base_fempythonobject.BaseFemPythonObject): value=["Solid", "Fluid"], ) ) + prop.append( + _PropHelper( + type="App::PropertyString", + name="UUID", + group="Material", + doc="Material UUID", + hidden=True, + value="", + ) + ) return prop diff --git a/src/Mod/Fem/femtaskpanels/task_material_common.py b/src/Mod/Fem/femtaskpanels/task_material_common.py index d2c1afdc94..d3c2a0ff98 100644 --- a/src/Mod/Fem/femtaskpanels/task_material_common.py +++ b/src/Mod/Fem/femtaskpanels/task_material_common.py @@ -32,11 +32,12 @@ __url__ = "https://www.freecad.org" # \brief task panel for common material object from PySide import QtCore -from PySide import QtGui import FreeCAD import FreeCADGui from FreeCAD import Units +import Materials +import MatGui from femguiutils import selection_widgets from . import base_femtaskpanel @@ -50,78 +51,68 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): def __init__(self, obj): super().__init__(obj) - self.material = self.obj.Material # FreeCAD material dictionary of current material - self.card_path = "" - self.materials = {} # { card_path : FreeCAD material dict, ... } - self.cards = {} # { card_path : card_names, ... } - self.icons = {} # { card_path : icon_path, ... } - # mat_card is the FCMat file - # card_name is the file name of the mat_card - # card_path is the whole file path of the mat_card - # material_name is the value of the key name in FreeCAD material dictionary - # they might not match because of special letters in the material_name - # which are changed in the card_name to english standard characters - self.has_transient_mat = False + # FreeCAD material dictionary of current material + self.material = self.obj.Material + self.uuid = self.obj.UUID + self.material_manager = Materials.MaterialManager() # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi( FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/Material.ui" ) - # globals - QtCore.QObject.connect( - self.parameterWidget.cb_materials, QtCore.SIGNAL("activated(int)"), self.choose_material - ) + self.material_tree = MatGui.MaterialTreeWidget(self.parameterWidget.wgt_material_tree) + self.material_tree.expanded = False + self.material_tree.IncludeEmptyFolders = False + self.material_tree.IncludeEmptyLibraries = False + QtCore.QObject.connect( self.parameterWidget.chbu_allow_edit, QtCore.SIGNAL("clicked()"), self.toggleInputFieldsReadOnly, ) - QtCore.QObject.connect( - self.parameterWidget.pushButton_editMat, QtCore.SIGNAL("clicked()"), self.edit_material - ) # basic properties must be provided QtCore.QObject.connect( - self.parameterWidget.input_fd_density, + self.parameterWidget.qsb_density, QtCore.SIGNAL("editingFinished()"), self.density_changed, ) # mechanical properties QtCore.QObject.connect( - self.parameterWidget.input_fd_young_modulus, + self.parameterWidget.qsb_young_modulus, QtCore.SIGNAL("editingFinished()"), self.ym_changed, ) QtCore.QObject.connect( - self.parameterWidget.spinBox_poisson_ratio, + self.parameterWidget.qsb_poisson_ratio, QtCore.SIGNAL("editingFinished()"), self.pr_changed, ) # thermal properties QtCore.QObject.connect( - self.parameterWidget.input_fd_thermal_conductivity, + self.parameterWidget.qsb_thermal_conductivity, QtCore.SIGNAL("editingFinished()"), self.tc_changed, ) QtCore.QObject.connect( - self.parameterWidget.input_fd_expansion_coefficient, + self.parameterWidget.qsb_expansion_coefficient, QtCore.SIGNAL("editingFinished()"), self.tec_changed, ) QtCore.QObject.connect( - self.parameterWidget.input_fd_specific_heat, + self.parameterWidget.qsb_specific_heat, QtCore.SIGNAL("editingFinished()"), self.sh_changed, ) # fluidic properties, only volumetric thermal expansion coeff makes sense QtCore.QObject.connect( - self.parameterWidget.input_fd_kinematic_viscosity, + self.parameterWidget.qsb_kinematic_viscosity, QtCore.SIGNAL("editingFinished()"), self.kinematic_viscosity_changed, ) QtCore.QObject.connect( - self.parameterWidget.input_fd_vol_expansion_coefficient, - QtCore.SIGNAL("editingFinished()"), - self.vtec_changed, + self.parameterWidget.wgt_material_tree, + QtCore.SIGNAL("onMaterial(QString)"), + self.set_from_editor, ) # init all parameter input files with read only @@ -129,54 +120,11 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): self.toggleInputFieldsReadOnly() # hide some groupBox according to material category - # note: input_fd_vol_expansion_coefficient is currently not used - # it might be used in future for solids - self.parameterWidget.label_category.setText(self.obj.Category) if self.obj.Category == "Fluid": + self.filter_models(self.obj.Category) self.parameterWidget.groupBox_mechanical.setVisible(0) - self.parameterWidget.label_vol_expansion_coefficient.setVisible(0) - self.parameterWidget.input_fd_vol_expansion_coefficient.setVisible(0) else: self.parameterWidget.groupBox_fluidic.setVisible(0) - self.parameterWidget.label_vol_expansion_coefficient.setVisible(0) - self.parameterWidget.input_fd_vol_expansion_coefficient.setVisible(0) - - # get all available materials (fill self.materials, self.cards and self.icons) - from materialtools.cardutils import import_materials as getmats - - # Note: import_materials(category="Solid", ...), - # category default to Solid, but must be given for FluidMaterial to be imported - self.materials, self.cards, self.icons = getmats(self.obj.Category) - # fill the material comboboxes with material cards - self.add_cards_to_combo_box() - - # search for exact this mat_card in all known cards, choose the current material - self.card_path = self.get_material_card(self.material) - FreeCAD.Console.PrintLog(f"card_path: {self.card_path}\n") - if not self.card_path: - # we have not found our material in self.materials dict :-( - # we're going to add a user-defined temporary material: a document material - FreeCAD.Console.PrintMessage( - "Previously used material card can not be found in material directories. " - "Add document material.\n" - ) - self.card_path = "_document_material" - self.materials[self.card_path] = self.material - self.parameterWidget.cb_materials.addItem( - QtGui.QIcon(":/icons/help-browser.svg"), self.card_path, self.card_path - ) - index = self.parameterWidget.cb_materials.findData(self.card_path) - # fill input fields and set the current material in the cb widget - self.choose_material(index) - else: - # we found our exact material in self.materials dict :-) - FreeCAD.Console.PrintLog( - "Previously used material card was found in material directories. " - "We will use this material.\n" - ) - index = self.parameterWidget.cb_materials.findData(self.card_path) - # fill input fields and set the current material in the cb widget - self.choose_material(index) # geometry selection widget self.selectionWidget = selection_widgets.GeometryElementsSelection( @@ -187,29 +135,18 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): self.form = [self.parameterWidget, self.selectionWidget] # check references, has to be after initialisation of selectionWidget + self.material_tree.UUID = self.get_material_uuid(self.material) + self.set_mat_params_in_input_fields(self.material) + self.selectionWidget.has_equal_references_shape_types() # leave task panel *************************************************************************** def accept(self): - # print(self.material) - if self.material == {}: # happens if material editor was canceled - FreeCAD.Console.PrintError("Empty material dictionary, nothing was changed.\n") - self.recompute_and_set_back_all() - return True if self.selectionWidget.has_equal_references_shape_types(): - self.do_not_set_thermal_zeros() - from materialtools.cardutils import check_mat_units as checkunits + self.obj.Material = self.material + self.obj.UUID = self.uuid + self.obj.References = self.selectionWidget.references - if checkunits(self.material) is True: - self.obj.Material = self.material - self.obj.References = self.selectionWidget.references - else: - error_message = ( - "Due to some wrong material quantity units in the changed " - "material data, the task panel changes where not accepted.\n" - ) - FreeCAD.Console.PrintError(error_message) - QtGui.QMessageBox.critical(None, "Material data not changed", error_message) self.selectionWidget.finish_selection() return super().accept() @@ -217,30 +154,6 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): self.selectionWidget.finish_selection() return super().reject() - def do_not_set_thermal_zeros(self): - """thermal material parameter are set to 0.0 if not available - this leads to wrong material values and to not finding the card - on reopen the task pane, thus do not write thermal parameter, - if they are 0.0 - """ - if Units.Quantity(self.material["ThermalConductivity"]) == 0.0: - self.material.pop("ThermalConductivity", None) - FreeCAD.Console.PrintMessage( - "Zero ThermalConductivity value. " - "This parameter is not saved in the material data.\n" - ) - if Units.Quantity(self.material["ThermalExpansionCoefficient"]) == 0.0: - self.material.pop("ThermalExpansionCoefficient", None) - FreeCAD.Console.PrintMessage( - "Zero ThermalExpansionCoefficient value. " - "This parameter is not saved in the material data.\n" - ) - if Units.Quantity(self.material["SpecificHeat"]) == 0.0: - self.material.pop("SpecificHeat", None) - FreeCAD.Console.PrintMessage( - "Zero SpecificHeat value. This parameter is not saved in the material data.\n" - ) - def isfloat(self, num): try: float(num) @@ -249,20 +162,39 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): return False # choose material **************************************************************************** - def get_material_card(self, material): - for a_mat in self.materials: + def filter_models(self, category): + material_filter = Materials.MaterialFilter() + models = set(Materials.ModelManager().Models.keys()) + uuids = Materials.UUIDs() + if category == "Fluid": + material_filter.RequiredModels = [uuids.Fluid] + self.material_tree.setFilter(material_filter) + + def get_material_uuid(self, material): + if self.uuid: + try: + self.material_manager.getMaterial(self.uuid) + return self.uuid + except: + return "" + + if not self.material: + return "" + + for a_mat in self.material_manager.Materials: # check if every item of the current material fits to a known material card # if all items were found we know it is the right card # we can hereby not simply perform # set(self.materials[a_mat].items()) ^ set(material.items()) # because entries are often identical, just appear in the set in a different order unmatched_item = False + a_mat_prop = self.material_manager.getMaterial(a_mat).Properties.items() for item in material.items(): - if item not in self.materials[a_mat].items(): + if item not in a_mat_prop: unmatched_item = True # often the difference is just a decimal e.g. "120" to "120.0" # therefore first check if the item name exists - for a_mat_item in self.materials[a_mat].items(): + for a_mat_item in a_mat_prop: if item[0] == a_mat_item[0]: # now check if we have a number value in a unit if item[1].split() and not self.isfloat(item[1].split()[0]): @@ -282,459 +214,139 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel): return a_mat return "" - def choose_material(self, index): - if index < 0: - return - self.card_path = self.parameterWidget.cb_materials.itemData(index) # returns whole path - FreeCAD.Console.PrintMessage(f"Material card chosen:\n {self.card_path}\n") - self.material = self.materials[self.card_path] - self.check_material_keys() - self.set_mat_params_in_input_fields(self.material) - self.parameterWidget.cb_materials.setCurrentIndex(index) # set after input fields - gen_mat_desc = "" - gen_mat_name = "" - if "Description" in self.material: - gen_mat_desc = self.material["Description"] - if "Name" in self.material: - gen_mat_name = self.material["Name"] - self.parameterWidget.l_mat_description.setText(gen_mat_desc) - self.parameterWidget.l_mat_name.setText(gen_mat_name) - # print("choose_material: done") - - def set_transient_material(self): - self.card_path = "_transient_material" - self.materials[self.card_path] = self.material # = the current input fields data - index = self.parameterWidget.cb_materials.findData(self.card_path) - self.choose_material(index) - - def add_transient_material(self): - self.has_transient_mat = True - self.card_path = "_transient_material" - self.parameterWidget.cb_materials.addItem( - QtGui.QIcon(":/icons/help-browser.svg"), self.card_path, self.card_path - ) - self.set_transient_material() - - # how to edit a material ********************************************************************* - def edit_material(self): - # opens the material editor to choose a material or edit material params - import MaterialEditor - - if self.card_path not in self.cards: - FreeCAD.Console.PrintLog( - "Card path not in cards, material dict will be used to open Material Editor.\n" - ) - new_material_params = MaterialEditor.editMaterial( - material=self.material, category=self.obj.Category - ) - else: - new_material_params = MaterialEditor.editMaterial( - card_path=self.card_path, category=self.obj.Category - ) - # material editor returns the mat_dict only, not a card_path - # if the material editor was canceled a empty dict will be returned - # do not change the self.material - # check if dict is not empty (do not use "is True") - if new_material_params: - # check material quantity units - from materialtools.cardutils import check_mat_units as checkunits - - if checkunits(new_material_params) is True: - self.material = new_material_params - self.card_path = self.get_material_card(self.material) - self.check_material_keys() - self.set_mat_params_in_input_fields(self.material) - if not self.card_path: - FreeCAD.Console.PrintMessage( - "Material card chosen by the material editor " - "was not found in material directories.\n" - "Either the card does not exist or some material " - "parameter where changed in material editor.\n" - ) - if self.has_transient_mat is False: - self.add_transient_material() - else: - self.set_transient_material() - else: - # we found our exact material in self.materials dict :-) - FreeCAD.Console.PrintLog( - "Material card chosen by the material editor " - "was found in material directories. " - "The found material card will be used.\n" - ) - index = self.parameterWidget.cb_materials.findData(self.card_path) - # set the current material in the cb widget - self.choose_material(index) - else: - error_message = ( - "Due to some wrong material quantity units in data passed " - "by the material editor, the material data was not changed.\n" - ) - FreeCAD.Console.PrintError(error_message) - QtGui.QMessageBox.critical(None, "Material data not changed", error_message) - else: - FreeCAD.Console.PrintLog("No changes where made by the material editor.\n") - def toggleInputFieldsReadOnly(self): if self.parameterWidget.chbu_allow_edit.isChecked(): - self.parameterWidget.input_fd_density.setReadOnly(False) - self.parameterWidget.input_fd_young_modulus.setReadOnly(False) - self.parameterWidget.spinBox_poisson_ratio.setReadOnly(False) - self.parameterWidget.input_fd_thermal_conductivity.setReadOnly(False) - self.parameterWidget.input_fd_expansion_coefficient.setReadOnly(False) - self.parameterWidget.input_fd_specific_heat.setReadOnly(False) - self.parameterWidget.input_fd_kinematic_viscosity.setReadOnly(False) - self.parameterWidget.input_fd_vol_expansion_coefficient.setReadOnly(False) + self.parameterWidget.qsb_density.setReadOnly(False) + self.parameterWidget.qsb_young_modulus.setReadOnly(False) + self.parameterWidget.qsb_poisson_ratio.setReadOnly(False) + self.parameterWidget.qsb_thermal_conductivity.setReadOnly(False) + self.parameterWidget.qsb_expansion_coefficient.setReadOnly(False) + self.parameterWidget.qsb_specific_heat.setReadOnly(False) + self.parameterWidget.qsb_kinematic_viscosity.setReadOnly(False) + self.parameterWidget.wgt_material_tree.setEnabled(False) + self.uuid = "" + self.mat_from_input_fields() else: - self.parameterWidget.input_fd_density.setReadOnly(True) - self.parameterWidget.input_fd_young_modulus.setReadOnly(True) - self.parameterWidget.spinBox_poisson_ratio.setReadOnly(True) - self.parameterWidget.input_fd_thermal_conductivity.setReadOnly(True) - self.parameterWidget.input_fd_expansion_coefficient.setReadOnly(True) - self.parameterWidget.input_fd_specific_heat.setReadOnly(True) - self.parameterWidget.input_fd_kinematic_viscosity.setReadOnly(True) - self.parameterWidget.input_fd_vol_expansion_coefficient.setReadOnly(True) + self.parameterWidget.qsb_density.setReadOnly(True) + self.parameterWidget.qsb_young_modulus.setReadOnly(True) + self.parameterWidget.qsb_poisson_ratio.setReadOnly(True) + self.parameterWidget.qsb_thermal_conductivity.setReadOnly(True) + self.parameterWidget.qsb_expansion_coefficient.setReadOnly(True) + self.parameterWidget.qsb_specific_heat.setReadOnly(True) + self.parameterWidget.qsb_kinematic_viscosity.setReadOnly(True) + self.parameterWidget.wgt_material_tree.setEnabled(True) + self.set_from_editor(self.material_tree.UUID) # material parameter input fields ************************************************************ - def check_material_keys(self): - # FreeCAD units definition is at file end of src/Base/Unit.cpp - if not self.material: - self.material["Name"] = "NoName" - if "Density" in self.material: - if "Density" not in str(Units.Unit(self.material["Density"])): - FreeCAD.Console.PrintMessage( - "Density in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["Density"] = "0 kg/m^3" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "Density not found in {}\n".format(self.material["Name"]) - ) - self.material["Density"] = "0 kg/m^3" - if self.obj.Category == "Solid": - # mechanical properties - if "YoungsModulus" in self.material: - # unit type of YoungsModulus is Pressure - if "Pressure" not in str(Units.Unit(self.material["YoungsModulus"])): - FreeCAD.Console.PrintMessage( - "YoungsModulus in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["YoungsModulus"] = "0 MPa" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "YoungsModulus not found in {}\n".format(self.material["Name"]) - ) - self.material["YoungsModulus"] = "0 MPa" - if "PoissonRatio" in self.material: - # PoissonRatio does not have a unit, but it is checked if there is no value at all - try: - # next line with float() is ok - # a quantity of a empty string returns very small value, would be wrong here - float(self.material["PoissonRatio"]) - except ValueError: - FreeCAD.Console.PrintMessage( - "PoissonRatio has wrong or no data (reset the value): {}\n".format( - self.material["PoissonRatio"] - ) - ) - self.material["PoissonRatio"] = "0" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "PoissonRatio not found in {}\n".format(self.material["Name"]) - ) - self.material["PoissonRatio"] = "0" - if self.obj.Category == "Fluid": - # Fluidic properties - if "KinematicViscosity" in self.material: - ki_vis = self.material["KinematicViscosity"] - if "KinematicViscosity" not in str(Units.Unit(ki_vis)): - FreeCAD.Console.PrintMessage( - "KinematicViscosity in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["KinematicViscosity"] = "0 m^2/s" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "KinematicViscosity not found in {}\n".format(self.material["Name"]) - ) - self.material["KinematicViscosity"] = "0 m^2/s" - if "ThermalExpansionCoefficient" in self.material: - vol_ther_ex_co = self.material["ThermalExpansionCoefficient"] - if "ThermalExpansionCoefficient" not in str(Units.Unit(vol_ther_ex_co)): - FreeCAD.Console.PrintMessage( - "ThermalExpansionCoefficient in material data " - "seems to have no unit or a wrong unit (reset the value): {}\n".format( - self.material["Name"] - ) - ) - self.material["ThermalExpansionCoefficient"] = "0 1/K" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "ThermalExpansionCoefficient not found in {}\n".format( - self.material["Name"] - ) - ) - self.material["ThermalExpansionCoefficient"] = "0 1/K" - if "VolumetricThermalExpansionCoefficient" in self.material: - # unit type VolumetricThermalExpansionCoefficient is ThermalExpansionCoefficient - vol_ther_ex_co = self.material["VolumetricThermalExpansionCoefficient"] - if "ThermalExpansionCoefficient" not in str(Units.Unit(vol_ther_ex_co)): - FreeCAD.Console.PrintMessage( - "VolumetricThermalExpansionCoefficient in material data " - "seems to have no unit or a wrong unit (reset the value): {}\n".format( - self.material["Name"] - ) - ) - self.material["VolumetricThermalExpansionCoefficient"] = "0 1/K" - else: - # as fallback only add VolumetricThermalExpansionCoefficient if there is no - # ThermalExpansionCoefficient - if "ThermalExpansionCoefficient" not in self.material: - self.material["VolumetricThermalExpansionCoefficient"] = "0 1/K" - # Thermal properties - if "ThermalConductivity" in self.material: - # TODO implement for all task panel values - # https://forum.freecad.org/viewtopic.php?f=18&t=56912&p=516826#p516800 - try: - Units.Quantity(self.material["ThermalConductivity"]) - except Exception: - FreeCAD.Console.PrintError( - "Problem with the quantity for ThermalConductivity: '{}' Reset value.\n" - "May try the following in Python console:\n" - "from FreeCAD import Units\n" - "Units.Quantity('{}')\n".format( - self.material["ThermalConductivity"], self.material["ThermalConductivity"] - ) - ) - self.material["ThermalConductivity"] = "0 W/m/K" - if "ThermalConductivity" not in str(Units.Unit(self.material["ThermalConductivity"])): - FreeCAD.Console.PrintMessage( - "ThermalConductivity in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["ThermalConductivity"] = "0 W/m/K" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "ThermalConductivity not found in {}\n".format(self.material["Name"]) - ) - self.material["ThermalConductivity"] = "0 W/m/K" - if "ThermalExpansionCoefficient" in self.material: - the_ex_co = self.material["ThermalExpansionCoefficient"] - if "ThermalExpansionCoefficient" not in str(Units.Unit(the_ex_co)): - FreeCAD.Console.PrintMessage( - "ThermalExpansionCoefficient in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["ThermalExpansionCoefficient"] = "0 um/m/K" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "ThermalExpansionCoefficient not found in {}\n".format(self.material["Name"]) - ) - self.material["ThermalExpansionCoefficient"] = "0 um/m/K" - if "SpecificHeat" in self.material: - if "SpecificHeat" not in str(Units.Unit(self.material["SpecificHeat"])): - FreeCAD.Console.PrintMessage( - "SpecificHeat in material data seems to have no unit " - "or a wrong unit (reset the value): {}\n".format(self.material["Name"]) - ) - self.material["SpecificHeat"] = "0 J/kg/K" - else: - if self.material["Name"] != "NoName": - FreeCAD.Console.PrintMessage( - "SpecificHeat not found in {}\n".format(self.material["Name"]) - ) - self.material["SpecificHeat"] = "0 J/kg/K" - FreeCAD.Console.PrintMessage("\n") - - def update_material_property(self, inputfield_text, matProperty, qUnit, variation=0.001): - # print(inputfield_text) - # this update property works for all Gui::InputField widgets - if qUnit != "": - value = Units.Quantity(inputfield_text).getValueAs(qUnit) - old_value = Units.Quantity(self.material[matProperty]).getValueAs(qUnit) - else: - # for example PoissonRatio - value = Units.Quantity(inputfield_text).Value - old_value = Units.Quantity(self.material[matProperty]).Value - # value = float(inputfield_text) # this fails on locale with comma - # https://forum.freecad.org/viewtopic.php?f=18&t=56912&p=523313#p523313 - - if not (1 - variation < float(old_value) / value < 1 + variation): - material = self.material - if qUnit != "": - material[matProperty] = str(value) + " " + qUnit - else: - material[matProperty] = str(value) - self.material = material - if self.has_transient_mat is False: - self.add_transient_material() - else: - self.set_transient_material() - # print(inputfield_text) - # mechanical input fields def ym_changed(self): - # FreeCADs standard unit for stress is kPa for UnitsSchemeInternal, but MPa can be used - self.update_material_property( - self.parameterWidget.input_fd_young_modulus.text(), - "YoungsModulus", - "kPa", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["YoungsModulus"] = self.parameterWidget.qsb_young_modulus.property( + "value" + ).UserString def density_changed(self): - print( - "String read from density input field: {}".format( - self.parameterWidget.input_fd_density.text() - ) - ) - # FreeCADs standard unit for density is kg/mm^3 for UnitsSchemeInternal - self.update_material_property( - self.parameterWidget.input_fd_density.text(), - "Density", - "kg/m^3", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["Density"] = self.parameterWidget.qsb_density.property("value").UserString def pr_changed(self): - value = self.parameterWidget.spinBox_poisson_ratio.value() - if value: - self.update_material_property( - self.parameterWidget.spinBox_poisson_ratio.text(), - "PoissonRatio", - "", + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["PoissonRatio"] = str( + self.parameterWidget.qsb_poisson_ratio.property("value").Value ) - elif value == 0: - # PoissonRatio was set to 0.0 what is possible - material = self.material - material["PoissonRatio"] = str(value) - self.material = material - if self.has_transient_mat is False: - self.add_transient_material() - else: - self.set_transient_material() # thermal input fields def tc_changed(self): - self.update_material_property( - self.parameterWidget.input_fd_thermal_conductivity.text(), - "ThermalConductivity", - "W/m/K", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["ThermalConductivity"] = ( + self.parameterWidget.qsb_thermal_conductivity.property("value").UserString + ) def tec_changed(self): - self.update_material_property( - self.parameterWidget.input_fd_expansion_coefficient.text(), - "ThermalExpansionCoefficient", - "um/m/K", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["ThermalExpansionCoefficient"] = ( + self.parameterWidget.qsb_expansion_coefficient.property("value").UserString + ) def sh_changed(self): - self.update_material_property( - self.parameterWidget.input_fd_specific_heat.text(), - "SpecificHeat", - "J/kg/K", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["SpecificHeat"] = self.parameterWidget.qsb_specific_heat.property( + "value" + ).UserString # fluidic input fields - def vtec_changed(self): - self.update_material_property( - self.parameterWidget.input_fd_vol_expansion_coefficient.text(), - "VolumetricThermalExpansionCoefficient", - "m^3/m^3/K", - ) - def kinematic_viscosity_changed(self): - self.update_material_property( - self.parameterWidget.input_fd_kinematic_viscosity.text(), - "KinematicViscosity", - "m^2/s", - ) + if self.parameterWidget.chbu_allow_edit.isChecked(): + self.material["KinematicViscosity"] = ( + self.parameterWidget.qsb_kinematic_viscosity.property("value").UserString + ) def set_mat_params_in_input_fields(self, matmap): if "YoungsModulus" in matmap: - ym_new_unit = "MPa" - ym = Units.Quantity(matmap["YoungsModulus"]) - ym_with_new_unit = ym.getValueAs(ym_new_unit) - q = Units.Quantity(f"{ym_with_new_unit} {ym_new_unit}") - self.parameterWidget.input_fd_young_modulus.setText(q.UserString) + self.parameterWidget.qsb_young_modulus.setProperty( + "value", Units.Quantity(matmap["YoungsModulus"]) + ) + else: + self.parameterWidget.qsb_young_modulus.setProperty("rawValue", 0.0) + if "PoissonRatio" in matmap: - self.parameterWidget.spinBox_poisson_ratio.setValue(float(matmap["PoissonRatio"])) + self.parameterWidget.qsb_poisson_ratio.setProperty( + "value", Units.Quantity(matmap["PoissonRatio"]) + ) + else: + self.parameterWidget.qsb_poisson_ratio.setProperty("rawValue", 0.0) # Fluidic properties if "KinematicViscosity" in matmap: - nu_new_unit = "m^2/s" - nu = Units.Quantity(matmap["KinematicViscosity"]) - nu_with_new_unit = nu.getValueAs(nu_new_unit) - q = Units.Quantity(f"{nu_with_new_unit} {nu_new_unit}") - self.parameterWidget.input_fd_kinematic_viscosity.setText(q.UserString) - # For isotropic materials and fluidic material - # use the volumetric thermal expansion coefficient - # is approximately three times the linear coefficient for solids - if "VolumetricThermalExpansionCoefficient" in matmap: - vtec_new_unit = "m^3/m^3/K" - vtec = Units.Quantity(matmap["VolumetricThermalExpansionCoefficient"]) - vtec_with_new_unit = vtec.getValueAs(vtec_new_unit) - q = Units.Quantity(f"{vtec_with_new_unit} {vtec_new_unit}") - self.parameterWidget.input_fd_vol_expansion_coefficient.setText(q.UserString) + self.parameterWidget.qsb_kinematic_viscosity.setProperty( + "value", Units.Quantity(matmap["KinematicViscosity"]) + ) + else: + self.parameterWidget.qsb_kinematic_viscosity.setProperty("rawValue", 0.0) + if "Density" in matmap: - density_new_unit = "kg/m^3" - density = Units.Quantity(matmap["Density"]) - density_with_new_unit = density.getValueAs(density_new_unit) - # self.parameterWidget.input_fd_density.setText( - # "{} {}".format(density_with_new_unit, density_new_unit) - # ) - q = Units.Quantity(f"{density_with_new_unit} {density_new_unit}") - self.parameterWidget.input_fd_density.setText(q.UserString) + self.parameterWidget.qsb_density.setProperty("value", Units.Quantity(matmap["Density"])) + else: + self.parameterWidget.qsb_density.setProperty("rawValue", 0.0) # thermal properties if "ThermalConductivity" in matmap: - tc_new_unit = "W/m/K" - tc = Units.Quantity(matmap["ThermalConductivity"]) - tc_with_new_unit = tc.getValueAs(tc_new_unit) - q = Units.Quantity(f"{tc_with_new_unit} {tc_new_unit}") - self.parameterWidget.input_fd_thermal_conductivity.setText(q.UserString) - if "ThermalExpansionCoefficient" in matmap: # linear, only for solid - tec_new_unit = "um/m/K" - tec = Units.Quantity(matmap["ThermalExpansionCoefficient"]) - tec_with_new_unit = tec.getValueAs(tec_new_unit) - q = Units.Quantity(f"{tec_with_new_unit} {tec_new_unit}") - self.parameterWidget.input_fd_expansion_coefficient.setText(q.UserString) - if "SpecificHeat" in matmap: - sh_new_unit = "J/kg/K" - sh = Units.Quantity(matmap["SpecificHeat"]) - sh_with_new_unit = sh.getValueAs(sh_new_unit) - q = Units.Quantity(f"{sh_with_new_unit} {sh_new_unit}") - self.parameterWidget.input_fd_specific_heat.setText(q.UserString) - - # fill the combo box with cards ************************************************************** - def add_cards_to_combo_box(self): - # fill combobox, in combo box the card name is used not the material name - self.parameterWidget.cb_materials.clear() - - mat_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Cards") - sort_by_resources = mat_prefs.GetBool("SortByResources", False) - - card_name_list = [] # [ [card_name, card_path, icon_path], ... ] - - if sort_by_resources is True: - for a_path in sorted(self.materials): - card_name_list.append([self.cards[a_path], a_path, self.icons[a_path]]) + self.parameterWidget.qsb_thermal_conductivity.setProperty( + "value", Units.Quantity(matmap["ThermalConductivity"]) + ) else: - card_names_tmp = {} - for path, name in self.cards.items(): - card_names_tmp[name] = path - for a_name in sorted(card_names_tmp): - a_path = card_names_tmp[a_name] - card_name_list.append([a_name, a_path, self.icons[a_path]]) + self.parameterWidget.qsb_thermal_conductivity.setProperty("rawValue", 0.0) - for mat in card_name_list: - self.parameterWidget.cb_materials.addItem(QtGui.QIcon(mat[2]), mat[0], mat[1]) - # the whole card path is added to the combo box to make it unique - # see def choose_material: - # for assignment of self.card_path the path form the parameterWidget is used + if "ThermalExpansionCoefficient" in matmap: + v = Units.Quantity(matmap["ThermalExpansionCoefficient"]) + v.Format = {"Precision": 3} + self.parameterWidget.qsb_expansion_coefficient.setProperty("value", v) + else: + self.parameterWidget.qsb_expansion_coefficient.setProperty("rawValue", 0.0) + if "SpecificHeat" in matmap: + self.parameterWidget.qsb_specific_heat.setProperty( + "value", Units.Quantity(matmap["SpecificHeat"]) + ) + else: + self.parameterWidget.qsb_specific_heat.setProperty("rawValue", 0.0) + + def set_from_editor(self, value): + if not value: + return + mat = self.material_manager.getMaterial(value) + self.material = mat.Properties + self.uuid = mat.UUID + self.set_mat_params_in_input_fields(self.material) + + def mat_from_input_fields(self): + d = {} + d["Name"] = "Custom" + p = self.parameterWidget + d["Density"] = p.qsb_density.property("value").UserString + d["ThermalConductivity"] = p.qsb_thermal_conductivity.property("value").UserString + d["ThermalExpansionCoefficient"] = p.qsb_expansion_coefficient.property("value").UserString + d["SpecificHeat"] = p.qsb_specific_heat.property("value").UserString + if self.obj.Category == "Solid": + d["YoungsModulus"] = p.qsb_young_modulus.property("value").UserString + d["PoissonRatio"] = str(p.qsb_poisson_ratio.property("value").Value) + elif self.obj.Category == "Fluid": + d["KinematicViscosity"] = p.qsb_kinematic_viscosity.property("value").UserString + self.material = d diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 983ee44cb8..131f69a683 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -324,10 +324,6 @@ QModelIndex MaterialTreeWidget::findInTree(const QString& uuid) void MaterialTreeWidget::setMaterial(const QString& uuid) { - if (uuid == m_uuid) { - return; - } - if (uuid.isEmpty()) { // Nothing is selected QItemSelectionModel* selectionModel = m_materialTree->selectionModel();