From 6c10202760ebe79b6e9dfba5630bd22fe2cd9686 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:07:35 +0200 Subject: [PATCH] FEM: constraint initial flow velocity, rename class and module --- src/Mod/Fem/CMakeLists.txt | 6 +++--- src/Mod/Fem/ObjectsFem.py | 14 +++++++------- ...locity.py => constraint_initialflowvelocity.py} | 9 +++++---- src/Mod/Fem/femtools/migrate_app.py | 10 ++++++++-- src/Mod/Fem/femtools/migrate_gui.py | 10 ++++++++-- .../view_constraint_initialflowvelocity.py} | 9 +++++---- 6 files changed, 36 insertions(+), 22 deletions(-) rename src/Mod/Fem/femobjects/{_FemConstraintInitialFlowVelocity.py => constraint_initialflowvelocity.py} (90%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py => femviewprovider/view_constraint_initialflowvelocity.py} (94%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 9ef2412c98..96cf7a1e09 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -241,7 +241,7 @@ SET(FemObjectsScripts_SRCS femobjects/constraint_bodyheatsource.py femobjects/constraint_electrostaticpotential.py femobjects/constraint_flowvelocity.py - femobjects/_FemConstraintInitialFlowVelocity.py + femobjects/constraint_initialflowvelocity.py femobjects/_FemConstraintSelfWeight.py femobjects/_FemConstraintTie.py femobjects/_FemElementFluid1D.py @@ -324,12 +324,12 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_constraint_bodyheatsource.py femviewprovider/view_constraint_electrostaticpotential.py femviewprovider/view_constraint_flowvelocity.py + femviewprovider/view_constraint_initialflowvelocity.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py - femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py - femguiobjects/_ViewProviderFemConstraintSelfWeight.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 6cb241ea5e..98cc6a1c53 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -183,11 +183,11 @@ def makeConstraintInitialFlowVelocity( """makeConstraintInitialFlowVelocity(document, [name]): makes a Fem ConstraintInitialFlowVelocity object""" obj = doc.addObject("Fem::ConstraintPython", name) - from femobjects import _FemConstraintInitialFlowVelocity - _FemConstraintInitialFlowVelocity.Proxy(obj) + from femobjects import constraint_initialflowvelocity + constraint_initialflowvelocity.ConstraintInitialFlowVelocity(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemConstraintInitialFlowVelocity - _ViewProviderFemConstraintInitialFlowVelocity.ViewProxy(obj.ViewObject) + from femviewprovider import view_constraint_initialflowvelocity + view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity(obj.ViewObject) return obj @@ -239,7 +239,7 @@ def makeConstraintSelfWeight( creates an self weight object to define a gravity load""" obj = doc.addObject("Fem::ConstraintPython", name) from femobjects import _FemConstraintSelfWeight - _FemConstraintSelfWeight._FemConstraintSelfWeight(obj) + _FemConstraintSelfWeight.ConstraintSelfWeight(obj) if FreeCAD.GuiUp: from femguiobjects import _ViewProviderFemConstraintSelfWeight _ViewProviderFemConstraintSelfWeight._ViewProviderFemConstraintSelfWeight( @@ -265,8 +265,8 @@ def makeConstraintTie( """makeConstraintTie(document, [name]): creates an tie object to define bonded faces constraint""" obj = doc.addObject("Fem::ConstraintPython", name) - from femobjects import _FemConstraintTie - _FemConstraintTie._FemConstraintTie(obj) + from femobjects import constraint_tie + constraint_tie.ConstraintTie(obj) if FreeCAD.GuiUp: from femguiobjects import _ViewProviderFemConstraintTie _ViewProviderFemConstraintTie._ViewProviderFemConstraintTie( diff --git a/src/Mod/Fem/femobjects/_FemConstraintInitialFlowVelocity.py b/src/Mod/Fem/femobjects/constraint_initialflowvelocity.py similarity index 90% rename from src/Mod/Fem/femobjects/_FemConstraintInitialFlowVelocity.py rename to src/Mod/Fem/femobjects/constraint_initialflowvelocity.py index 91d1ad0fd0..301250dc16 100644 --- a/src/Mod/Fem/femobjects/_FemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/femobjects/constraint_initialflowvelocity.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 initial flow velocity document object" __author__ = "Markus Hovorka, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package FemConstraintInitialFlowVelocity +## @package constraint_initialflowvelocity # \ingroup FEM -# \brief FreeCAD FEM constraint initial flow velocity object +# \brief constraint initial flow velocity object from . import FemConstraint -class Proxy(FemConstraint.Proxy): +class ConstraintInitialFlowVelocity(FemConstraint.Proxy): Type = "Fem::ConstraintInitialFlowVelocity" def __init__(self, obj): - super(Proxy, self).__init__(obj) + super(ConstraintInitialFlowVelocity, self).__init__(obj) obj.addProperty( "App::PropertyFloat", "VelocityX", diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index 9194541616..f1927a76a9 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -45,6 +45,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemConstraintFlowVelocity": return self + if fullname == "femobjects._FemConstraintInitialFlowVelocity": + return self if fullname == "PyObjects": return self @@ -151,6 +153,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemConstraintFlowVelocity": import femobjects.constraint_flowvelocity module.Proxy = femobjects.constraint_flowvelocity.ConstraintFlowVelocity + if module.__name__ == "femobjects._FemConstraintInitialFlowVelocity": + import femobjects.constraint_initialflowvelocity + module.Proxy = femobjects.constraint_initialflowvelocity.ConstraintInitialFlowVelocity if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -164,8 +169,8 @@ class FemMigrateApp(object): import femobjects.constraint_flowvelocity module.Proxy = femobjects.constraint_flowvelocity.ConstraintFlowVelocity if module.__name__ == "PyObjects._FemConstraintInitialFlowVelocity": - import femobjects._FemConstraintInitialFlowVelocity - module.Proxy = femobjects._FemConstraintInitialFlowVelocity.Proxy + import femobjects.constraint_initialflowvelocity + module.Proxy = femobjects.constraint_initialflowvelocity.ConstraintInitialFlowVelocity if module.__name__ == "PyObjects._FemConstraintSelfWeight": import femobjects._FemConstraintSelfWeight module._FemConstraintSelfWeight = femobjects._FemConstraintSelfWeight._FemConstraintSelfWeight @@ -300,6 +305,7 @@ TODO add link to commit before the first commit module="femobjects._FemConstraintBodyHeatSource" module="femobjects._FemConstraintElectrostaticPotential" module="femobjects._FemConstraintFlowVelocity" +module="femobjects._FemConstraintInitialFlowVelocity" 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 b6daf24b61..8f3bd10140 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -43,6 +43,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemConstraintFlowVelocity": return self + if fullname == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": + return self if fullname == "PyGui": return self @@ -139,6 +141,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemConstraintFlowVelocity": import femviewprovider.view_constraint_flowvelocity module.ViewProxy = femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity + if module.__name__ == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": + import femviewprovider.view_constraint_initialflowvelocity + module.ViewProxy = femviewprovider.view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -152,8 +157,8 @@ class FemMigrateGui(object): import femviewprovider.view_constraint_flowvelocity module.ViewProxy = femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity if module.__name__ == "PyGui._ViewProviderFemConstraintInitialFlowVelocity": - import femguiobjects._ViewProviderFemConstraintInitialFlowVelocity - module.ViewProxy = femguiobjects._ViewProviderFemConstraintInitialFlowVelocity.ViewProxy + 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 @@ -264,6 +269,7 @@ TODO add link to commit before the first commit module="femguiobjects._ViewProviderFemConstraintBodyHeatSource" module="femguiobjects._ViewProviderFemConstraintElectrostaticPotential" module="femguiobjects._ViewProviderFemConstraintFlowVelocity" +module="femguiobjects._ViewProviderFemConstraintInitialFlowVelocity" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py similarity index 94% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py rename to src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py index 19f4f65b59..644bbbedf3 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.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,20 +26,20 @@ __title__ = "FreeCAD FEM constraint initial flow velocity ViewProvider for the d __author__ = "Markus Hovorka, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemConstraintInitialFlowVelocity +## @package view_constraint_initialflowvelocity # \ingroup FEM -# \brief FreeCAD FEM view provider for constraint initial flow velocity object +# \brief view provider for constraint initial flow velocity object import FreeCAD import FreeCADGui from FreeCAD import Units -from . import ViewProviderFemConstraint +from femguiobjects import ViewProviderFemConstraint from femtools import femutils from femtools import membertools -class ViewProxy(ViewProviderFemConstraint.ViewProxy): +class VPConstraintInitialFlowVelocity(ViewProviderFemConstraint.ViewProxy): def setEdit(self, vobj, mode=0): ViewProviderFemConstraint.ViewProxy.setEdit(