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

FEM: result task panel, small code improvements

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-02-12 22:54:37 +01:00
parent e18daf1ec4
commit 4327e7bca6
2 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/Mod/Fem/Gui/Resources/ui/ResultShowHints.ui → src/Mod/Fem/Gui/Resources/ui/ResultHints.ui
View File

185
src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py
View File

@@ -128,9 +128,10 @@ class _TaskPanelFemResultShow:
# in view provider checks: Mesh, active analysis and
# if Mesh and result are in active analysis
self.form = [FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ResultShow.ui"),
FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ResultShowHints.ui")
]
ui_path = FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/"
self.result_widget = FreeCADGui.PySideUic.loadUi(ui_path + "ResultShow.ui")
self.info_widget = FreeCADGui.PySideUic.loadUi(ui_path + "ResultHints.ui")
self.form = [self.result_widget, self.info_widget]
self.fem_prefs = FreeCAD.ParamGet(
"User parameter:BaseApp/Preferences/Mod/Fem/General"
@@ -143,93 +144,97 @@ class _TaskPanelFemResultShow:
# result type radio buttons
# TODO: move to combo box, to be independent from result types and result types count
QtCore.QObject.connect(
self.form[0].rb_none, QtCore.SIGNAL("toggled(bool)"),
self.result_widget.rb_none, QtCore.SIGNAL("toggled(bool)"),
self.none_selected
)
QtCore.QObject.connect(
self.form[0].rb_abs_displacement,
self.result_widget.rb_abs_displacement,
QtCore.SIGNAL("toggled(bool)"),
self.abs_displacement_selected
)
QtCore.QObject.connect(
self.form[0].rb_x_displacement,
self.result_widget.rb_x_displacement,
QtCore.SIGNAL("toggled(bool)"),
self.x_displacement_selected
)
QtCore.QObject.connect(
self.form[0].rb_y_displacement,
self.result_widget.rb_y_displacement,
QtCore.SIGNAL("toggled(bool)"),
self.y_displacement_selected
)
QtCore.QObject.connect(
self.form[0].rb_z_displacement,
self.result_widget.rb_z_displacement,
QtCore.SIGNAL("toggled(bool)"),
self.z_displacement_selected
)
QtCore.QObject.connect(
self.form[0].rb_temperature,
self.result_widget.rb_temperature,
QtCore.SIGNAL("toggled(bool)"),
self.temperature_selected
)
QtCore.QObject.connect(
self.form[0].rb_vm_stress,
self.result_widget.rb_vm_stress,
QtCore.SIGNAL("toggled(bool)"),
self.vm_stress_selected
)
QtCore.QObject.connect(
self.form[0].rb_maxprin,
self.result_widget.rb_maxprin,
QtCore.SIGNAL("toggled(bool)"),
self.max_prin_selected
)
QtCore.QObject.connect(
self.form[0].rb_minprin,
self.result_widget.rb_minprin,
QtCore.SIGNAL("toggled(bool)"),
self.min_prin_selected
)
QtCore.QObject.connect(
self.form[0].rb_max_shear_stress,
self.result_widget.rb_max_shear_stress,
QtCore.SIGNAL("toggled(bool)"),
self.max_shear_selected
)
QtCore.QObject.connect(
self.form[0].rb_massflowrate,
self.result_widget.rb_massflowrate,
QtCore.SIGNAL("toggled(bool)"),
self.massflowrate_selected
)
QtCore.QObject.connect(
self.form[0].rb_networkpressure,
self.result_widget.rb_networkpressure,
QtCore.SIGNAL("toggled(bool)"),
self.networkpressure_selected
)
QtCore.QObject.connect(
self.form[0].rb_peeq,
self.result_widget.rb_peeq,
QtCore.SIGNAL("toggled(bool)"),
self.peeq_selected
)
# displacement
QtCore.QObject.connect(
self.form[0].cb_show_displacement,
self.result_widget.cb_show_displacement,
QtCore.SIGNAL("clicked(bool)"),
self.show_displacement
)
QtCore.QObject.connect(
self.form[0].hsb_displacement_factor,
self.result_widget.hsb_displacement_factor,
QtCore.SIGNAL("valueChanged(int)"),
self.hsb_disp_factor_changed
)
self.form[0].sb_displacement_factor.valueChanged.connect(self.sb_disp_factor_changed)
self.form[0].sb_displacement_factor_max.valueChanged.connect(self.sb_disp_factor_max_changed)
self.result_widget.sb_displacement_factor.valueChanged.connect(
self.sb_disp_factor_changed
)
self.result_widget.sb_displacement_factor_max.valueChanged.connect(
self.sb_disp_factor_max_changed
)
# user defined equation
QtCore.QObject.connect(
self.form[0].user_def_eq,
self.result_widget.user_def_eq,
QtCore.SIGNAL("textchanged()"),
self.user_defined_text
)
QtCore.QObject.connect(
self.form[0].calculate,
self.result_widget.calculate,
QtCore.SIGNAL("clicked()"),
self.calculate
)
@@ -241,62 +246,62 @@ class _TaskPanelFemResultShow:
self.restore_initial_result_dialog()
# initialize scale factor for show displacement
scale_factor = get_displacement_scale_factor(self.result_obj)
self.form[0].sb_displacement_factor_max.setValue(10. * scale_factor)
self.form[0].sb_displacement_factor.setValue(scale_factor)
self.result_widget.sb_displacement_factor_max.setValue(10. * scale_factor)
self.result_widget.sb_displacement_factor.setValue(scale_factor)
def restore_result_dialog(self):
try:
rt = FreeCAD.FEM_dialog["results_type"]
if rt == "None":
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
elif rt == "Uabs":
self.form[0].rb_abs_displacement.setChecked(True)
self.result_widget.rb_abs_displacement.setChecked(True)
self.abs_displacement_selected(True)
elif rt == "U1":
self.form[0].rb_x_displacement.setChecked(True)
self.result_widget.rb_x_displacement.setChecked(True)
self.x_displacement_selected(True)
elif rt == "U2":
self.form[0].rb_y_displacement.setChecked(True)
self.result_widget.rb_y_displacement.setChecked(True)
self.y_displacement_selected(True)
elif rt == "U3":
self.form[0].rb_z_displacement.setChecked(True)
self.result_widget.rb_z_displacement.setChecked(True)
self.z_displacement_selected(True)
elif rt == "Temp":
self.form[0].rb_temperature.setChecked(True)
self.result_widget.rb_temperature.setChecked(True)
self.temperature_selected(True)
elif rt == "Sabs":
self.form[0].rb_vm_stress.setChecked(True)
self.result_widget.rb_vm_stress.setChecked(True)
self.vm_stress_selected(True)
elif rt == "MaxPrin":
self.form[0].rb_maxprin.setChecked(True)
self.result_widget.rb_maxprin.setChecked(True)
self.max_prin_selected(True)
elif rt == "MinPrin":
self.form[0].rb_minprin.setChecked(True)
self.result_widget.rb_minprin.setChecked(True)
self.min_prin_selected(True)
elif rt == "MaxShear":
self.form[0].rb_max_shear_stress.setChecked(True)
self.result_widget.rb_max_shear_stress.setChecked(True)
self.max_shear_selected(True)
elif rt == "MFlow":
self.form[0].rb_massflowrate.setChecked(True)
self.result_widget.rb_massflowrate.setChecked(True)
self.massflowrate_selected(True)
elif rt == "NPress":
self.form[0].rb_networkpressure.setChecked(True)
self.result_widget.rb_networkpressure.setChecked(True)
self.networkpressure_selected(True)
elif rt == "Peeq":
self.form[0].rb_peeq.setChecked(True)
self.result_widget.rb_peeq.setChecked(True)
self.peeq_selected(True)
sd = FreeCAD.FEM_dialog["show_disp"]
self.form[0].cb_show_displacement.setChecked(sd)
self.result_widget.cb_show_displacement.setChecked(sd)
self.show_displacement(sd)
df = FreeCAD.FEM_dialog["disp_factor"]
dfm = FreeCAD.FEM_dialog["disp_factor_max"]
# self.form[0].hsb_displacement_factor.setMaximum(dfm)
# self.form[0].hsb_displacement_factor.setValue(df)
self.form[0].sb_displacement_factor_max.setValue(dfm)
self.form[0].sb_displacement_factor.setValue(df)
# self.result_widget.hsb_displacement_factor.setMaximum(dfm)
# self.result_widget.hsb_displacement_factor.setValue(df)
self.result_widget.sb_displacement_factor_max.setValue(dfm)
self.result_widget.sb_displacement_factor.setValue(df)
except:
self.restore_initial_result_dialog()
@@ -316,7 +321,7 @@ class _TaskPanelFemResultShow:
"disp_factor": 0.,
"disp_factor_max": 100.
}
self.form[0].sb_displacement_factor_max.setValue(100.) # init non standard values
self.result_widget.sb_displacement_factor_max.setValue(100.) # init non standard values
def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Close)
@@ -340,7 +345,7 @@ class _TaskPanelFemResultShow:
if len(self.result_obj.DisplacementLengths) > 0:
self.result_selected("Uabs", self.result_obj.DisplacementLengths, "mm")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def x_displacement_selected(self, state):
@@ -350,7 +355,7 @@ class _TaskPanelFemResultShow:
)
self.result_selected("U1", res_disp_u1, "mm")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def y_displacement_selected(self, state):
@@ -360,7 +365,7 @@ class _TaskPanelFemResultShow:
)
self.result_selected("U2", res_disp_u2, "mm")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def z_displacement_selected(self, state):
@@ -370,68 +375,68 @@ class _TaskPanelFemResultShow:
)
self.result_selected("U3", res_disp_u3, "mm")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def vm_stress_selected(self, state):
if len(self.result_obj.StressValues) > 0:
self.result_selected("Sabs", self.result_obj.StressValues, "MPa")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def max_shear_selected(self, state):
if len(self.result_obj.MaxShear) > 0:
self.result_selected("MaxShear", self.result_obj.MaxShear, "MPa")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def max_prin_selected(self, state):
if len(self.result_obj.PrincipalMax) > 0:
self.result_selected("MaxPrin", self.result_obj.PrincipalMax, "MPa")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def temperature_selected(self, state):
if len(self.result_obj.Temperature) > 0:
self.result_selected("Temp", self.result_obj.Temperature, "K")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def massflowrate_selected(self, state):
if len(self.result_obj.MassFlowRate) > 0:
self.result_selected("MFlow", self.result_obj.MassFlowRate, "kg/s")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def networkpressure_selected(self, state):
if len(self.result_obj.NetworkPressure) > 0:
self.result_selected("NPress", self.result_obj.NetworkPressure, "MPa")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def min_prin_selected(self, state):
if len(self.result_obj.PrincipalMin) > 0:
self.result_selected("MinPrin", self.result_obj.PrincipalMin, "MPa")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def peeq_selected(self, state):
if len(self.result_obj.Peeq) > 0:
self.result_selected("Peeq", self.result_obj.Peeq, "")
else:
self.form[0].rb_none.setChecked(True)
self.result_widget.rb_none.setChecked(True)
self.none_selected(True)
def user_defined_text(self, equation):
FreeCAD.FEM_dialog["results_type"] = "user"
self.form[0].user_def_eq.toPlainText()
self.result_widget.user_def_eq.toPlainText()
def calculate(self):
@@ -489,7 +494,7 @@ class _TaskPanelFemResultShow:
FreeCAD.FEM_dialog["results_type"] = "None"
self.update()
self.restore_result_dialog()
userdefined_eq = self.form[0].user_def_eq.toPlainText() # Get equation to be used
userdefined_eq = self.result_widget.user_def_eq.toPlainText() # Get equation to be used
UserDefinedFormula = eval(userdefined_eq).tolist()
if UserDefinedFormula:
self.result_obj.UserDefined = UserDefinedFormula
@@ -527,17 +532,17 @@ class _TaskPanelFemResultShow:
QtGui.QApplication.restoreOverrideCursor()
def set_result_stats(self, unit, minm, avg, maxm):
self.form[0].le_min.setProperty("unit", unit)
self.form[0].le_min.setProperty("rawText", "{:.6} {}".format(minm, unit))
self.form[0].le_avg.setProperty("unit", unit)
self.form[0].le_avg.setProperty("rawText", "{:.6} {}".format(avg, unit))
self.form[0].le_max.setProperty("unit", unit)
self.form[0].le_max.setProperty("rawText", "{:.6} {}".format(maxm, unit))
self.result_widget.le_min.setProperty("unit", unit)
self.result_widget.le_min.setProperty("rawText", "{:.6} {}".format(minm, unit))
self.result_widget.le_avg.setProperty("unit", unit)
self.result_widget.le_avg.setProperty("rawText", "{:.6} {}".format(avg, unit))
self.result_widget.le_max.setProperty("unit", unit)
self.result_widget.le_max.setProperty("rawText", "{:.6} {}".format(maxm, unit))
def update_displacement(self, factor=None):
if factor is None:
if FreeCAD.FEM_dialog["show_disp"]:
factor = self.form[0].sb_displacement_factor.value()
factor = self.result_widget.sb_displacement_factor.value()
else:
factor = 0.0
self.mesh_obj.ViewObject.applyDisplacement(factor)
@@ -558,31 +563,33 @@ class _TaskPanelFemResultShow:
QtGui.QApplication.restoreOverrideCursor()
def hsb_disp_factor_changed(self, value):
self.form[0].sb_displacement_factor.setValue(
value / 100. * self.form[0].sb_displacement_factor_max.value()
self.result_widget.sb_displacement_factor.setValue(
value / 100. * self.result_widget.sb_displacement_factor_max.value()
)
self.update_displacement()
def sb_disp_factor_max_changed(self, value):
FreeCAD.FEM_dialog["disp_factor_max"] = value
if value < self.form[0].sb_displacement_factor.value():
self.form[0].sb_displacement_factor.setValue(value)
if value < self.result_widget.sb_displacement_factor.value():
self.result_widget.sb_displacement_factor.setValue(value)
if value == 0.:
self.form[0].hsb_displacement_factor.setValue(0)
self.result_widget.hsb_displacement_factor.setValue(0)
else:
self.form[0].hsb_displacement_factor.setValue(
round(self.form[0].sb_displacement_factor.value() / value * 100.)
self.result_widget.hsb_displacement_factor.setValue(
round(self.result_widget.sb_displacement_factor.value() / value * 100.)
)
def sb_disp_factor_changed(self, value):
FreeCAD.FEM_dialog["disp_factor"] = value
if value > self.form[0].sb_displacement_factor_max.value():
self.form[0].sb_displacement_factor.setValue(self.form[0].sb_displacement_factor_max.value())
if self.form[0].sb_displacement_factor_max.value() == 0.:
self.form[0].hsb_displacement_factor.setValue(0.)
if value > self.result_widget.sb_displacement_factor_max.value():
self.result_widget.sb_displacement_factor.setValue(
self.result_widget.sb_displacement_factor_max.value()
)
if self.result_widget.sb_displacement_factor_max.value() == 0.:
self.result_widget.hsb_displacement_factor.setValue(0.)
else:
self.form[0].hsb_displacement_factor.setValue(
round(value / self.form[0].sb_displacement_factor_max.value() * 100.)
self.result_widget.hsb_displacement_factor.setValue(
round(value / self.result_widget.sb_displacement_factor_max.value() * 100.)
)
def disable_empty_result_buttons(self):
@@ -599,27 +606,27 @@ class _TaskPanelFemResultShow:
NetworkPressure --> rb_networkpressure
Peeq --> rb_peeq"""
if len(self.result_obj.DisplacementLengths) == 0:
self.form[0].rb_abs_displacement.setEnabled(0)
self.result_widget.rb_abs_displacement.setEnabled(0)
if len(self.result_obj.DisplacementVectors) == 0:
self.form[0].rb_x_displacement.setEnabled(0)
self.form[0].rb_y_displacement.setEnabled(0)
self.form[0].rb_z_displacement.setEnabled(0)
self.result_widget.rb_x_displacement.setEnabled(0)
self.result_widget.rb_y_displacement.setEnabled(0)
self.result_widget.rb_z_displacement.setEnabled(0)
if len(self.result_obj.Temperature) == 0:
self.form[0].rb_temperature.setEnabled(0)
self.result_widget.rb_temperature.setEnabled(0)
if len(self.result_obj.StressValues) == 0:
self.form[0].rb_vm_stress.setEnabled(0)
self.result_widget.rb_vm_stress.setEnabled(0)
if len(self.result_obj.PrincipalMax) == 0:
self.form[0].rb_maxprin.setEnabled(0)
self.result_widget.rb_maxprin.setEnabled(0)
if len(self.result_obj.PrincipalMin) == 0:
self.form[0].rb_minprin.setEnabled(0)
self.result_widget.rb_minprin.setEnabled(0)
if len(self.result_obj.MaxShear) == 0:
self.form[0].rb_max_shear_stress.setEnabled(0)
self.result_widget.rb_max_shear_stress.setEnabled(0)
if len(self.result_obj.MassFlowRate) == 0:
self.form[0].rb_massflowrate.setEnabled(0)
self.result_widget.rb_massflowrate.setEnabled(0)
if len(self.result_obj.NetworkPressure) == 0:
self.form[0].rb_networkpressure.setEnabled(0)
self.result_widget.rb_networkpressure.setEnabled(0)
if len(self.result_obj.Peeq) == 0:
self.form[0].rb_peeq.setEnabled(0)
self.result_widget.rb_peeq.setEnabled(0)
def update(self):
self.reset_result_mesh()