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

FEM: mesh group, change type

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-03-10 22:20:08 +01:00
parent d230895c9f
commit 35b8d5dbb0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py
View File

@@ -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

2
src/Mod/Fem/femobjects/_FemMeshGroup.py
View File

@@ -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)

6
src/Mod/Fem/femtest/app/test_object.py
View File

@@ -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