From 316891caeaf1f67f35420907f7fa44df12e4aa1a Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:08:10 +0200 Subject: [PATCH] FEM: python base object, rename class and module --- src/Mod/Fem/CMakeLists.txt | 2 +- .../{FemConstraint.py => base_fempythonobject.py} | 13 +++++++------ src/Mod/Fem/femobjects/constraint_bodyheatsource.py | 4 ++-- .../femobjects/constraint_electrostaticpotential.py | 4 ++-- src/Mod/Fem/femobjects/constraint_flowvelocity.py | 4 ++-- .../femobjects/constraint_initialflowvelocity.py | 4 ++-- src/Mod/Fem/femobjects/constraint_selfweight.py | 4 ++-- src/Mod/Fem/femobjects/constraint_tie.py | 4 ++-- src/Mod/Fem/femobjects/element_fluid1D.py | 4 ++-- src/Mod/Fem/femobjects/element_geometry1D.py | 4 ++-- src/Mod/Fem/femobjects/element_geometry2D.py | 4 ++-- src/Mod/Fem/femobjects/element_rotation1D.py | 4 ++-- src/Mod/Fem/femobjects/material_common.py | 4 ++-- .../Fem/femobjects/material_mechanicalnonlinear.py | 4 ++-- src/Mod/Fem/femobjects/material_reinforced.py | 4 ++-- src/Mod/Fem/femobjects/mesh_boundarylayer.py | 4 ++-- src/Mod/Fem/femobjects/mesh_gmsh.py | 4 ++-- src/Mod/Fem/femobjects/mesh_group.py | 4 ++-- src/Mod/Fem/femobjects/mesh_region.py | 4 ++-- src/Mod/Fem/femobjects/mesh_result.py | 4 ++-- src/Mod/Fem/femobjects/result_mechanical.py | 4 ++-- src/Mod/Fem/femobjects/solver_ccxtools.py | 4 ++-- src/Mod/Fem/femtools/migrate_app.py | 4 ++-- 23 files changed, 50 insertions(+), 49 deletions(-) rename src/Mod/Fem/femobjects/{FemConstraint.py => base_fempythonobject.py} (87%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 4e07638f19..b06fcbac50 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/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 diff --git a/src/Mod/Fem/femobjects/FemConstraint.py b/src/Mod/Fem/femobjects/base_fempythonobject.py similarity index 87% rename from src/Mod/Fem/femobjects/FemConstraint.py rename to src/Mod/Fem/femobjects/base_fempythonobject.py index dec4357aa2..bf44d729bc 100644 --- a/src/Mod/Fem/femobjects/FemConstraint.py +++ b/src/Mod/Fem/femobjects/base_fempythonobject.py @@ -1,5 +1,6 @@ # *************************************************************************** # * Copyright (c) 2017 Markus Hovorka * +# * Copyright (c) 2020 Bernd Hahnebach * # * * # * 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 diff --git a/src/Mod/Fem/femobjects/constraint_bodyheatsource.py b/src/Mod/Fem/femobjects/constraint_bodyheatsource.py index 5172222e3e..f24f0458f4 100644 --- a/src/Mod/Fem/femobjects/constraint_bodyheatsource.py +++ b/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" diff --git a/src/Mod/Fem/femobjects/constraint_electrostaticpotential.py b/src/Mod/Fem/femobjects/constraint_electrostaticpotential.py index 3a07fb4fa1..62e5c634eb 100644 --- a/src/Mod/Fem/femobjects/constraint_electrostaticpotential.py +++ b/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" diff --git a/src/Mod/Fem/femobjects/constraint_flowvelocity.py b/src/Mod/Fem/femobjects/constraint_flowvelocity.py index 3a38710bd5..5b83f4a1f9 100644 --- a/src/Mod/Fem/femobjects/constraint_flowvelocity.py +++ b/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" diff --git a/src/Mod/Fem/femobjects/constraint_initialflowvelocity.py b/src/Mod/Fem/femobjects/constraint_initialflowvelocity.py index 301250dc16..afd4ad8144 100644 --- a/src/Mod/Fem/femobjects/constraint_initialflowvelocity.py +++ b/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" diff --git a/src/Mod/Fem/femobjects/constraint_selfweight.py b/src/Mod/Fem/femobjects/constraint_selfweight.py index 933cf243e3..f74afcfe91 100644 --- a/src/Mod/Fem/femobjects/constraint_selfweight.py +++ b/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" """ diff --git a/src/Mod/Fem/femobjects/constraint_tie.py b/src/Mod/Fem/femobjects/constraint_tie.py index 99736f9bcf..8551a8b58d 100644 --- a/src/Mod/Fem/femobjects/constraint_tie.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/element_fluid1D.py b/src/Mod/Fem/femobjects/element_fluid1D.py index 3f362c2f4d..9a9bced685 100644 --- a/src/Mod/Fem/femobjects/element_fluid1D.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/element_geometry1D.py b/src/Mod/Fem/femobjects/element_geometry1D.py index 4407969a31..fa54b39316 100644 --- a/src/Mod/Fem/femobjects/element_geometry1D.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/element_geometry2D.py b/src/Mod/Fem/femobjects/element_geometry2D.py index f347802940..513277429b 100644 --- a/src/Mod/Fem/femobjects/element_geometry2D.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/element_rotation1D.py b/src/Mod/Fem/femobjects/element_rotation1D.py index bc70485782..85da639544 100644 --- a/src/Mod/Fem/femobjects/element_rotation1D.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/material_common.py b/src/Mod/Fem/femobjects/material_common.py index eb1876537d..f6796c3ecd 100644 --- a/src/Mod/Fem/femobjects/material_common.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/material_mechanicalnonlinear.py b/src/Mod/Fem/femobjects/material_mechanicalnonlinear.py index d046b40853..23fd1f08e2 100644 --- a/src/Mod/Fem/femobjects/material_mechanicalnonlinear.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/material_reinforced.py b/src/Mod/Fem/femobjects/material_reinforced.py index c383507dc5..bb3559cf0c 100644 --- a/src/Mod/Fem/femobjects/material_reinforced.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/mesh_boundarylayer.py b/src/Mod/Fem/femobjects/mesh_boundarylayer.py index 03369ab943..c9cce6a318 100644 --- a/src/Mod/Fem/femobjects/mesh_boundarylayer.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/mesh_gmsh.py b/src/Mod/Fem/femobjects/mesh_gmsh.py index 7677e45fb1..2cbb5d71c6 100644 --- a/src/Mod/Fem/femobjects/mesh_gmsh.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/mesh_group.py b/src/Mod/Fem/femobjects/mesh_group.py index 7cfdb09e84..6c2716d535 100644 --- a/src/Mod/Fem/femobjects/mesh_group.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/mesh_region.py b/src/Mod/Fem/femobjects/mesh_region.py index d68b5d3b2a..378470bcd9 100644 --- a/src/Mod/Fem/femobjects/mesh_region.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/mesh_result.py b/src/Mod/Fem/femobjects/mesh_result.py index 32fe8ada1a..9e3edf917d 100644 --- a/src/Mod/Fem/femobjects/mesh_result.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/result_mechanical.py b/src/Mod/Fem/femobjects/result_mechanical.py index 1b6fb8dfaa..d80f33c16b 100644 --- a/src/Mod/Fem/femobjects/result_mechanical.py +++ b/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 """ diff --git a/src/Mod/Fem/femobjects/solver_ccxtools.py b/src/Mod/Fem/femobjects/solver_ccxtools.py index 2da1d86df2..d6f4e6a96f 100644 --- a/src/Mod/Fem/femobjects/solver_ccxtools.py +++ b/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 """ diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index c539995cf9..45b437ac2d 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/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