FEM: python base object, rename class and module

src/Mod/Fem/CMakeLists.txt

@@ -238,6 +238,7 @@ SET(FemTools_SRCS
 
 SET(FemObjectsScripts_SRCS
     femobjects/__init__.py
+    femobjects/base_fempythonobject.py
     femobjects/constraint_bodyheatsource.py
     femobjects/constraint_electrostaticpotential.py
     femobjects/constraint_flowvelocity.py
@@ -258,7 +259,6 @@ SET(FemObjectsScripts_SRCS
     femobjects/mesh_result.py
     femobjects/result_mechanical.py
     femobjects/solver_ccxtools.py
-    femobjects/FemConstraint.py
 )
 
 SET(FemAllScripts

src/Mod/Fem/femobjects/base_fempythonobject.py

@@ -1,5 +1,6 @@
 # ***************************************************************************
 # *   Copyright (c) 2017 Markus Hovorka <m.hovorka@live.de>                 *
+# *   Copyright (c) 2020 Bernd Hahnebach <bernd@bimstatik.org>              *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *
@@ -21,18 +22,18 @@
 # *                                                                         *
 # ***************************************************************************
 
-__title__ = "FreeCAD FEM base constraint object"
-__author__ = "Markus Hovorka"
+__title__ = "FreeCAD FEM base python object"
+__author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package _BaseObject
+## @package base_fempythonobject
 #  \ingroup FEM
-#  \brief FreeCAD _Base Object for FEM workbench
+#  \brief base object for FEM Python Features
 
 
-class Proxy(object):
+class BaseFemPythonObject(object):
 
-    BaseType = "Fem::ConstraintPython"
+    BaseType = "Fem::BaseFemPythonObject"
 
     def __init__(self, obj):
         # self.Object = obj  # keep a ref to the DocObj for nonGui usage

src/Mod/Fem/femobjects/constraint_bodyheatsource.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint body heat source object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintBodyHeatSource(FemConstraint.Proxy):
+class ConstraintBodyHeatSource(base_fempythonobject.BaseFemPythonObject):
 
     Type = "Fem::ConstraintBodyHeatSource"
 

src/Mod/Fem/femobjects/constraint_electrostaticpotential.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint electrostatic potential object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintElectrostaticPotential(FemConstraint.Proxy):
+class ConstraintElectrostaticPotential(base_fempythonobject.BaseFemPythonObject):
 
     Type = "Fem::ConstraintElectrostaticPotential"
 

src/Mod/Fem/femobjects/constraint_flowvelocity.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint flow velocity object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintFlowVelocity(FemConstraint.Proxy):
+class ConstraintFlowVelocity(base_fempythonobject.BaseFemPythonObject):
 
     Type = "Fem::ConstraintFlowVelocity"
 

src/Mod/Fem/femobjects/constraint_initialflowvelocity.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint initial flow velocity object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintInitialFlowVelocity(FemConstraint.Proxy):
+class ConstraintInitialFlowVelocity(base_fempythonobject.BaseFemPythonObject):
 
     Type = "Fem::ConstraintInitialFlowVelocity"
 

src/Mod/Fem/femobjects/constraint_selfweight.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint self weight object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintSelfWeight(FemConstraint.Proxy):
+class ConstraintSelfWeight(base_fempythonobject.BaseFemPythonObject):
     """
     The ConstraintSelfWeight object"
     """

src/Mod/Fem/femobjects/constraint_tie.py

@@ -29,10 +29,10 @@ __url__ = "https://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief constraint tie object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ConstraintTie(FemConstraint.Proxy):
+class ConstraintTie(base_fempythonobject.BaseFemPythonObject):
     """
     The ConstraintTie object
     """

src/Mod/Fem/femobjects/element_fluid1D.py

@@ -31,10 +31,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief element fluid 1D object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ElementFluid1D(FemConstraint.Proxy):
+class ElementFluid1D(base_fempythonobject.BaseFemPythonObject):
     """
     The element_fluid1D object
     """

src/Mod/Fem/femobjects/element_geometry1D.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief element geometry 1D object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ElementGeometry1D(FemConstraint.Proxy):
+class ElementGeometry1D(base_fempythonobject.BaseFemPythonObject):
     """
     The ElementGeometry1D object
     """

src/Mod/Fem/femobjects/element_geometry2D.py

@@ -29,10 +29,10 @@ __url__ = "https://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief element geometry 2D object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ElementGeometry2D(FemConstraint.Proxy):
+class ElementGeometry2D(base_fempythonobject.BaseFemPythonObject):
     """
     The ElementGeometry2D object
     """

src/Mod/Fem/femobjects/element_rotation1D.py

@@ -29,10 +29,10 @@ __url__ = "https://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief element rotation 1D object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ElementRotation1D(FemConstraint.Proxy):
+class ElementRotation1D(base_fempythonobject.BaseFemPythonObject):
     """
     The ElementRotation1D object
     """

src/Mod/Fem/femobjects/material_common.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief material common object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MaterialCommon(FemConstraint.Proxy):
+class MaterialCommon(base_fempythonobject.BaseFemPythonObject):
     """
     The MaterialCommon object
     """

src/Mod/Fem/femobjects/material_mechanicalnonlinear.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief nonlinear mechanical material object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MaterialMechanicalNonlinear(FemConstraint.Proxy):
+class MaterialMechanicalNonlinear(base_fempythonobject.BaseFemPythonObject):
     """
     The MaterialMechanicalNonlinear object
     """

src/Mod/Fem/femobjects/material_reinforced.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief reinforced object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MaterialReinforced(FemConstraint.Proxy):
+class MaterialReinforced(base_fempythonobject.BaseFemPythonObject):
     """
     The MaterialReinforced object
     """

src/Mod/Fem/femobjects/mesh_boundarylayer.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mesh boundary layer object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MeshBoundaryLayer(FemConstraint.Proxy):
+class MeshBoundaryLayer(base_fempythonobject.BaseFemPythonObject):
     """
     The MeshBoundaryLayer object
     """

src/Mod/Fem/femobjects/mesh_gmsh.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mesh gmsh object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MeshGmsh(FemConstraint.Proxy):
+class MeshGmsh(base_fempythonobject.BaseFemPythonObject):
     """
     A Fem::FemMeshObject python type, add Gmsh specific properties
     """

src/Mod/Fem/femobjects/mesh_group.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mesh group object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MeshGroup(FemConstraint.Proxy):
+class MeshGroup(base_fempythonobject.BaseFemPythonObject):
     """
     The MeshGroup object
     """

src/Mod/Fem/femobjects/mesh_region.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mesh region object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MeshRegion(FemConstraint.Proxy):
+class MeshRegion(base_fempythonobject.BaseFemPythonObject):
     """
     The FemMeshRegion object
     """

src/Mod/Fem/femobjects/mesh_result.py

@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mesh result object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class MeshResult(FemConstraint.Proxy):
+class MeshResult(base_fempythonobject.BaseFemPythonObject):
     """
     The Fem::FemMeshObject's Proxy python type, add Result specific object type
     """

src/Mod/Fem/femobjects/result_mechanical.py

@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief mechanical result object
 
-from . import FemConstraint
+from . import base_fempythonobject
 
 
-class ResultMechanical(FemConstraint.Proxy):
+class ResultMechanical(base_fempythonobject.BaseFemPythonObject):
     """
     The Fem::ResultMechanical's Proxy python type, add result specific properties
     """

src/Mod/Fem/femobjects/solver_ccxtools.py

@@ -31,11 +31,11 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 
-from . import FemConstraint
+from . import base_fempythonobject
 from femsolver.calculix.solver import add_attributes
 
 
-class SolverCcxTools(FemConstraint.Proxy):
+class SolverCcxTools(base_fempythonobject.BaseFemPythonObject):
     """The Fem::FemSolver's Proxy python type, add solver specific properties
     """
 

src/Mod/Fem/femtools/migrate_app.py

@@ -361,8 +361,8 @@ class FemMigrateApp(object):
                 import femviewprovider.view_element_geometry2D
                 module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D
         if module.__name__ == "MechanicalAnalysis":
-            import femobjects.FemConstraint
-            module._FemAnalysis = femobjects.FemConstraint.Proxy
+            import femobjects.base_fempythonobject
+            module._FemAnalysis = femobjects.base_fempythonobject.BaseFemPythonObject
             if FreeCAD.GuiUp:
                 import femguiobjects.ViewProviderBaseObject
                 module._ViewProviderFemAnalysis = femguiobjects.ViewProviderBaseObject.ViewProxy