From 3ff9d36e92524323f81a5ef4c7e9ae5c27ea4faa Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 22 Mar 2020 11:25:16 +0100 Subject: [PATCH] FEM: result mechanical, change obj type --- src/Mod/Fem/femobjects/_FemResultMechanical.py | 2 +- src/Mod/Fem/femresult/resulttools.py | 14 +++++++------- src/Mod/Fem/femtest/app/test_object.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mod/Fem/femobjects/_FemResultMechanical.py b/src/Mod/Fem/femobjects/_FemResultMechanical.py index a7feda9834..1e84e045ee 100644 --- a/src/Mod/Fem/femobjects/_FemResultMechanical.py +++ b/src/Mod/Fem/femobjects/_FemResultMechanical.py @@ -38,7 +38,7 @@ class _FemResultMechanical(FemConstraint.Proxy): The Fem::_FemResultMechanical's Proxy python type, add result specific properties """ - Type = "Fem::FemResultMechanical" + Type = "Fem::ResultMechanical" def __init__(self, obj): super(_FemResultMechanical, self).__init__(obj) diff --git a/src/Mod/Fem/femresult/resulttools.py b/src/Mod/Fem/femresult/resulttools.py index e0a9671e73..5c31460b70 100644 --- a/src/Mod/Fem/femresult/resulttools.py +++ b/src/Mod/Fem/femresult/resulttools.py @@ -64,7 +64,7 @@ def reset_mesh_deformation(resultobj): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object """ @@ -78,7 +78,7 @@ def reset_mesh_color(resultobj): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object """ @@ -106,7 +106,7 @@ def show_result(resultobj, result_type="Sabs", limit=None): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object result_type : str, optional default is Sabs @@ -142,7 +142,7 @@ def show_color_by_scalar_with_cutoff(resultobj, values, limit=None): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object values : list of floats the values to be colored and cutoff @@ -175,7 +175,7 @@ def get_stats(res_obj, result_type): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object result_type : str type of FEM result @@ -227,7 +227,7 @@ def get_all_stats(res_obj): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object @@ -257,7 +257,7 @@ def fill_femresult_stats(res_obj): Parameters ---------- - resultobj : Fem::FemResultMechanical + resultobj : Fem::ResultMechanical FreeCAD FEM mechanical result object """ diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py index 14d4bc32f5..7933c9d89f 100644 --- a/src/Mod/Fem/femtest/app/test_object.py +++ b/src/Mod/Fem/femtest/app/test_object.py @@ -318,7 +318,7 @@ class TestObjectType(unittest.TestCase): type_of_obj(ObjectsFem.makeMeshResult(doc)) ) self.assertEqual( - "Fem::FemResultMechanical", + "Fem::ResultMechanical", type_of_obj(ObjectsFem.makeResultMechanical(doc)) ) solverelmer = ObjectsFem.makeSolverElmer(doc) @@ -518,7 +518,7 @@ class TestObjectType(unittest.TestCase): )) self.assertTrue(is_of_type( ObjectsFem.makeResultMechanical(doc), - "Fem::FemResultMechanical" + "Fem::ResultMechanical" )) solverelmer = ObjectsFem.makeSolverElmer(doc) self.assertTrue(is_of_type( @@ -1104,7 +1104,7 @@ class TestObjectType(unittest.TestCase): )) self.assertTrue(is_derived_from( result_mechanical, - "Fem::FemResultMechanical" + "Fem::ResultMechanical" )) # FemSolverCalculixCcxTools