FEM: material reinforced, rename class and module

src/Mod/Fem/CMakeLists.txt

@@ -250,7 +250,7 @@ SET(FemObjectsScripts_SRCS
     femobjects/element_rotation1D.py
     femobjects/_FemMaterial.py
     femobjects/material_mechanicalnonlinear.py
-    femobjects/_FemMaterialReinforced.py
+    femobjects/material_reinforced.py
     femobjects/_FemMeshBoundaryLayer.py
     femobjects/_FemMeshGmsh.py
     femobjects/_FemMeshGroup.py
@@ -332,12 +332,12 @@ SET(FemGuiViewObjects_SRCS
     femviewprovider/view_element_geometry2D.py
     femviewprovider/view_element_rotation1D.py
     femviewprovider/view_material_mechanicalnonlinear.py
+    femviewprovider/view_material_reinforced.py
 )
 
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
     femguiobjects/_ViewProviderFemMaterial.py
-    femguiobjects/_ViewProviderFemMaterialReinforced.py
     femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
     femguiobjects/_ViewProviderFemMeshGmsh.py
     femguiobjects/_ViewProviderFemMeshGroup.py

src/Mod/Fem/ObjectsFem.py

@@ -403,11 +403,11 @@ def makeMaterialReinforced(
     """makeMaterialReinforced(document, [matrix_material], [reinforcement_material], [name]):
     creates a reinforced material object"""
     obj = doc.addObject("App::MaterialObjectPython", name)
-    from femobjects import _FemMaterialReinforced
-    _FemMaterialReinforced._FemMaterialReinforced(obj)
+    from femobjects import material_reinforced
+    material_reinforced.MaterialReinforced(obj)
     if FreeCAD.GuiUp:
-        from femguiobjects import _ViewProviderFemMaterialReinforced
-        _ViewProviderFemMaterialReinforced._ViewProviderFemMaterialReinforced(obj.ViewObject)
+        from femviewprovider import view_material_reinforced
+        view_material_reinforced.VPMaterialReinforced(obj.ViewObject)
     return obj
 
 

src/Mod/Fem/femobjects/material_reinforced.py

@@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM reinforced material"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package FemMaterialReinforced
+## @package material_reinforced
 #  \ingroup FEM
-#  \brief FreeCAD FEM _FemMaterialReinforced
+#  \brief reinforced object
 
 from . import FemConstraint
 
 
-class _FemMaterialReinforced(FemConstraint.Proxy):
+class MaterialReinforced(FemConstraint.Proxy):
     """
-    The FemMaterialReinforced object
+    The MaterialReinforced object
     """
 
     Type = "Fem::MaterialReinforced"
 
     def __init__(self, obj):
-        super(_FemMaterialReinforced, self).__init__(obj)
+        super(MaterialReinforced, self).__init__(obj)
 
         obj.addProperty(
             "App::PropertyLinkSubList",

src/Mod/Fem/femtools/migrate_app.py

@@ -61,6 +61,8 @@ class FemMigrateApp(object):
             return self
         if fullname == "femobjects._FemMaterialMechanicalNonlinear":
             return self
+        if fullname == "femobjects._FemMaterialReinforced":
+            return self
 
         if fullname == "PyObjects":
             return self
@@ -191,6 +193,9 @@ class FemMigrateApp(object):
         if module.__name__ == "femobjects._FemMaterialMechanicalNonlinear":
             import femobjects.material_mechanicalnonlinear
             module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
+        if module.__name__ == "femobjects._FemMaterialReinforced":
+            import femobjects.material_reinforced
+            module._FemMaterialReinforced = femobjects.material_reinforced.MaterialReinforced
 
         if module.__name__ == "PyObjects":
             module.__path__ = "PyObjects"
@@ -348,6 +353,7 @@ module="femobjects._FemElementGeometry1D"
 module="femobjects._FemElementGeometry2D"
 module="femobjects._FemElementRotation1D"
 module="femobjects._FemMaterialMechanicalNonlinear"
+module="femobjects._FemMaterialReinforced"
 
 third big moving
 from PyObjects to femobjects, following the parent commit

src/Mod/Fem/femtools/migrate_gui.py

@@ -59,6 +59,8 @@ class FemMigrateGui(object):
             return self
         if fullname == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear":
             return self
+        if fullname == "femguiobjects._ViewProviderFemMaterialReinforced":
+            return self
 
         if fullname == "PyGui":
             return self
@@ -179,6 +181,9 @@ class FemMigrateGui(object):
         if module.__name__ == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear":
             import femviewprovider.view_material_mechanicalnonlinear
             module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
+        if module.__name__ == "femguiobjects._ViewProviderFemMaterialReinforced":
+            import femviewprovider.view_material_reinforced
+            module._ViewProviderFemMaterialReinforced = femviewprovider.view_material_reinforced.VPMaterialReinforced
 
         if module.__name__ == "PyGui":
             module.__path__ = "PyGui"
@@ -312,6 +317,7 @@ module="femguiobjects._ViewProviderFemElementGeometry1D"
 module="femguiobjects._ViewProviderFemElementGeometry2D"
 module="femguiobjects._ViewProviderFemElementRotation1D"
 module="femguiobjects._ViewProviderFemMaterialMechanicalNonlinear"
+module="femguiobjects._ViewProviderFemMaterialReinforced"
 
 third big moving
 from PyGui to femguiobjects, following the parent commit

src/Mod/Fem/femviewprovider/view_material_reinforced.py

@@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM material reinforced ViewProvider for the document objec
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package ViewProviderFemMaterialReinforced
+## @package view_material_reinforced
 #  \ingroup FEM
-#  \brief FreeCAD FEM _ViewProviderFemMaterialReinforced
+#  \brief view provider for reinforced material object
 
 import sys
 from PySide import QtCore
@@ -36,16 +36,16 @@ from PySide import QtGui
 import FreeCAD
 import FreeCADGui
 
-from . import ViewProviderFemConstraint
+from femguiobjects import ViewProviderFemConstraint
 
 
 if sys.version_info.major >= 3:
     unicode = str
 
 
-class _ViewProviderFemMaterialReinforced(ViewProviderFemConstraint.ViewProxy):
+class VPMaterialReinforced(ViewProviderFemConstraint.ViewProxy):
     """
-    A View Provider for the FemMaterialReinfocement object
+    A View Provider for the MaterialReinforced object
     """
 
     def setEdit(self, vobj, mode=0):
@@ -59,7 +59,7 @@ class _ViewProviderFemMaterialReinforced(ViewProviderFemConstraint.ViewProxy):
 
 class _TaskPanel:
     """
-    The editmode TaskPanel for FemMaterialReinforced objects
+    The editmode TaskPanel for MaterialReinforced objects
     """
 
     if sys.version_info.major >= 3: