FEM: mesh group, rename class and module

src/Mod/Fem/CMakeLists.txt

@@ -253,7 +253,7 @@ SET(FemObjectsScripts_SRCS
     femobjects/material_reinforced.py
     femobjects/mesh_boundarylayer.py
     femobjects/mesh_gmsh.py
-    femobjects/_FemMeshGroup.py
+    femobjects/mesh_group.py
     femobjects/_FemMeshRegion.py
     femobjects/_FemMeshResult.py
     femobjects/_FemResultMechanical.py
@@ -335,12 +335,12 @@ SET(FemGuiViewObjects_SRCS
     femviewprovider/view_material_reinforced.py
     femviewprovider/view_mesh_boundarylayer.py
     femviewprovider/view_mesh_gmsh.py
+    femviewprovider/view_mesh_group.py
 )
 
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
     femguiobjects/_ViewProviderFemMaterial.py
-    femguiobjects/_ViewProviderFemMeshGroup.py
     femguiobjects/_ViewProviderFemMeshRegion.py
     femguiobjects/_ViewProviderFemMeshResult.py
     femguiobjects/_ViewProviderFemResultMechanical.py

src/Mod/Fem/ObjectsFem.py

@@ -474,8 +474,8 @@ def makeMeshGroup(
     """makeMeshGroup(document, base_mesh, [use_label], [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 _FemMeshGroup
-    _FemMeshGroup._FemMeshGroup(obj)
+    from femobjects import mesh_group
+    mesh_group.MeshGroup(obj)
     obj.UseLabel = use_label
     # obj.BaseMesh = base_mesh
     # App::PropertyLinkList does not support append
@@ -484,8 +484,8 @@ def makeMeshGroup(
     tmplist.append(obj)
     base_mesh.MeshGroupList = tmplist
     if FreeCAD.GuiUp:
-        from femguiobjects import _ViewProviderFemMeshGroup
-        _ViewProviderFemMeshGroup._ViewProviderFemMeshGroup(obj.ViewObject)
+        from femviewprovider import view_mesh_group
+        view_mesh_group.VPMeshGroup(obj.ViewObject)
     return obj
 
 

src/Mod/Fem/femobjects/mesh_group.py

@@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM mesh group document object"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package FemMeshGroup
+## @package mesh_group
 #  \ingroup FEM
-#  \brief FreeCAD FEM _FemMeshGroup
+#  \brief mesh group object
 
 from . import FemConstraint
 
 
-class _FemMeshGroup(FemConstraint.Proxy):
+class MeshGroup(FemConstraint.Proxy):
     """
-    The FemMeshGroup object
+    The MeshGroup object
     """
 
     Type = "Fem::MeshGroup"
 
     def __init__(self, obj):
-        super(_FemMeshGroup, self).__init__(obj)
+        super(MeshGroup, self).__init__(obj)
 
         obj.addProperty(
             "App::PropertyBool",

src/Mod/Fem/femtools/migrate_app.py

@@ -67,6 +67,8 @@ class FemMigrateApp(object):
             return self
         if fullname == "femobjects._FemMeshGmsh":
             return self
+        if fullname == "femobjects._FemMeshGroup":
+            return self
 
         if fullname == "PyObjects":
             return self
@@ -206,6 +208,9 @@ class FemMigrateApp(object):
         if module.__name__ == "femobjects._FemMeshGmsh":
             import femobjects.mesh_gmsh
             module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh
+        if module.__name__ == "femobjects._FemMeshGroup":
+            import femobjects.mesh_group
+            module._FemMeshGroup = femobjects.mesh_group.MeshGroup
 
         if module.__name__ == "PyObjects":
             module.__path__ = "PyObjects"
@@ -249,8 +254,8 @@ class FemMigrateApp(object):
             import femobjects.mesh_gmsh
             module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh
         if module.__name__ == "PyObjects._FemMeshGroup":
-            import femobjects._FemMeshGroup
-            module._FemMeshGroup = femobjects._FemMeshGroup._FemMeshGroup
+            import femobjects.mesh_group
+            module._FemMeshGroup = femobjects.mesh_group.MeshGroup
         if module.__name__ == "PyObjects._FemMeshRegion":
             import femobjects._FemMeshRegion
             module._FemMeshRegion = femobjects._FemMeshRegion._FemMeshRegion
@@ -290,8 +295,8 @@ class FemMigrateApp(object):
             import femobjects.mesh_gmsh
             module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh
         if module.__name__ == "_FemMeshGroup":
-            import femobjects._FemMeshGroup
-            module._FemMeshGroup = femobjects._FemMeshGroup._FemMeshGroup
+            import femobjects.mesh_group
+            module._FemMeshGroup = femobjects.mesh_group.MeshGroup
         if module.__name__ == "_FemMeshRegion":
             import femobjects._FemMeshRegion
             module._FemMeshRegion = femobjects._FemMeshRegion._FemMeshRegion
@@ -366,6 +371,7 @@ module="femobjects._FemMaterialMechanicalNonlinear"
 module="femobjects._FemMaterialReinforced"
 module="femobjects._FemMeshBoundaryLayer"
 module="femobjects._FemMeshGmsh"
+module="femobjects._FemMeshGroup"
 
 third big moving
 from PyObjects to femobjects, following the parent commit

src/Mod/Fem/femtools/migrate_gui.py

@@ -65,6 +65,8 @@ class FemMigrateGui(object):
             return self
         if fullname == "femguiobjects._ViewProviderFemMeshGmsh":
             return self
+        if fullname == "femguiobjects._ViewProviderFemMeshGroup":
+            return self
 
         if fullname == "PyGui":
             return self
@@ -194,6 +196,9 @@ class FemMigrateGui(object):
         if module.__name__ == "femguiobjects._ViewProviderFemMeshGmsh":
             import femviewprovider.view_mesh_gmsh
             module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh
+        if module.__name__ == "femguiobjects._ViewProviderFemMeshGroup":
+            import femviewprovider.view_mesh_group
+            module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup
 
         if module.__name__ == "PyGui":
             module.__path__ = "PyGui"
@@ -237,8 +242,8 @@ class FemMigrateGui(object):
             import femviewprovider.view_mesh_gmsh
             module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh
         if module.__name__ == "PyGui._ViewProviderFemMeshGroup":
-            import femguiobjects._ViewProviderFemMeshGroup
-            module._ViewProviderFemMeshGroup = femguiobjects._ViewProviderFemMeshGroup._ViewProviderFemMeshGroup
+            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
@@ -278,8 +283,8 @@ class FemMigrateGui(object):
             import femviewprovider.view_mesh_gmsh
             module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh
         if module.__name__ == "_ViewProviderFemMeshGroup":
-            import femguiobjects._ViewProviderFemMeshGroup
-            module._ViewProviderFemMeshGroup = femguiobjects._ViewProviderFemMeshGroup._ViewProviderFemMeshGroup
+            import femviewprovider.view_mesh_group
+            module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup
         if module.__name__ == "_ViewProviderFemMeshRegion":
             import femguiobjects._ViewProviderFemMeshRegion
             module._ViewProviderFemMeshRegion = femguiobjects._ViewProviderFemMeshRegion._ViewProviderFemMeshRegion
@@ -330,6 +335,7 @@ module="femguiobjects._ViewProviderFemMaterialMechanicalNonlinear"
 module="femguiobjects._ViewProviderFemMaterialReinforced"
 module="femguiobjects._ViewProviderFemMeshBoundaryLayer"
 module="femguiobjects._ViewProviderFemMeshGmsh"
+module="femguiobjects._ViewProviderFemMeshGroup"
 
 third big moving
 from PyGui to femguiobjects, following the parent commit

src/Mod/Fem/femviewprovider/view_mesh_group.py

@@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM mesh group ViewProvider for the document object"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package ViewProviderFemMeshGroup
+## @package view_mesh_group
 #  \ingroup FEM
-#  \brief FreeCAD FEM _ViewProviderFemMeshGroup
+#  \brief view provider for mesh group object
 
 from PySide import QtCore
 
@@ -35,12 +35,12 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from . import ViewProviderFemConstraint
+from femguiobjects import ViewProviderFemConstraint
 
 
-class _ViewProviderFemMeshGroup(ViewProviderFemConstraint.ViewProxy):
+class VPMeshGroup(ViewProviderFemConstraint.ViewProxy):
     """
-    A View Provider for the FemMeshGroup object
+    A View Provider for the MeshGroup object
     """
 
     def setEdit(self, vobj, mode=0):
@@ -54,7 +54,7 @@ class _ViewProviderFemMeshGroup(ViewProviderFemConstraint.ViewProxy):
 
 class _TaskPanel:
     """
-    The TaskPanel for editing References property of FemMeshGroup objects
+    The TaskPanel for editing References property of MeshGroup objects
     """
 
     def __init__(self, obj):