From 47f16467db4eff63324ca0164cf7e9ced384e8da Mon Sep 17 00:00:00 2001 From: UR-0 Date: Thu, 13 Feb 2020 10:19:13 +0100 Subject: [PATCH] FEM: use a more precise object name "vonMises" instead "StressValues" --- src/Mod/Fem/App/FemVTKTools.cpp | 2 +- src/Mod/Fem/Gui/Resources/ui/ResultHints.ui | 2 +- .../_ViewProviderFemResultMechanical.py | 12 ++++++------ src/Mod/Fem/feminout/importCcxFrdResults.py | 2 +- src/Mod/Fem/femobjects/_FemResultMechanical.py | 2 +- src/Mod/Fem/femresult/resulttools.py | 14 +++++++------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index a6a513ea71..50e62ff451 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -694,7 +694,7 @@ std::map _getFreeCADMechResultScalarProperties() { // resFCScalProp["PrincipalMax"] = "Major Principal Stress"; // can be plotted in Paraview as THE MAJOR PRINCIPAL STRESS MAGNITUDE // resFCScalProp["PrincipalMed"] = "Intermediate Principal Stress"; // can be plotted in Paraview as THE INTERMEDIATE PRINCIPAL STRESS MAGNITUDE // resFCScalProp["PrincipalMin"] = "Minor Principal Stress"; // can be plotted in Paraview as THE MINOR PRINCIPAL STRESS MAGNITUDE - resFCScalProp["StressValues"] = "von Mises Stress"; + resFCScalProp["vonMises"] = "von Mises Stress"; resFCScalProp["Temperature"] = "Temperature"; resFCScalProp["MohrCoulomb"] = "MohrCoulomb"; resFCScalProp["ReinforcementRatio_x"] = "ReinforcementRatio_x"; diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui index 724369c9ed..a4ad8b6f00 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui @@ -90,7 +90,7 @@ - von Mises stress: Von + von Mises stress: vM Qt::TextSelectableByMouse diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py index 3eb71f5bff..eac549e9a6 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py @@ -379,8 +379,8 @@ class _TaskPanelFemResultShow: 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") + if len(self.result_obj.vonMises) > 0: + self.result_selected("Sabs", self.result_obj.vonMises, "MPa") else: self.result_widget.rb_none.setChecked(True) self.none_selected(True) @@ -445,7 +445,7 @@ class _TaskPanelFemResultShow: P1 = np.array(self.result_obj.PrincipalMax) P2 = np.array(self.result_obj.PrincipalMed) P3 = np.array(self.result_obj.PrincipalMin) - Von = np.array(self.result_obj.StressValues) + vM = np.array(self.result_obj.vonMises) Peeq = np.array(self.result_obj.Peeq) T = np.array(self.result_obj.Temperature) MF = np.array(self.result_obj.MassFlowRate) @@ -526,7 +526,7 @@ class _TaskPanelFemResultShow: self.update_colors_stats(UserDefinedFormula, "", minm, avg, maxm) # Dummy use of the variables to get around flake8 error - del x, y, z, T, Von, Peeq, P1, P2, P3 + del x, y, z, T, vM, Peeq, P1, P2, P3 del sxx, syy, szz, sxy, sxz, syz del exx, eyy, ezz, exy, exz, eyz del MF, NP, rx, ry, rz, mc @@ -620,7 +620,7 @@ class _TaskPanelFemResultShow: DisplacementLengths --> rb_abs_displacement DisplacementVectors --> rb_x_displacement, rb_y_displacement, rb_z_displacement Temperature --> rb_temperature - StressValues --> rb_vm_stress + vonMises --> rb_vm_stress PrincipalMax --> rb_maxprin PrincipalMin --> rb_minprin MaxShear --> rb_max_shear_stress @@ -635,7 +635,7 @@ class _TaskPanelFemResultShow: self.result_widget.rb_z_displacement.setEnabled(0) if len(self.result_obj.Temperature) == 0: self.result_widget.rb_temperature.setEnabled(0) - if len(self.result_obj.StressValues) == 0: + if len(self.result_obj.vonMises) == 0: self.result_widget.rb_vm_stress.setEnabled(0) if len(self.result_obj.PrincipalMax) == 0: self.result_widget.rb_maxprin.setEnabled(0) diff --git a/src/Mod/Fem/feminout/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py index b8f91417d3..e1311824d1 100644 --- a/src/Mod/Fem/feminout/importCcxFrdResults.py +++ b/src/Mod/Fem/feminout/importCcxFrdResults.py @@ -151,7 +151,7 @@ def importFrd( # fill DisplacementLengths res_obj = restools.add_disp_apps(res_obj) - # fill StressValues + # fill vonMises res_obj = restools.add_von_mises(res_obj) if res_obj.getParentGroup(): has_reinforced_mat = False diff --git a/src/Mod/Fem/femobjects/_FemResultMechanical.py b/src/Mod/Fem/femobjects/_FemResultMechanical.py index bbc30b612d..7406224f5a 100644 --- a/src/Mod/Fem/femobjects/_FemResultMechanical.py +++ b/src/Mod/Fem/femobjects/_FemResultMechanical.py @@ -139,7 +139,7 @@ class _FemResultMechanical(): ) obj.addProperty( "App::PropertyFloatList", - "StressValues", + "vonMises", "NodeData", "", True diff --git a/src/Mod/Fem/femresult/resulttools.py b/src/Mod/Fem/femresult/resulttools.py index 98f21421b3..050e1aebec 100644 --- a/src/Mod/Fem/femresult/resulttools.py +++ b/src/Mod/Fem/femresult/resulttools.py @@ -124,7 +124,7 @@ def show_result(resultobj, result_type="Sabs", limit=None): return if resultobj: if result_type == "Sabs": - values = resultobj.StressValues + values = resultobj.vonMises elif result_type == "Uabs": values = resultobj.DisplacementLengths # TODO: the result object does have more result types to show, implement them @@ -282,10 +282,10 @@ def fill_femresult_stats(res_obj): a_min = min(res_obj.DisplacementLengths) a_avg = sum(res_obj.DisplacementLengths) / no_of_values a_max = max(res_obj.DisplacementLengths) - if res_obj.StressValues: - s_min = min(res_obj.StressValues) - s_avg = sum(res_obj.StressValues) / no_of_values - s_max = max(res_obj.StressValues) + if res_obj.vonMises: + s_min = min(res_obj.vonMises) + s_avg = sum(res_obj.vonMises) / no_of_values + s_max = max(res_obj.vonMises) if res_obj.PrincipalMax: p1_min = min(res_obj.PrincipalMax) p1_avg = sum(res_obj.PrincipalMax) / no_of_values @@ -382,8 +382,8 @@ def add_von_mises(res_obj): ) for Sxx, Syy, Szz, Sxy, Sxz, Syz in iterator: mstress.append(calculate_von_mises((Sxx, Syy, Szz, Sxy, Sxz, Syz))) - res_obj.StressValues = mstress - FreeCAD.Console.PrintLog("Added StressValues (von Mises).\n") + res_obj.vonMises = mstress + FreeCAD.Console.PrintLog("Added von Mises stress.\n") return res_obj