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

FEM: mesh region, change type

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-03-10 22:21:01 +01:00
parent 9e911be570
commit c04344227d
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

@@ -220,7 +220,7 @@ class _ViewProviderFemMeshGmsh:
and dragged_object.Proxy.Type == "Fem::MeshGroup":
return True
elif hasattr(dragged_object, "Proxy") \
and dragged_object.Proxy.Type == "Fem::FemMeshRegion":
and dragged_object.Proxy.Type == "Fem::MeshRegion":
return True
else:
return False
@@ -238,7 +238,7 @@ class _ViewProviderFemMeshGmsh:
objs = self.Object.MeshGroupList
objs.remove(dragged_object)
self.Object.MeshGroupList = objs
elif hasattr(dragged_object, "Proxy") and dragged_object.Proxy.Type == "Fem::FemMeshRegion":
elif hasattr(dragged_object, "Proxy") and dragged_object.Proxy.Type == "Fem::MeshRegion":
objs = self.Object.MeshRegionList
objs.remove(dragged_object)
self.Object.MeshRegionList = objs
@@ -255,7 +255,7 @@ class _ViewProviderFemMeshGmsh:
objs.append(incoming_object)
self.Object.MeshGroupList = objs
elif hasattr(incoming_object, "Proxy") \
and incoming_object.Proxy.Type == "Fem::FemMeshRegion":
and incoming_object.Proxy.Type == "Fem::MeshRegion":
objs = self.Object.MeshRegionList
objs.append(incoming_object)
self.Object.MeshRegionList = objs

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

@@ -37,7 +37,7 @@ class _FemMeshRegion(FemConstraint.Proxy):
The FemMeshRegion object
"""
Type = "Fem::FemMeshRegion"
Type = "Fem::MeshRegion"
def __init__(self, obj):
super(_FemMeshRegion, self).__init__(obj)

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

@@ -313,7 +313,7 @@ class TestObjectType(unittest.TestCase):
type_of_obj(ObjectsFem.makeMeshGroup(doc, mesh))
)
self.assertEqual(
"Fem::FemMeshRegion",
"Fem::MeshRegion",
type_of_obj(ObjectsFem.makeMeshRegion(doc, mesh))
)
self.assertEqual(
@@ -513,7 +513,7 @@ class TestObjectType(unittest.TestCase):
))
self.assertTrue(is_of_type(
ObjectsFem.makeMeshRegion(doc, mesh),
"Fem::FemMeshRegion"
"Fem::MeshRegion"
))
self.assertTrue(is_of_type(
ObjectsFem.makeMeshNetgen(doc),
@@ -1070,7 +1070,7 @@ class TestObjectType(unittest.TestCase):
))
self.assertTrue(is_derived_from(
mesh_region,
"Fem::FemMeshRegion"
"Fem::MeshRegion"
))
# FemMeshShapeNetgenObject