From d230895c9f9a8efd0d0535da28d6bc09a2aa1400 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 10 Mar 2020 22:19:14 +0100 Subject: [PATCH] FEM: mesh boundary layer, change type --- src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py | 6 +++--- src/Mod/Fem/femobjects/_FemMeshBoundaryLayer.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 04dd6af4b4..011f95ef4a 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py @@ -214,7 +214,7 @@ class _ViewProviderFemMeshGmsh: def canDragObject(self, dragged_object): if hasattr(dragged_object, "Proxy") \ - and dragged_object.Proxy.Type == "Fem::FemMeshBoundaryLayer": + and dragged_object.Proxy.Type == "Fem::MeshBoundaryLayer": return True elif hasattr(dragged_object, "Proxy") \ and dragged_object.Proxy.Type == "Fem::FemMeshGroup": @@ -230,7 +230,7 @@ class _ViewProviderFemMeshGmsh: def dragObject(self, selfvp, dragged_object): if hasattr(dragged_object, "Proxy") \ - and dragged_object.Proxy.Type == "Fem::FemMeshBoundaryLayer": + and dragged_object.Proxy.Type == "Fem::MeshBoundaryLayer": objs = self.Object.MeshBoundaryLayerList objs.remove(dragged_object) self.Object.MeshBoundaryLayerList = objs @@ -245,7 +245,7 @@ class _ViewProviderFemMeshGmsh: def dropObject(self, selfvp, incoming_object): if hasattr(incoming_object, "Proxy") \ - and incoming_object.Proxy.Type == "Fem::FemMeshBoundaryLayer": + and incoming_object.Proxy.Type == "Fem::MeshBoundaryLayer": objs = self.Object.MeshBoundaryLayerList objs.append(incoming_object) self.Object.MeshBoundaryLayerList = objs diff --git a/src/Mod/Fem/femobjects/_FemMeshBoundaryLayer.py b/src/Mod/Fem/femobjects/_FemMeshBoundaryLayer.py index b0116342b9..82b7430cb4 100644 --- a/src/Mod/Fem/femobjects/_FemMeshBoundaryLayer.py +++ b/src/Mod/Fem/femobjects/_FemMeshBoundaryLayer.py @@ -37,7 +37,7 @@ class _FemMeshBoundaryLayer(FemConstraint.Proxy): The FemMeshBoundaryLayer object """ - Type = "Fem::FemMeshBoundaryLayer" + Type = "Fem::MeshBoundaryLayer" def __init__(self, obj): super(_FemMeshBoundaryLayer, self).__init__(obj) diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py index 841eb2ba6e..27c2967302 100644 --- a/src/Mod/Fem/femtest/app/test_object.py +++ b/src/Mod/Fem/femtest/app/test_object.py @@ -305,7 +305,7 @@ class TestObjectType(unittest.TestCase): "Fem::FemMeshGmsh", type_of_obj(mesh)) self.assertEqual( - "Fem::FemMeshBoundaryLayer", + "Fem::MeshBoundaryLayer", type_of_obj(ObjectsFem.makeMeshBoundaryLayer(doc, mesh)) ) self.assertEqual( @@ -505,7 +505,7 @@ class TestObjectType(unittest.TestCase): )) self.assertTrue(is_of_type( ObjectsFem.makeMeshBoundaryLayer(doc, mesh), - "Fem::FemMeshBoundaryLayer" + "Fem::MeshBoundaryLayer" )) self.assertTrue(is_of_type( ObjectsFem.makeMeshGroup(doc, mesh), @@ -1040,7 +1040,7 @@ class TestObjectType(unittest.TestCase): )) self.assertTrue(is_derived_from( mesh_boundarylayer, - "Fem::FemMeshBoundaryLayer" + "Fem::MeshBoundaryLayer" )) # FemMeshGroup