From 7f5df5cb425650e88d281e52bbdd4e2daf50af41 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:07:29 +0200 Subject: [PATCH] FEM: constraint electrostatic potential, rename class and module --- src/Mod/Fem/CMakeLists.txt | 4 ++-- src/Mod/Fem/ObjectsFem.py | 8 ++++---- ...ntial.py => constraint_electrostaticpotential.py} | 9 +++++---- src/Mod/Fem/femtools/migrate_app.py | 10 ++++++++-- src/Mod/Fem/femtools/migrate_gui.py | 12 +++++++++--- .../view_constraint_electrostaticpotential.py} | 8 ++++---- 6 files changed, 32 insertions(+), 19 deletions(-) rename src/Mod/Fem/femobjects/{_FemConstraintElectrostaticPotential.py => constraint_electrostaticpotential.py} (90%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py => femviewprovider/view_constraint_electrostaticpotential.py} (96%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 6d7d109eb9..2c694d111b 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -239,7 +239,7 @@ SET(FemTools_SRCS SET(FemObjectsScripts_SRCS femobjects/__init__.py femobjects/constraint_bodyheatsource.py - femobjects/_FemConstraintElectrostaticPotential.py + femobjects/constraint_electrostaticpotential.py femobjects/_FemConstraintFlowVelocity.py femobjects/_FemConstraintInitialFlowVelocity.py femobjects/_FemConstraintSelfWeight.py @@ -322,11 +322,11 @@ INSTALL(FILES ${FemObjectsScripts_SRCS} DESTINATION Mod/Fem/femobjects) SET(FemGuiViewObjects_SRCS femviewprovider/__init__.py femviewprovider/view_constraint_bodyheatsource.py + femviewprovider/view_constraint_electrostaticpotential.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py - femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py femguiobjects/_ViewProviderFemConstraintFlowVelocity.py femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py femguiobjects/_ViewProviderFemConstraintSelfWeight.py diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 15dca8930c..b413210100 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -103,11 +103,11 @@ def makeConstraintElectrostaticPotential( """makeConstraintElectrostaticPotential(document, [name]): makes a Fem ElectrostaticPotential object""" obj = doc.addObject("Fem::ConstraintPython", name) - from femobjects import _FemConstraintElectrostaticPotential - _FemConstraintElectrostaticPotential.Proxy(obj) + from femobjects import constraint_electrostaticpotential + constraint_electrostaticpotential.ConstraintElectrostaticPotential(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemConstraintElectrostaticPotential - _ViewProviderFemConstraintElectrostaticPotential.ViewProxy(obj.ViewObject) + from femviewprovider import view_constraint_electrostaticpotential + view_constraint_electrostaticpotential.VPConstraintElectroStaticPotential(obj.ViewObject) return obj diff --git a/src/Mod/Fem/femobjects/_FemConstraintElectrostaticPotential.py b/src/Mod/Fem/femobjects/constraint_electrostaticpotential.py similarity index 90% rename from src/Mod/Fem/femobjects/_FemConstraintElectrostaticPotential.py rename to src/Mod/Fem/femobjects/constraint_electrostaticpotential.py index 9ba504603b..3a07fb4fa1 100644 --- a/src/Mod/Fem/femobjects/_FemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femobjects/constraint_electrostaticpotential.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. * # * * @@ -25,19 +26,19 @@ __title__ = "FreeCAD FEM constraint electrostatic potential document object" __author__ = "Markus Hovorka, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package FemConstraintElectrostaticPotential +## @package constraint_electrostaticpotential # \ingroup FEM -# \brief FreeCAD FEM constraint electrostatic potential object +# \brief constraint electrostatic potential object from . import FemConstraint -class Proxy(FemConstraint.Proxy): +class ConstraintElectrostaticPotential(FemConstraint.Proxy): Type = "Fem::ConstraintElectrostaticPotential" def __init__(self, obj): - super(Proxy, self).__init__(obj) + super(ConstraintElectrostaticPotential, self).__init__(obj) obj.addProperty( "App::PropertyFloat", "Potential", diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index df281df62c..64096c57bd 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -41,6 +41,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemConstraintBodyHeatSource": return self + if fullname == "femobjects._FemConstraintElectrostaticPotential": + return self if fullname == "PyObjects": return self @@ -141,6 +143,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemConstraintBodyHeatSource": import femobjects.constraint_bodyheatsource module.Proxy = femobjects.constraint_bodyheatsource.ConstraintBodyHeatSource + if module.__name__ == "femobjects._FemConstraintElectrostaticPotential": + import femobjects.constraint_electrostaticpotential + module.Proxy = femobjects.constraint_electrostaticpotential.ConstraintElectrostaticPotential if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -148,8 +153,8 @@ class FemMigrateApp(object): import femobjects.constraint_bodyheatsource module.Proxy = femobjects.constraint_bodyheatsource.ConstraintBodyHeatSource if module.__name__ == "PyObjects._FemConstraintElectrostaticPotential": - import femobjects._FemConstraintElectrostaticPotential - module.Proxy = femobjects._FemConstraintElectrostaticPotential.Proxy + import femobjects.constraint_electrostaticpotential + module.Proxy = femobjects.constraint_electrostaticpotential.ConstraintElectrostaticPotential if module.__name__ == "PyObjects._FemConstraintFlowVelocity": import femobjects._FemConstraintFlowVelocity module.Proxy = femobjects._FemConstraintFlowVelocity.Proxy @@ -288,6 +293,7 @@ fourth big moving renaming class and module names in femobjects TODO add link to commit before the first commit module="femobjects._FemConstraintBodyHeatSource" +module="femobjects._FemConstraintElectrostaticPotential" 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 90e1e176ec..efce96c983 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -37,7 +37,9 @@ class FemMigrateGui(object): if fullname == "femguiobjects": return self - if fullname == "femguiobjects._ViewProviderFemConstraintBodyHeatSource": + if fullname == "femguiobjects._ViewProviderFemConstraintBodyHeatSource": + return self + if fullname == "femguiobjects._ViewProviderFemConstraintElectrostaticPotential": return self if fullname == "PyGui": @@ -129,6 +131,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemConstraintBodyHeatSource": import femviewprovider.view_constraint_bodyheatsource module.ViewProxy = femviewprovider.view_constraint_bodyheatsource.VPConstraintBodyHeatSource + if module.__name__ == "femguiobjects._ViewProviderFemConstraintElectrostaticPotential": + import femviewprovider.view_constraint_electrostaticpotential + module.ViewProxy = femviewprovider.view_constraint_electrostaticpotential.VPConstraintElectroStaticPotential if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -136,8 +141,8 @@ class FemMigrateGui(object): import femviewprovider.view_constraint_bodyheatsource module.ViewProxy = femviewprovider.view_constraint_bodyheatsource.VPConstraintBodyHeatSource if module.__name__ == "PyGui._ViewProviderFemConstraintElectrostaticPotential": - import femguiobjects._ViewProviderFemConstraintElectrostaticPotential - module.ViewProxy = femguiobjects._ViewProviderFemConstraintElectrostaticPotential.ViewProxy + import femviewprovider.view_constraint_electrostaticpotential + module.ViewProxy = femviewprovider.view_constraint_electrostaticpotential.VPConstraintElectroStaticPotential if module.__name__ == "PyGui._ViewProviderFemConstraintFlowVelocity": import femguiobjects._ViewProviderFemConstraintFlowVelocity module.ViewProxy = femguiobjects._ViewProviderFemConstraintFlowVelocity.ViewProxy @@ -252,6 +257,7 @@ fourth big moving renaming class and module names in femobjects TODO add link to commit before the first commit module="femguiobjects._ViewProviderFemConstraintBodyHeatSource" +module="femguiobjects._ViewProviderFemConstraintElectrostaticPotential" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py similarity index 96% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py rename to src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py index fcb7674e23..e539269835 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py @@ -25,21 +25,21 @@ __title__ = "FreeCAD FEM constraint electrostatic potential ViewProvider for the __author__ = "Markus Hovorka, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemConstraintElctrostaticPotential +## @package view_constraint_electrostaticpotential # \ingroup FEM -# \brief FreeCAD FEM view provider for constraint electrostatic potential object +# \brief view provider for constraint electrostatic potential object import FreeCAD import FreeCADGui from FreeCAD import Units from femguiutils import selection_widgets -from . import ViewProviderFemConstraint +from femguiobjects import ViewProviderFemConstraint from femtools import femutils from femtools import membertools -class ViewProxy(ViewProviderFemConstraint.ViewProxy): +class VPConstraintElectroStaticPotential(ViewProviderFemConstraint.ViewProxy): def setEdit(self, vobj, mode=0): ViewProviderFemConstraint.ViewProxy.setEdit(