From e2970232a2513386e23cf34ff9f301f33e2051a8 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:07:45 +0200 Subject: [PATCH] FEM: element geometry 2D, rename class and module --- src/Mod/Fem/CMakeLists.txt | 4 +-- src/Mod/Fem/ObjectsFem.py | 8 +++--- ...entGeometry2D.py => element_geometry2D.py} | 10 +++---- src/Mod/Fem/femtools/migrate_app.py | 26 ++++++++++++------- src/Mod/Fem/femtools/migrate_gui.py | 20 +++++++++----- .../view_element_geometry2D.py} | 12 ++++----- 6 files changed, 46 insertions(+), 34 deletions(-) rename src/Mod/Fem/femobjects/{_FemElementGeometry2D.py => element_geometry2D.py} (91%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemElementGeometry2D.py => femviewprovider/view_element_geometry2D.py} (91%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index b1c468e35b..fa6bde57a5 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -246,7 +246,7 @@ SET(FemObjectsScripts_SRCS femobjects/constraint_tie.py femobjects/element_fluid1D.py femobjects/element_geometry1D.py - femobjects/_FemElementGeometry2D.py + femobjects/element_geometry2D.py femobjects/_FemElementRotation1D.py femobjects/_FemMaterial.py femobjects/_FemMaterialMechanicalNonlinear.py @@ -329,11 +329,11 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_constraint_tie.py femviewprovider/view_element_fluid1D.py femviewprovider/view_element_geometry1D.py + femviewprovider/view_element_geometry2D.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py - femguiobjects/_ViewProviderFemElementGeometry2D.py femguiobjects/_ViewProviderFemElementRotation1D.py femguiobjects/_ViewProviderFemMaterial.py femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 7c8fcd1c0f..e11ab4a235 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -336,12 +336,12 @@ def makeElementGeometry2D( """makeElementGeometry2D(document, [thickness], [name]): creates an 2D geometry element object to define a plate thickness""" obj = doc.addObject("Fem::FeaturePython", name) - from femobjects import _FemElementGeometry2D - _FemElementGeometry2D._FemElementGeometry2D(obj) + from femobjects import element_geometry2D + element_geometry2D.ElementGeometry2D(obj) obj.Thickness = thickness if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemElementGeometry2D - _ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D(obj.ViewObject) + from femviewprovider import view_element_geometry2D + view_element_geometry2D.VPElementGeometry2D(obj.ViewObject) return obj diff --git a/src/Mod/Fem/femobjects/_FemElementGeometry2D.py b/src/Mod/Fem/femobjects/element_geometry2D.py similarity index 91% rename from src/Mod/Fem/femobjects/_FemElementGeometry2D.py rename to src/Mod/Fem/femobjects/element_geometry2D.py index 24784e01aa..f347802940 100644 --- a/src/Mod/Fem/femobjects/_FemElementGeometry2D.py +++ b/src/Mod/Fem/femobjects/element_geometry2D.py @@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM element geometry 2D document object" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -## @package FemElementGeometry2D +## @package element_geometry2D # \ingroup FEM -# \brief FreeCAD FEM element geometry 2D object +# \brief element geometry 2D object from . import FemConstraint -class _FemElementGeometry2D(FemConstraint.Proxy): +class ElementGeometry2D(FemConstraint.Proxy): """ - The FemElementGeometry2D object + The ElementGeometry2D object """ Type = "Fem::ElementGeometry2D" def __init__(self, obj): - super(_FemElementGeometry2D, self).__init__(obj) + super(ElementGeometry2D, self).__init__(obj) obj.addProperty( "App::PropertyLength", diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index 622ffa0c74..9f74c20b2d 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -55,6 +55,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemElementGeometry1D": return self + if fullname == "femobjects._FemElementGeometry2D": + return self if fullname == "PyObjects": return self @@ -176,6 +178,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemElementGeometry1D": import femobjects.element_geometry1D module._FemElementGeometry1D = femobjects.element_geometry1D.ElementGeometry1D + if module.__name__ == "femobjects._FemElementGeometry2D": + import femobjects.element_geometry2D + module._FemElementGeometry2D = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -201,8 +206,8 @@ class FemMigrateApp(object): import femobjects.element_geometry1D module._FemElementGeometry1D = femobjects.element_geometry1D.ElementGeometry1D if module.__name__ == "PyObjects._FemElementGeometry2D": - import femobjects._FemElementGeometry2D - module._FemElementGeometry2D = femobjects._FemElementGeometry2D._FemElementGeometry2D + import femobjects.element_geometry2D + module._FemElementGeometry2D = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "PyObjects._FemElementRotation1D": import femobjects._FemElementRotation1D module._FemElementRotation1D = femobjects._FemElementRotation1D._FemElementRotation1D @@ -241,8 +246,8 @@ class FemMigrateApp(object): import femobjects.element_fluid1D module._FemFluidSection = femobjects.element_fluid1D.ElementFluid1D if module.__name__ == "PyObjects._FemShellThickness": - import femobjects._FemElementGeometry2D - module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D + import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "_FemBeamSection": import femobjects.element_geometry1D @@ -269,8 +274,8 @@ class FemMigrateApp(object): import femobjects._FemResultMechanical module._FemResultMechanical = femobjects._FemResultMechanical._FemResultMechanical if module.__name__ == "_FemShellThickness": - import femobjects._FemElementGeometry2D - module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D + import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "_FemSolverCalculix": import femobjects._FemSolverCalculix module._FemSolverCalculix = femobjects._FemSolverCalculix._FemSolverCalculix @@ -295,11 +300,11 @@ class FemMigrateApp(object): import femviewprovider.view_element_geometry1D module._ViewProviderFemBeamSection = femviewprovider.view_element_geometry1D.VPElementGeometry1D if module.__name__ == "FemShellThickness": - import femobjects._FemElementGeometry2D - module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D + import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if FreeCAD.GuiUp: - import femguiobjects._ViewProviderFemElementGeometry2D - module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D + import femviewprovider.view_element_geometry2D + module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D if module.__name__ == "MechanicalAnalysis": import femobjects.FemConstraint module._FemAnalysis = femobjects.FemConstraint.Proxy @@ -330,6 +335,7 @@ module="femobjects._FemConstraintSelfWeight" module="femobjects._FemConstraintTie" module="femobjects._FemElementFluid1D" module="femobjects._FemElementGeometry1D" +module="femobjects._FemElementGeometry2D" 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 120e48bfbb..af32b6538c 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -53,6 +53,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemElementGeometry1D": return self + if fullname == "femguiobjects._ViewProviderFemElementGeometry2D": + return self if fullname == "PyGui": return self @@ -164,7 +166,10 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemElementGeometry1D": import femviewprovider.view_element_geometry1D module._ViewProviderFemElementGeometry1D = femviewprovider.view_element_geometry1D.VPElementGeometry1D - + if module.__name__ == "femguiobjects._ViewProviderFemElementGeometry2D": + import femviewprovider.view_element_geometry2D + module._ViewProviderFemElementGeometry2D = femviewprovider.view_element_geometry2D.VPElementGeometry2D + if module.__name__ == "PyGui": module.__path__ = "PyGui" if module.__name__ == "PyGui._ViewProviderFemConstraintBodyHeatSource": @@ -189,8 +194,8 @@ class FemMigrateGui(object): import femviewprovider.view_element_geometry1D module._ViewProviderFemElementGeometry1D = femviewprovider.view_element_geometry1D.VPElementGeometry1D if module.__name__ == "PyGui._ViewProviderFemElementGeometry2D": - import femguiobjects._ViewProviderFemElementGeometry2D - module._ViewProviderFemElementGeometry2D = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D + import femviewprovider.view_element_geometry2D + module._ViewProviderFemElementGeometry2D = femviewprovider.view_element_geometry2D.VPElementGeometry2D if module.__name__ == "PyGui._ViewProviderFemElementRotation1D": import femguiobjects._ViewProviderFemElementRotation1D module._ViewProviderFemElementRotation1D = femguiobjects._ViewProviderFemElementRotation1D._ViewProviderFemElementRotation1D @@ -229,8 +234,8 @@ class FemMigrateGui(object): import femviewprovider.view_element_fluid1D module._ViewProviderFemFluidSection = femviewprovider.view_element_fluid1D.VPElementFluid1D if module.__name__ == "PyGui._ViewProviderFemShellThickness": - import femguiobjects._ViewProviderFemElementGeometry2D - module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D + import femviewprovider.view_element_geometry2D + module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D if module.__name__ == "_ViewProviderFemBeamSection": import femviewprovider.view_element_geometry1D @@ -257,8 +262,8 @@ class FemMigrateGui(object): import femguiobjects._ViewProviderFemResultMechanical module._ViewProviderFemResultMechanical = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical if module.__name__ == "_ViewProviderFemShellThickness": - import femguiobjects._ViewProviderFemElementGeometry2D - module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D + import femviewprovider.view_element_geometry2D + module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D if module.__name__ == "_ViewProviderFemSolverCalculix": import femguiobjects._ViewProviderFemSolverCalculix module._ViewProviderFemSolverCalculix = femguiobjects._ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix @@ -294,6 +299,7 @@ module="femguiobjects._ViewProviderFemConstraintSelfWeight" module="femguiobjects._ViewProviderFemConstraintTie" module="femguiobjects._ViewProviderFemElementFluid1D" module="femguiobjects._ViewProviderFemElementGeometry1D" +module="femguiobjects._ViewProviderFemElementGeometry2D" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py similarity index 91% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py rename to src/Mod/Fem/femviewprovider/view_element_geometry2D.py index 167a35597c..dca3a5750d 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py +++ b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py @@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM element geometry 2D ViewProvider for the document objec __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemElementGeometry2D +## @package view_element_geometry2D # \ingroup FEM -# \brief FreeCAD FEM _ViewProviderFemElementGeometry2D +# \brief view provider for element geometry 2D 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 _ViewProviderFemElementGeometry2D(ViewProviderFemConstraint.ViewProxy): +class VPElementGeometry2D(ViewProviderFemConstraint.ViewProxy): """ - A View Provider for the FemElementGeometry2D object + A View Provider for the ElementGeometry2D object """ def setEdit(self, vobj, mode=0): @@ -54,7 +54,7 @@ class _ViewProviderFemElementGeometry2D(ViewProviderFemConstraint.ViewProxy): class _TaskPanel: """ - The TaskPanel for editing References property of FemElementGeometry2D objects + The TaskPanel for editing References property of ElementGeometry2D objects """ def __init__(self, obj):