From d953828d308ec3609d67a56b0bc08d0c0c1ea0ae Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Sun, 22 Mar 2020 11:25:16 +0100
Subject: [PATCH] FEM: result mesh, change obj type

---
 src/Mod/Fem/femcommands/manager.py       | 2 +-
 src/Mod/Fem/femobjects/_FemMeshResult.py | 2 +-
 src/Mod/Fem/femresult/resulttools.py     | 4 ++--
 src/Mod/Fem/femsolver/calculix/tasks.py  | 2 +-
 src/Mod/Fem/femsolver/z88/tasks.py       | 2 +-
 src/Mod/Fem/femtest/app/test_object.py   | 6 +++---
 src/Mod/Fem/femtools/membertools.py      | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Mod/Fem/femcommands/manager.py b/src/Mod/Fem/femcommands/manager.py
index 83fd628f3e..d04df7f88f 100644
--- a/src/Mod/Fem/femcommands/manager.py
+++ b/src/Mod/Fem/femcommands/manager.py
@@ -166,7 +166,7 @@ class CommandManager(object):
         result_mesh = False
         analysis_members = FemGui.getActiveAnalysis().Group
         for o in analysis_members:
-            if is_of_type(o, "Fem::FemMeshResult"):
+            if is_of_type(o, "Fem::MeshResult"):
                 result_mesh = True
         return result_mesh
 
diff --git a/src/Mod/Fem/femobjects/_FemMeshResult.py b/src/Mod/Fem/femobjects/_FemMeshResult.py
index c2b15a38dc..3f8581af99 100644
--- a/src/Mod/Fem/femobjects/_FemMeshResult.py
+++ b/src/Mod/Fem/femobjects/_FemMeshResult.py
@@ -37,7 +37,7 @@ class _FemMeshResult(FemConstraint.Proxy):
     The Fem::FemMeshObject's Proxy python type, add Result specific object type
     """
 
-    Type = "Fem::FemMeshResult"
+    Type = "Fem::MeshResult"
 
     def __init__(self, obj):
         super(_FemMeshResult, self).__init__(obj)
diff --git a/src/Mod/Fem/femresult/resulttools.py b/src/Mod/Fem/femresult/resulttools.py
index e97c8b6510..e0a9671e73 100644
--- a/src/Mod/Fem/femresult/resulttools.py
+++ b/src/Mod/Fem/femresult/resulttools.py
@@ -45,7 +45,7 @@ def purge_results(analysis):
 
     for m in analysis.Group:
         if m.isDerivedFrom("Fem::FemResultObject"):
-            if m.Mesh and is_of_type(m.Mesh, "Fem::FemMeshResult"):
+            if m.Mesh and is_of_type(m.Mesh, "Fem::MeshResult"):
                 analysis.Document.removeObject(m.Mesh.Name)
             analysis.Document.removeObject(m.Name)
     analysis.Document.recompute()
@@ -54,7 +54,7 @@ def purge_results(analysis):
     # we could run into trouble in one loop because
     # we will delete objects and try to access them later
     for m in analysis.Group:
-        if is_of_type(m, "Fem::FemMeshResult"):
+        if is_of_type(m, "Fem::MeshResult"):
             analysis.Document.removeObject(m.Name)
     analysis.Document.recompute()
 
diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py
index 6c2223e5e5..e82e39289a 100644
--- a/src/Mod/Fem/femsolver/calculix/tasks.py
+++ b/src/Mod/Fem/femsolver/calculix/tasks.py
@@ -115,7 +115,7 @@ class Results(run.Results):
 
     def purge_results(self):
         for m in membertools.get_member(self.analysis, "Fem::FemResultObject"):
-            if femutils.is_of_type(m.Mesh, "Fem::FemMeshResult"):
+            if femutils.is_of_type(m.Mesh, "Fem::MeshResult"):
                 self.analysis.Document.removeObject(m.Mesh.Name)
             self.analysis.Document.removeObject(m.Name)
         self.analysis.Document.recompute()
diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py
index 0f62aded49..b90855085d 100644
--- a/src/Mod/Fem/femsolver/z88/tasks.py
+++ b/src/Mod/Fem/femsolver/z88/tasks.py
@@ -116,7 +116,7 @@ class Results(run.Results):
 
     def purge_results(self):
         for m in membertools.get_member(self.analysis, "Fem::FemResultObject"):
-            if femutils.is_of_type(m.Mesh, "Fem::FemMeshResult"):
+            if femutils.is_of_type(m.Mesh, "Fem::MeshResult"):
                 self.analysis.Document.removeObject(m.Mesh.Name)
             self.analysis.Document.removeObject(m.Name)
         self.analysis.Document.recompute()
diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py
index 0f2f608529..14d4bc32f5 100644
--- a/src/Mod/Fem/femtest/app/test_object.py
+++ b/src/Mod/Fem/femtest/app/test_object.py
@@ -314,7 +314,7 @@ class TestObjectType(unittest.TestCase):
             type_of_obj(ObjectsFem.makeMeshNetgen(doc))
         )
         self.assertEqual(
-            "Fem::FemMeshResult",
+            "Fem::MeshResult",
             type_of_obj(ObjectsFem.makeMeshResult(doc))
         )
         self.assertEqual(
@@ -514,7 +514,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeMeshResult(doc),
-            "Fem::FemMeshResult"
+            "Fem::MeshResult"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeResultMechanical(doc),
@@ -1089,7 +1089,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_derived_from(
             mesh_result,
-            "Fem::FemMeshResult"
+            "Fem::MeshResult"
         ))
 
         # FemResultMechanical
diff --git a/src/Mod/Fem/femtools/membertools.py b/src/Mod/Fem/femtools/membertools.py
index 40a0138304..9309ad906a 100644
--- a/src/Mod/Fem/femtools/membertools.py
+++ b/src/Mod/Fem/femtools/membertools.py
@@ -142,7 +142,7 @@ def get_mesh_to_solve(analysis):
         if (
             m.isDerivedFrom("Fem::FemMeshObject")
             # the next line should not be needed as the result mesh is not a analysis member
-            and not femutils.is_of_type(m, "Fem::FemMeshResult")
+            and not femutils.is_of_type(m, "Fem::MeshResult")
         ):
             if not mesh_to_solve:
                 mesh_to_solve = m