diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 540ac320ed..e76c95407e 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -257,7 +257,7 @@ SET(FemObjectsScripts_SRCS femobjects/mesh_region.py femobjects/mesh_result.py femobjects/result_mechanical.py - femobjects/_FemSolverCalculix.py + femobjects/solver_ccxtools.py femobjects/FemConstraint.py ) @@ -339,12 +339,12 @@ SET(FemGuiViewObjects_SRCS femviewprovider/view_mesh_region.py femviewprovider/view_mesh_result.py femviewprovider/view_result_mechanical.py + femviewprovider/view_solver_ccxtools.py ) SET(FemGuiScripts_SRCS femguiobjects/__init__.py femguiobjects/_ViewProviderFemMaterial.py - femguiobjects/_ViewProviderFemSolverCalculix.py femguiobjects/ViewProviderBaseObject.py femguiobjects/ViewProviderFemConstraint.py ) diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 52a279601d..73a75ce371 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -693,11 +693,11 @@ def makeSolverCalculixCcxTools( """makeSolverCalculixCcxTools(document, [name]): makes a Calculix solver object for the ccx tools module""" obj = doc.addObject("Fem::FemSolverObjectPython", name) - from femobjects import _FemSolverCalculix - _FemSolverCalculix._FemSolverCalculix(obj) + from femobjects import solver_ccxtools + solver_ccxtools.SolverCcxTools(obj) if FreeCAD.GuiUp: - from femguiobjects import _ViewProviderFemSolverCalculix - _ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix(obj.ViewObject) + from femviewprovider import view_solver_ccxtools + view_solver_ccxtools.VPSolverCcxTools(obj.ViewObject) return obj diff --git a/src/Mod/Fem/femobjects/_FemSolverCalculix.py b/src/Mod/Fem/femobjects/solver_ccxtools.py similarity index 91% rename from src/Mod/Fem/femobjects/_FemSolverCalculix.py rename to src/Mod/Fem/femobjects/solver_ccxtools.py index 63ac356dbc..2da1d86df2 100644 --- a/src/Mod/Fem/femobjects/_FemSolverCalculix.py +++ b/src/Mod/Fem/femobjects/solver_ccxtools.py @@ -21,13 +21,13 @@ # * * # *************************************************************************** -__title__ = "FreeCAD FEM solver calculix document object" +__title__ = "FreeCAD FEM solver calculix ccx tools document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package FemSolverCalculix +## @package solver_ccxtools # \ingroup FEM -# \brief FreeCAD FEM _FemSolverCalculix +# \brief solver calculix ccx tools object import FreeCAD @@ -35,14 +35,14 @@ from . import FemConstraint from femsolver.calculix.solver import add_attributes -class _FemSolverCalculix(FemConstraint.Proxy): +class SolverCcxTools(FemConstraint.Proxy): """The Fem::FemSolver's Proxy python type, add solver specific properties """ Type = "Fem::SolverCcxTools" def __init__(self, obj): - super(_FemSolverCalculix, self).__init__(obj) + super(SolverCcxTools, self).__init__(obj) ccx_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx") diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index c09709d196..99197351fe 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -75,6 +75,8 @@ class FemMigrateApp(object): return self if fullname == "femobjects._FemResultMechanical": return self + if fullname == "femobjects._FemSolverCalculix": + return self if fullname == "PyObjects": return self @@ -226,6 +228,9 @@ class FemMigrateApp(object): if module.__name__ == "femobjects._FemResultMechanical": import femobjects.result_mechanical module._FemResultMechanical = femobjects.result_mechanical.ResultMechanical + if module.__name__ == "femobjects._FemSolverCalculix": + import femobjects.solver_ccxtools + module._FemSolverCalculix = femobjects.solver_ccxtools.SolverCcxTools if module.__name__ == "PyObjects": module.__path__ = "PyObjects" @@ -281,8 +286,8 @@ class FemMigrateApp(object): import femobjects.result_mechanical module._FemResultMechanical = femobjects.result_mechanical.ResultMechanical if module.__name__ == "PyObjects._FemSolverCalculix": - import femobjects._FemSolverCalculix - module._FemSolverCalculix = femobjects._FemSolverCalculix._FemSolverCalculix + import femobjects.solver_ccxtools + module._FemSolverCalculix = femobjects.solver_ccxtools.SolverCcxTools if module.__name__ == "PyObjects._FemBeamSection": import femobjects.element_geometry1D @@ -322,8 +327,8 @@ class FemMigrateApp(object): import femobjects.element_geometry2D module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "_FemSolverCalculix": - import femobjects._FemSolverCalculix - module._FemSolverCalculix = femobjects._FemSolverCalculix._FemSolverCalculix + import femobjects.solver_ccxtools + module._FemSolverCalculix = femobjects.solver_ccxtools.SolverCcxTools if module.__name__ == "_FemSolverZ88": import femsolver.z88.solver module._FemSolverZ88 = femsolver.z88.solver.Proxy @@ -390,6 +395,7 @@ module="femobjects._FemMeshGroup" module="femobjects._FemMeshRegion" module="femobjects._FemMeshResult" module="femobjects._FemResultMechanical" +module="femobjects._FemSolverCalculix" 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 54dcf185a3..5cd25d99a2 100644 --- a/src/Mod/Fem/femtools/migrate_gui.py +++ b/src/Mod/Fem/femtools/migrate_gui.py @@ -73,6 +73,8 @@ class FemMigrateGui(object): return self if fullname == "femguiobjects._ViewProviderFemResultMechanical": return self + if fullname == "femguiobjects._ViewProviderFemSolverCalculix": + return self if fullname == "PyGui": return self @@ -214,6 +216,9 @@ class FemMigrateGui(object): if module.__name__ == "femguiobjects._ViewProviderFemResultMechanical": import femviewprovider.view_result_mechanical module._ViewProviderFemResultMechanical = femviewprovider.view_result_mechanical.VPResultMechanical + if module.__name__ == "femguiobjects._ViewProviderFemSolverCalculix": + import femviewprovider.view_solver_ccxtools + module._ViewProviderFemSolverCalculix = femviewprovider.view_solver_ccxtools.VPSolverCcxTools if module.__name__ == "PyGui": module.__path__ = "PyGui" @@ -269,8 +274,8 @@ class FemMigrateGui(object): import femviewprovider.view_result_mechanical module._ViewProviderFemResultMechanical = femviewprovider.view_result_mechanical.VPResultMechanical if module.__name__ == "PyGui._ViewProviderFemSolverCalculix": - import femguiobjects._ViewProviderFemSolverCalculix - module._ViewProviderFemSolverCalculix = femguiobjects._ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix + import femviewprovider.view_solver_ccxtools + module._ViewProviderFemSolverCalculix = femviewprovider.view_solver_ccxtools.VPSolverCcxTools if module.__name__ == "PyGui._ViewProviderFemBeamSection": import femviewprovider.view_element_geometry1D @@ -310,8 +315,8 @@ class FemMigrateGui(object): import femviewprovider.view_element_geometry2D module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D if module.__name__ == "_ViewProviderFemSolverCalculix": - import femguiobjects._ViewProviderFemSolverCalculix - module._ViewProviderFemSolverCalculix = femguiobjects._ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix + import femviewprovider.view_solver_ccxtools + module._ViewProviderFemSolverCalculix = femviewprovider.view_solver_ccxtools.VPSolverCcxTools if module.__name__ == "_ViewProviderFemSolverZ88": import femsolver.z88.solver module._ViewProviderFemSolverZ88 = femsolver.z88.solver.ViewProxy @@ -354,6 +359,7 @@ module="femguiobjects._ViewProviderFemMeshGroup" module="femguiobjects._ViewProviderFemMeshRegion" module="femguiobjects._ViewProviderFemMeshResult" module="femguiobjects._ViewProviderFemResultMechanical" +module="femguiobjects._ViewProviderFemSolverCalculix" third big moving from PyGui to femguiobjects, following the parent commit diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py similarity index 97% rename from src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py rename to src/Mod/Fem/femviewprovider/view_solver_ccxtools.py index 65560f1356..515e76f143 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py +++ b/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py @@ -21,13 +21,13 @@ # * * # *************************************************************************** -__title__ = "FreeCAD FEM solver calculix ViewProvider for the document object" +__title__ = "FreeCAD FEM solver calculix ccx tools ViewProvider for the document object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderFemSolverCalculix +## @package view_solver_ccxtools # \ingroup FEM -# \brief FreeCAD FEM _ViewProviderFemSolverCalculix +# \brief view provider for solver ccx tools object import os import sys @@ -41,16 +41,16 @@ import FreeCAD import FreeCADGui import FemGui -from . import ViewProviderFemConstraint +from femguiobjects import ViewProviderFemConstraint if sys.version_info.major >= 3: def unicode(text, *args): return str(text) -class _ViewProviderFemSolverCalculix(ViewProviderFemConstraint.ViewProxy): +class VPSolverCcxTools(ViewProviderFemConstraint.ViewProxy): """ - A View Provider for the FemSolverCalculix object + A View Provider for the SolverCalculix object """ def getIcon(self):