FEM: mesh region, rename class and module

src/Mod/Fem/CMakeLists.txt

@@ -254,7 +254,7 @@ SET(FemObjectsScripts_SRCS
     femobjects/mesh_boundarylayer.py
     femobjects/mesh_gmsh.py
     femobjects/mesh_group.py
-    femobjects/_FemMeshRegion.py
+    femobjects/mesh_region.py
     femobjects/_FemMeshResult.py
     femobjects/_FemResultMechanical.py
     femobjects/_FemSolverCalculix.py
@@ -336,12 +336,12 @@ SET(FemGuiViewObjects_SRCS
     femviewprovider/view_mesh_boundarylayer.py
     femviewprovider/view_mesh_gmsh.py
     femviewprovider/view_mesh_group.py
+    femviewprovider/view_mesh_region.py
 )
 
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
     femguiobjects/_ViewProviderFemMaterial.py
-    femguiobjects/_ViewProviderFemMeshRegion.py
     femguiobjects/_ViewProviderFemMeshResult.py
     femguiobjects/_ViewProviderFemResultMechanical.py
     femguiobjects/_ViewProviderFemSolverCalculix.py

src/Mod/Fem/ObjectsFem.py

@@ -508,8 +508,8 @@ def makeMeshRegion(
     """makeMeshRegion(document, base_mesh, [element_length], [name]):
     creates a FEM mesh region object to define properties for a region of a FEM mesh"""
     obj = doc.addObject("Fem::FeaturePython", name)
-    from femobjects import _FemMeshRegion
-    _FemMeshRegion._FemMeshRegion(obj)
+    from femobjects import mesh_region
+    mesh_region.MeshRegion(obj)
     obj.CharacteristicLength = element_length
     # obj.BaseMesh = base_mesh
     # App::PropertyLinkList does not support append
@@ -518,8 +518,8 @@ def makeMeshRegion(
     tmplist.append(obj)
     base_mesh.MeshRegionList = tmplist
     if FreeCAD.GuiUp:
-        from femguiobjects import _ViewProviderFemMeshRegion
-        _ViewProviderFemMeshRegion._ViewProviderFemMeshRegion(obj.ViewObject)
+        from femviewprovider import view_mesh_region
+        view_mesh_region.VPMeshRegion(obj.ViewObject)
     return obj
 
 

src/Mod/Fem/femobjects/mesh_region.py

@@ -25,14 +25,14 @@ __title__ = "FreeCAD FEM mesh region document object"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package FemMeshRegion
+## @package mesh_region
 #  \ingroup FEM
-#  \brief FreeCAD FEM _FemMeshRegion
+#  \brief mesh region object
 
 from . import FemConstraint
 
 
-class _FemMeshRegion(FemConstraint.Proxy):
+class MeshRegion(FemConstraint.Proxy):
     """
     The FemMeshRegion object
     """
@@ -40,7 +40,7 @@ class _FemMeshRegion(FemConstraint.Proxy):
     Type = "Fem::MeshRegion"
 
     def __init__(self, obj):
-        super(_FemMeshRegion, self).__init__(obj)
+        super(MeshRegion, self).__init__(obj)
 
         obj.addProperty(
             "App::PropertyLength",

src/Mod/Fem/femtools/migrate_app.py

@@ -69,6 +69,8 @@ class FemMigrateApp(object):
             return self
         if fullname == "femobjects._FemMeshGroup":
             return self
+        if fullname == "femobjects._FemMeshRegion":
+            return self
 
         if fullname == "PyObjects":
             return self
@@ -211,6 +213,9 @@ class FemMigrateApp(object):
         if module.__name__ == "femobjects._FemMeshGroup":
             import femobjects.mesh_group
             module._FemMeshGroup = femobjects.mesh_group.MeshGroup
+        if module.__name__ == "femobjects._FemMeshRegion":
+            import femobjects.mesh_region
+            module._FemMeshRegion = femobjects.mesh_region.MeshRegion
 
         if module.__name__ == "PyObjects":
             module.__path__ = "PyObjects"
@@ -257,8 +262,8 @@ class FemMigrateApp(object):
             import femobjects.mesh_group
             module._FemMeshGroup = femobjects.mesh_group.MeshGroup
         if module.__name__ == "PyObjects._FemMeshRegion":
-            import femobjects._FemMeshRegion
-            module._FemMeshRegion = femobjects._FemMeshRegion._FemMeshRegion
+            import femobjects.mesh_region
+            module._FemMeshRegion = femobjects.mesh_region.MeshRegion
         if module.__name__ == "PyObjects._FemMeshResult":
             import femobjects._FemMeshResult
             module._FemMeshResult = femobjects._FemMeshResult._FemMeshResult
@@ -298,8 +303,8 @@ class FemMigrateApp(object):
             import femobjects.mesh_group
             module._FemMeshGroup = femobjects.mesh_group.MeshGroup
         if module.__name__ == "_FemMeshRegion":
-            import femobjects._FemMeshRegion
-            module._FemMeshRegion = femobjects._FemMeshRegion._FemMeshRegion
+            import femobjects.mesh_region
+            module._FemMeshRegion = femobjects.mesh_region.MeshRegion
         if module.__name__ == "_FemResultMechanical":
             import femobjects._FemResultMechanical
             module._FemResultMechanical = femobjects._FemResultMechanical._FemResultMechanical
@@ -372,6 +377,7 @@ module="femobjects._FemMaterialReinforced"
 module="femobjects._FemMeshBoundaryLayer"
 module="femobjects._FemMeshGmsh"
 module="femobjects._FemMeshGroup"
+module="femobjects._FemMeshRegion"
 
 third big moving
 from PyObjects to femobjects, following the parent commit

src/Mod/Fem/femtools/migrate_gui.py

@@ -67,6 +67,8 @@ class FemMigrateGui(object):
             return self
         if fullname == "femguiobjects._ViewProviderFemMeshGroup":
             return self
+        if fullname == "femguiobjects._ViewProviderFemMeshRegion":
+            return self
 
         if fullname == "PyGui":
             return self
@@ -199,6 +201,9 @@ class FemMigrateGui(object):
         if module.__name__ == "femguiobjects._ViewProviderFemMeshGroup":
             import femviewprovider.view_mesh_group
             module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup
+        if module.__name__ == "femguiobjects._ViewProviderFemMeshRegion":
+            import femviewprovider.view_mesh_region
+            module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion
 
         if module.__name__ == "PyGui":
             module.__path__ = "PyGui"
@@ -245,8 +250,8 @@ class FemMigrateGui(object):
             import femviewprovider.view_mesh_group
             module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup
         if module.__name__ == "PyGui._ViewProviderFemMeshRegion":
-            import femguiobjects._ViewProviderFemMeshRegion
-            module._ViewProviderFemMeshRegion = femguiobjects._ViewProviderFemMeshRegion._ViewProviderFemMeshRegion
+            import femviewprovider.view_mesh_region
+            module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion
         if module.__name__ == "PyGui._ViewProviderFemMeshResult":
             import femguiobjects._ViewProviderFemMeshResult
             module._ViewProviderFemMeshResult = femguiobjects._ViewProviderFemMeshResult._ViewProviderFemMeshResult
@@ -286,8 +291,8 @@ class FemMigrateGui(object):
             import femviewprovider.view_mesh_group
             module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup
         if module.__name__ == "_ViewProviderFemMeshRegion":
-            import femguiobjects._ViewProviderFemMeshRegion
-            module._ViewProviderFemMeshRegion = femguiobjects._ViewProviderFemMeshRegion._ViewProviderFemMeshRegion
+            import femviewprovider.view_mesh_region
+            module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion
         if module.__name__ == "_ViewProviderFemResultMechanical":
             import femguiobjects._ViewProviderFemResultMechanical
             module._ViewProviderFemResultMechanical = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical
@@ -336,6 +341,7 @@ module="femguiobjects._ViewProviderFemMaterialReinforced"
 module="femguiobjects._ViewProviderFemMeshBoundaryLayer"
 module="femguiobjects._ViewProviderFemMeshGmsh"
 module="femguiobjects._ViewProviderFemMeshGroup"
+module="femguiobjects._ViewProviderFemMeshRegion"
 
 third big moving
 from PyGui to femguiobjects, following the parent commit

src/Mod/Fem/femviewprovider/view_mesh_region.py

@@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM mesh region ViewProvider for the document object"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package ViewProviderFemMeshRegion
+## @package view_mesh_region
 #  \ingroup FEM
-#  \brief FreeCAD FEM _ViewProviderFemMeshRegion
+#  \brief view provider for mesh region object
 
 from PySide import QtCore
 
@@ -35,10 +35,10 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from . import ViewProviderFemConstraint
+from femguiobjects import ViewProviderFemConstraint
 
 
-class _ViewProviderFemMeshRegion(ViewProviderFemConstraint.ViewProxy):
+class VPMeshRegion(ViewProviderFemConstraint.ViewProxy):
     """
     A View Provider for the FemMeshRegion object
     """