From b74ec6515d27091e14530e6d20af16cd5b3be31e Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 01:08:02 +0200 Subject: [PATCH] FEM: mesh result, rename class and module --- src/Mod/Fem/CMakeLists.txt | 4 ++-- src/Mod/Fem/ObjectsFem.py | 8 ++++---- .../femobjects/{_FemMeshResult.py => mesh_result.py} | 8 ++++---- src/Mod/Fem/femtools/migrate_app.py | 10 ++++++++-- src/Mod/Fem/femtools/migrate_gui.py | 10 ++++++++-- .../view_mesh_result.py} | 10 +++++----- 6 files changed, 31 insertions(+), 19 deletions(-) rename src/Mod/Fem/femobjects/{_FemMeshResult.py => mesh_result.py} (92%) rename src/Mod/Fem/{femguiobjects/_ViewProviderFemMeshResult.py => femviewprovider/view_mesh_result.py} (88%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index ac6d1e7250..d0a16d4292 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -255,7 +255,7 @@ SET(FemObjectsScripts_SRCS femobjects/mesh_gmsh.py femobjects/mesh_group.py femobjects/mesh_region.py - femobjects/_FemMeshResult.py + femobjects/mesh_result.py femobjects/_FemResultMechanical.py femobjects/_FemSolverCalculix.py femobjects/FemConstraint.py @@ -337,12 +337,12 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_mesh_gmsh.py femviewprovider/view_mesh_group.py femviewprovider/view_mesh_region.py + femviewprovider/view_mesh_result.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py femguiobjects/_ViewProviderFemMaterial.py - femguiobjects/_ViewProviderFemMeshResult.py femguiobjects/_ViewProviderFemResultMechanical.py femguiobjects/_ViewProviderFemSolverCalculix.py femguiobjects/ViewProviderBaseObject.py diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index b7924dff92..85da19f145 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -529,11 +529,11 @@ def makeMeshResult( ): """makeMeshResult(document, name): makes a Fem MeshResult object""" obj = doc.addObject("Fem::FemMeshObjectPython", name) - from femobjects import _FemMeshResult - _FemMeshResult._FemMeshResult(obj) + from femobjects import mesh_result + mesh_result.MeshResult(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemMeshResult - _ViewProviderFemMeshResult._ViewProviderFemMeshResult(obj.ViewObject) + from femviewprovider import view_mesh_result + view_mesh_result.VPFemMeshResult(obj.ViewObject) return obj diff --git a/src/Mod/Fem/femobjects/_FemMeshResult.py b/src/Mod/Fem/femobjects/mesh_result.py similarity index 92% rename from src/Mod/Fem/femobjects/_FemMeshResult.py rename to src/Mod/Fem/femobjects/mesh_result.py index 3f8581af99..32fe8ada1a 100644 --- a/src/Mod/Fem/femobjects/_FemMeshResult.py +++ b/src/Mod/Fem/femobjects/mesh_result.py @@ -25,14 +25,14 @@ __title__ = "FreeCAD FEM mesh result document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package FemMeshResult +## @package mesh_result # \ingroup FEM -# \brief FreeCAD FEM _FemMeshResult +# \brief mesh result object from . import FemConstraint -class _FemMeshResult(FemConstraint.Proxy): +class MeshResult(FemConstraint.Proxy): """ The Fem::FemMeshObject's Proxy python type, add Result specific object type """ @@ -40,4 +40,4 @@ class _FemMeshResult(FemConstraint.Proxy): Type = "Fem::MeshResult" def __init__(self, obj): - super(_FemMeshResult, self).__init__(obj) + super(MeshResult, self).__init__(obj) diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index 272e2c31bd..780aab41fd 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -71,6 +71,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemMeshRegion": return self + if fullname == "femobjects._FemMeshResult": + return self if fullname == "PyObjects": return self @@ -216,6 +218,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemMeshRegion": import femobjects.mesh_region module._FemMeshRegion = femobjects.mesh_region.MeshRegion + if module.__name__ == "femobjects._FemMeshResult": + import femobjects.mesh_result + module._FemMeshResult = femobjects.mesh_result.MeshResult if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -265,8 +270,8 @@ class FemMigrateApp(object): import femobjects.mesh_region module._FemMeshRegion = femobjects.mesh_region.MeshRegion if module.__name__ == "PyObjects._FemMeshResult": - import femobjects._FemMeshResult - module._FemMeshResult = femobjects._FemMeshResult._FemMeshResult + import femobjects.mesh_result + module._FemMeshResult = femobjects.mesh_result.MeshResult if module.__name__ == "PyObjects._FemResultMechanical": import femobjects._FemResultMechanical module._FemResultMechanical = femobjects._FemResultMechanical._FemResultMechanical @@ -378,6 +383,7 @@ module="femobjects._FemMeshBoundaryLayer" module="femobjects._FemMeshGmsh" module="femobjects._FemMeshGroup" module="femobjects._FemMeshRegion" +module="femobjects._FemMeshResult" 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 ce5870100b..c5f7c51c12 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -69,6 +69,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemMeshRegion": return self + if fullname == "femguiobjects._ViewProviderFemMeshResult": + return self if fullname == "PyGui": return self @@ -204,6 +206,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemMeshRegion": import femviewprovider.view_mesh_region module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion + if module.__name__ == "femguiobjects._ViewProviderFemMeshResult": + import femviewprovider.view_mesh_result + module._ViewProviderFemMeshResult = femviewprovider.view_mesh_result.VPFemMeshResult if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -253,8 +258,8 @@ class FemMigrateGui(object): import femviewprovider.view_mesh_region module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion if module.__name__ == "PyGui._ViewProviderFemMeshResult": - import femguiobjects._ViewProviderFemMeshResult - module._ViewProviderFemMeshResult = femguiobjects._ViewProviderFemMeshResult._ViewProviderFemMeshResult + import femviewprovider.view_mesh_result + module._ViewProviderFemMeshResult = femviewprovider.view_mesh_result.VPFemMeshResult if module.__name__ == "PyGui._ViewProviderFemResultMechanical": import femguiobjects._ViewProviderFemResultMechanical module._ViewProviderFemResultMechanical = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical @@ -342,6 +347,7 @@ module="femguiobjects._ViewProviderFemMeshBoundaryLayer" module="femguiobjects._ViewProviderFemMeshGmsh" module="femguiobjects._ViewProviderFemMeshGroup" module="femguiobjects._ViewProviderFemMeshRegion" +module="femguiobjects._ViewProviderFemMeshResult" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshResult.py b/src/Mod/Fem/femviewprovider/view_mesh_result.py similarity index 88% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemMeshResult.py rename to src/Mod/Fem/femviewprovider/view_mesh_result.py index eeaa2fecd8..d4943eb4bc 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshResult.py +++ b/src/Mod/Fem/femviewprovider/view_mesh_result.py @@ -25,17 +25,17 @@ __title__ = "FreeCAD FEM mesh result ViewProvider for the document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemMeshResult +## @package view_mesh_result # \ingroup FEM -# \brief FreeCAD FEM _ViewProviderFemMeshResult +# \brief view provider for mesh result object -from . import ViewProviderBaseObject +from femguiobjects import ViewProviderBaseObject -class _ViewProviderFemMeshResult(ViewProviderBaseObject.ViewProxy): +class VPFemMeshResult(ViewProviderBaseObject.ViewProxy): """ - A View Provider for the FemMeshResult object + A View Provider for the MeshResult object """ pass