From f6c6ff49ddb216aa22659c18443682f8dd4a7c74 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:07:37 +0200 Subject: [PATCH] FEM: constraint self weight, rename class and module --- src/Mod/Fem/CMakeLists.txt | 4 ++-- src/Mod/Fem/ObjectsFem.py | 8 ++++---- ...raintSelfWeight.py => constraint_selfweight.py} | 10 +++++----- src/Mod/Fem/femtools/migrate_app.py | 14 ++++++++++---- src/Mod/Fem/femtools/migrate_gui.py | 14 ++++++++++---- .../view_constraint_selfweight.py} | 8 ++++---- 6 files changed, 35 insertions(+), 23 deletions(-) rename src/Mod/Fem/femobjects/{_FemConstraintSelfWeight.py => constraint_selfweight.py} (92%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemConstraintSelfWeight.py => femviewprovider/view_constraint_selfweight.py} (89%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 96cf7a1e09..098912093d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -242,7 +242,7 @@ SET(FemObjectsScripts_SRCS femobjects/constraint_electrostaticpotential.py femobjects/constraint_flowvelocity.py femobjects/constraint_initialflowvelocity.py - femobjects/_FemConstraintSelfWeight.py + femobjects/constraint_selfweight.py femobjects/_FemConstraintTie.py femobjects/_FemElementFluid1D.py femobjects/_FemElementGeometry1D.py @@ -325,11 +325,11 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_constraint_electrostaticpotential.py femviewprovider/view_constraint_flowvelocity.py femviewprovider/view_constraint_initialflowvelocity.py + femviewprovider/view_constraint_selfweight.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py - femguiobjects/_ViewProviderFemConstraintSelfWeight.py femguiobjects/_ViewProviderFemConstraintTie.py femguiobjects/_ViewProviderFemElementFluid1D.py femguiobjects/_ViewProviderFemElementGeometry1D.py diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 98cc6a1c53..7d64c5558d 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -238,11 +238,11 @@ def makeConstraintSelfWeight( """makeConstraintSelfWeight(document, [name]): creates an self weight object to define a gravity load""" obj = doc.addObject("Fem::ConstraintPython", name) - from femobjects import _FemConstraintSelfWeight - _FemConstraintSelfWeight.ConstraintSelfWeight(obj) + from femobjects import constraint_selfweight + constraint_selfweight.ConstraintSelfWeight(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemConstraintSelfWeight - _ViewProviderFemConstraintSelfWeight._ViewProviderFemConstraintSelfWeight( + from femviewprovider import view_constraint_selfweight + view_constraint_selfweight.VPConstraintSelfWeight( obj.ViewObject ) return obj diff --git a/src/Mod/Fem/femobjects/_FemConstraintSelfWeight.py b/src/Mod/Fem/femobjects/constraint_selfweight.py similarity index 92% rename from src/Mod/Fem/femobjects/_FemConstraintSelfWeight.py rename to src/Mod/Fem/femobjects/constraint_selfweight.py index 95f47f8653..933cf243e3 100644 --- a/src/Mod/Fem/femobjects/_FemConstraintSelfWeight.py +++ b/src/Mod/Fem/femobjects/constraint_selfweight.py @@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM constraint self weight document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package FemConstraintSelfWeight +## @package constraint_selfweight # \ingroup FEM -# \brief FreeCAD FEM constraint self weight object +# \brief constraint self weight object from . import FemConstraint -class _FemConstraintSelfWeight(FemConstraint.Proxy): +class ConstraintSelfWeight(FemConstraint.Proxy): """ - The FemConstraintSelfWeight object" + The ConstraintSelfWeight object" """ Type = "Fem::ConstraintSelfWeight" def __init__(self, obj): - super(_FemConstraintSelfWeight, self).__init__(obj) + super(ConstraintSelfWeight, self).__init__(obj) obj.addProperty( "App::PropertyFloat", diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index f1927a76a9..6ece1d7a64 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -47,6 +47,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemConstraintInitialFlowVelocity": return self + if fullname == "femobjects._FemConstraintSelfWeight": + return self if fullname == "PyObjects": return self @@ -156,6 +158,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemConstraintInitialFlowVelocity": import femobjects.constraint_initialflowvelocity module.Proxy = femobjects.constraint_initialflowvelocity.ConstraintInitialFlowVelocity + if module.__name__ == "femobjects._FemConstraintSelfWeight": + import femobjects.constraint_selfweight + module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -172,8 +177,8 @@ class FemMigrateApp(object): import femobjects.constraint_initialflowvelocity module.Proxy = femobjects.constraint_initialflowvelocity.ConstraintInitialFlowVelocity if module.__name__ == "PyObjects._FemConstraintSelfWeight": - import femobjects._FemConstraintSelfWeight - module._FemConstraintSelfWeight = femobjects._FemConstraintSelfWeight._FemConstraintSelfWeight + import femobjects.constraint_selfweight + module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight if module.__name__ == "PyObjects._FemElementFluid1D": import femobjects._FemElementFluid1D module._FemElementFluid1D = femobjects._FemElementFluid1D._FemElementFluid1D @@ -228,8 +233,8 @@ class FemMigrateApp(object): import femobjects._FemElementGeometry1D module._FemBeamSection = femobjects._FemElementGeometry1D._FemElementGeometry1D if module.__name__ == "_FemConstraintSelfWeight": - import femobjects._FemConstraintSelfWeight - module._FemConstraintSelfWeight = femobjects._FemConstraintSelfWeight._FemConstraintSelfWeight + import femobjects.constraint_selfweight + module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight if module.__name__ == "_FemMaterial": import femobjects._FemMaterial module._FemMaterial = femobjects._FemMaterial._FemMaterial @@ -306,6 +311,7 @@ module="femobjects._FemConstraintBodyHeatSource" module="femobjects._FemConstraintElectrostaticPotential" module="femobjects._FemConstraintFlowVelocity" module="femobjects._FemConstraintInitialFlowVelocity" +module="femobjects._FemConstraintSelfWeight" third big moving from PyObjects to femobjects, following the parent commit diff --git a/src/Mod/Fem/femtools/migrate_gui.py b/src/Mod/Fem/femtools/migrate_gui.py index 8f3bd10140..d3d6fa1bc0 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -45,6 +45,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": return self + if fullname == "femguiobjects._ViewProviderFemConstraintSelfWeight": + return self if fullname == "PyGui": return self @@ -144,6 +146,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": import femviewprovider.view_constraint_initialflowvelocity module.ViewProxy = femviewprovider.view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity + if module.__name__ == "femguiobjects._ViewProviderFemConstraintSelfWeight": + import femviewprovider.view_constraint_selfweight + module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -160,8 +165,8 @@ class FemMigrateGui(object): import femviewprovider.view_constraint_initialflowvelocity module.ViewProxy = femviewprovider.view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity if module.__name__ == "PyGui._ViewProviderFemConstraintSelfWeight": - import femguiobjects._ViewProviderFemConstraintSelfWeight - module._ViewProviderFemConstraintSelfWeight = femguiobjects._ViewProviderFemConstraintSelfWeight._ViewProviderFemConstraintSelfWeight + import femviewprovider.view_constraint_selfweight + module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight if module.__name__ == "PyGui._ViewProviderFemElementFluid1D": import femguiobjects._ViewProviderFemElementFluid1D module._ViewProviderFemElementFluid1D = femguiobjects._ViewProviderFemElementFluid1D._ViewProviderFemElementFluid1D @@ -216,8 +221,8 @@ class FemMigrateGui(object): import femguiobjects._ViewProviderFemElementGeometry1D module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D if module.__name__ == "_ViewProviderFemConstraintSelfWeight": - import femguiobjects._ViewProviderFemConstraintSelfWeight - module._ViewProviderFemConstraintSelfWeight = femguiobjects._ViewProviderFemConstraintSelfWeight._ViewProviderFemConstraintSelfWeight + import femviewprovider.view_constraint_selfweight + module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight if module.__name__ == "_ViewProviderFemMaterial": import femguiobjects._ViewProviderFemMaterial module._ViewProviderFemMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial @@ -270,6 +275,7 @@ module="femguiobjects._ViewProviderFemConstraintBodyHeatSource" module="femguiobjects._ViewProviderFemConstraintElectrostaticPotential" module="femguiobjects._ViewProviderFemConstraintFlowVelocity" module="femguiobjects._ViewProviderFemConstraintInitialFlowVelocity" +module="femguiobjects._ViewProviderFemConstraintSelfWeight" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py b/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py similarity index 89% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py rename to src/Mod/Fem/femviewprovider/view_constraint_selfweight.py index 7aeeafcdc2..36a821e071 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py +++ b/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py @@ -25,14 +25,14 @@ __title__ = "FreeCAD FEM constraint self weight ViewProvider for the document ob __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemConstraintSelfWeight +## @package view_constraint_selfweight # \ingroup FEM -# \brief FreeCAD FEM Constraint SelfWeight ViewProvider +# \brief view provider for constraint self weight object -from . import ViewProviderFemConstraint +from femguiobjects import ViewProviderFemConstraint -class _ViewProviderFemConstraintSelfWeight(ViewProviderFemConstraint.ViewProxy): +class VPConstraintSelfWeight(ViewProviderFemConstraint.ViewProxy): """ A View Provider for the FemConstraintSelfWeight object """