From f8490568241dfa5a2f0b5ffa1c2cd9f270379ffe Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:07:39 +0200 Subject: [PATCH] FEM: constraint tie, rename class and module --- src/Mod/Fem/CMakeLists.txt | 4 ++-- src/Mod/Fem/ObjectsFem.py | 6 ++---- .../{_FemConstraintTie.py => constraint_tie.py} | 10 +++++----- src/Mod/Fem/femtools/migrate_app.py | 6 ++++++ src/Mod/Fem/femtools/migrate_gui.py | 6 ++++++ .../view_constraint_tie.py} | 10 +++++----- 6 files changed, 26 insertions(+), 16 deletions(-) rename src/Mod/Fem/femobjects/{_FemConstraintTie.py => constraint_tie.py} (91%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemConstraintTie.py => femviewprovider/view_constraint_tie.py} (94%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 098912093d..8c8c174819 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -243,7 +243,7 @@ SET(FemObjectsScripts_SRCS femobjects/constraint_flowvelocity.py femobjects/constraint_initialflowvelocity.py femobjects/constraint_selfweight.py - femobjects/_FemConstraintTie.py + femobjects/constraint_tie.py femobjects/_FemElementFluid1D.py femobjects/_FemElementGeometry1D.py femobjects/_FemElementGeometry2D.py @@ -326,11 +326,11 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_constraint_flowvelocity.py femviewprovider/view_constraint_initialflowvelocity.py femviewprovider/view_constraint_selfweight.py + femviewprovider/view_constraint_tie.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py - femguiobjects/_ViewProviderFemConstraintTie.py femguiobjects/_ViewProviderFemElementFluid1D.py femguiobjects/_ViewProviderFemElementGeometry1D.py femguiobjects/_ViewProviderFemElementGeometry2D.py diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 7d64c5558d..e0b68f9ab1 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -268,10 +268,8 @@ def makeConstraintTie( from femobjects import constraint_tie constraint_tie.ConstraintTie(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemConstraintTie - _ViewProviderFemConstraintTie._ViewProviderFemConstraintTie( - obj.ViewObject - ) + from femviewprovider import view_constraint_tie + view_constraint_tie.VPConstraintTie(obj.ViewObject) return obj diff --git a/src/Mod/Fem/femobjects/_FemConstraintTie.py b/src/Mod/Fem/femobjects/constraint_tie.py similarity index 91% rename from src/Mod/Fem/femobjects/_FemConstraintTie.py rename to src/Mod/Fem/femobjects/constraint_tie.py index 180fbde3d6..99736f9bcf 100644 --- a/src/Mod/Fem/femobjects/_FemConstraintTie.py +++ b/src/Mod/Fem/femobjects/constraint_tie.py @@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM constraint tie document object" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -## @package FemConstraintTie +## @package constraint_tie # \ingroup FEM -# \brief FreeCAD FEM constraint tie object +# \brief constraint tie object from . import FemConstraint -class _FemConstraintTie(FemConstraint.Proxy): +class ConstraintTie(FemConstraint.Proxy): """ - The FemConstraintTie object + The ConstraintTie object """ Type = "Fem::ConstraintTie" def __init__(self, obj): - super(_FemConstraintTie, self).__init__(obj) + super(ConstraintTie, 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 6ece1d7a64..2e2f947fe5 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -49,6 +49,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemConstraintSelfWeight": return self + if fullname == "femobjects._FemConstraintTie": + return self if fullname == "PyObjects": return self @@ -161,6 +163,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemConstraintSelfWeight": import femobjects.constraint_selfweight module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight + if module.__name__ == "femobjects._FemConstraintTie": + import femobjects.constraint_tie + module._FemConstraintTie = femobjects.constraint_tie.ConstraintTie if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -312,6 +317,7 @@ module="femobjects._FemConstraintElectrostaticPotential" module="femobjects._FemConstraintFlowVelocity" module="femobjects._FemConstraintInitialFlowVelocity" module="femobjects._FemConstraintSelfWeight" +module="femobjects._FemConstraintTie" 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 d3d6fa1bc0..06ee868415 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -47,6 +47,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemConstraintSelfWeight": return self + if fullname == "femguiobjects._ViewProviderFemConstraintTie": + return self if fullname == "PyGui": return self @@ -149,6 +151,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemConstraintSelfWeight": import femviewprovider.view_constraint_selfweight module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight + if module.__name__ == "femguiobjects._ViewProviderFemConstraintTie": + import femviewprovider.view_constraint_tie + module._ViewProviderFemConstraintTie = femviewprovider.view_constraint_tie.VPConstraintTie if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -276,6 +281,7 @@ module="femguiobjects._ViewProviderFemConstraintElectrostaticPotential" module="femguiobjects._ViewProviderFemConstraintFlowVelocity" module="femguiobjects._ViewProviderFemConstraintInitialFlowVelocity" module="femguiobjects._ViewProviderFemConstraintSelfWeight" +module="femguiobjects._ViewProviderFemConstraintTie" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py b/src/Mod/Fem/femviewprovider/view_constraint_tie.py similarity index 94% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py rename to src/Mod/Fem/femviewprovider/view_constraint_tie.py index e83866bb3f..92c33492c9 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py +++ b/src/Mod/Fem/femviewprovider/view_constraint_tie.py @@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM constraint tie ViewProvider for the document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemConstraintTie +## @package view_constraint_tie # \ingroup FEM -# \brief FreeCAD FEM _ViewProviderFemConstraintTie +# \brief view provider for constraint tie object from PySide import QtCore from PySide import QtGui @@ -36,12 +36,12 @@ import FreeCAD import FreeCADGui from femguiutils import selection_widgets -from . import ViewProviderFemConstraint +from femguiobjects import ViewProviderFemConstraint -class _ViewProviderFemConstraintTie(ViewProviderFemConstraint.ViewProxy): +class VPConstraintTie(ViewProviderFemConstraint.ViewProxy): """ - A View Provider for the FemConstraintTie object + A View Provider for the ConstraintTie object """ def setEdit(self, vobj, mode=0):