From 35b8d5dbb032cc4417873975ccd693ea6edfe021 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Tue, 10 Mar 2020 22:20:08 +0100
Subject: [PATCH] FEM: mesh group, change type

---
 src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py | 6 +++---
 src/Mod/Fem/femobjects/_FemMeshGroup.py               | 2 +-
 src/Mod/Fem/femtest/app/test_object.py                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py
index 011f95ef4a..1ad304fa8f 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py
@@ -217,7 +217,7 @@ class _ViewProviderFemMeshGmsh:
                 and dragged_object.Proxy.Type == "Fem::MeshBoundaryLayer":
             return True
         elif hasattr(dragged_object, "Proxy") \
-                and dragged_object.Proxy.Type == "Fem::FemMeshGroup":
+                and dragged_object.Proxy.Type == "Fem::MeshGroup":
             return True
         elif hasattr(dragged_object, "Proxy") \
                 and dragged_object.Proxy.Type == "Fem::FemMeshRegion":
@@ -234,7 +234,7 @@ class _ViewProviderFemMeshGmsh:
             objs = self.Object.MeshBoundaryLayerList
             objs.remove(dragged_object)
             self.Object.MeshBoundaryLayerList = objs
-        elif hasattr(dragged_object, "Proxy") and dragged_object.Proxy.Type == "Fem::FemMeshGroup":
+        elif hasattr(dragged_object, "Proxy") and dragged_object.Proxy.Type == "Fem::MeshGroup":
             objs = self.Object.MeshGroupList
             objs.remove(dragged_object)
             self.Object.MeshGroupList = objs
@@ -250,7 +250,7 @@ class _ViewProviderFemMeshGmsh:
             objs.append(incoming_object)
             self.Object.MeshBoundaryLayerList = objs
         elif hasattr(incoming_object, "Proxy") \
-                and incoming_object.Proxy.Type == "Fem::FemMeshGroup":
+                and incoming_object.Proxy.Type == "Fem::MeshGroup":
             objs = self.Object.MeshGroupList
             objs.append(incoming_object)
             self.Object.MeshGroupList = objs
diff --git a/src/Mod/Fem/femobjects/_FemMeshGroup.py b/src/Mod/Fem/femobjects/_FemMeshGroup.py
index 683f91405b..1554102534 100644
--- a/src/Mod/Fem/femobjects/_FemMeshGroup.py
+++ b/src/Mod/Fem/femobjects/_FemMeshGroup.py
@@ -37,7 +37,7 @@ class _FemMeshGroup(FemConstraint.Proxy):
     The FemMeshGroup object
     """
 
-    Type = "Fem::FemMeshGroup"
+    Type = "Fem::MeshGroup"
 
     def __init__(self, obj):
         super(_FemMeshGroup, self).__init__(obj)
diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py
index 27c2967302..6a67096c52 100644
--- a/src/Mod/Fem/femtest/app/test_object.py
+++ b/src/Mod/Fem/femtest/app/test_object.py
@@ -309,7 +309,7 @@ class TestObjectType(unittest.TestCase):
             type_of_obj(ObjectsFem.makeMeshBoundaryLayer(doc, mesh))
         )
         self.assertEqual(
-            "Fem::FemMeshGroup",
+            "Fem::MeshGroup",
             type_of_obj(ObjectsFem.makeMeshGroup(doc, mesh))
         )
         self.assertEqual(
@@ -509,7 +509,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeMeshGroup(doc, mesh),
-            "Fem::FemMeshGroup"
+            "Fem::MeshGroup"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeMeshRegion(doc, mesh),
@@ -1055,7 +1055,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_derived_from(
             mesh_group,
-            "Fem::FemMeshGroup"
+            "Fem::MeshGroup"
         ))
 
         # FemMeshRegion