From d0e4467761c991df6fc7f5b3e90c1612e067fe21 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sat, 31 Jul 2021 19:42:52 +0200 Subject: [PATCH] FEM: migrate modules, add old z88 solver module --- src/Mod/Fem/femguiutils/migrate_gui.py | 6 ++++++ src/Mod/Fem/femtools/migrate_app.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/Mod/Fem/femguiutils/migrate_gui.py b/src/Mod/Fem/femguiutils/migrate_gui.py index 9fe49f601d..f0015301ae 100644 --- a/src/Mod/Fem/femguiutils/migrate_gui.py +++ b/src/Mod/Fem/femguiutils/migrate_gui.py @@ -114,6 +114,8 @@ class FemMigrateGui(object): return self if fullname == "PyGui._ViewProviderFemSolverCalculix": return self + if fullname == "PyGui._ViewProviderFemSolverZ88": + return self if fullname == "PyGui._ViewProviderFemBeamSection": return self @@ -310,6 +312,9 @@ class FemMigrateGui(object): import femviewprovider.view_solver_ccxtools module._ViewProviderFemSolverCalculix = \ femviewprovider.view_solver_ccxtools.VPSolverCcxTools + if module.__name__ == "PyGui._ViewProviderFemSolverZ88": + import femsolver.z88.solver + module._ViewProviderFemSolverZ88 = femsolver.z88.solver.ViewProxy if module.__name__ == "PyGui._ViewProviderFemBeamSection": import femviewprovider.view_element_geometry1D @@ -434,6 +439,7 @@ module="PyGui._ViewProviderFemMeshRegion" module="PyGui._ViewProviderFemMeshResult" module="PyGui._ViewProviderFemResultMechanical" module="PyGui._ViewProviderFemSolverCalculix" +module="PyGui._ViewProviderFemSolverZ88" renamed between the second and third big moveings module="PyGui._ViewProviderFemBeamSection" diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index 3e7466b81b..27b984d8a5 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -123,6 +123,8 @@ class FemMigrateApp(object): return self if fullname == "PyObjects._FemSolverCalculix": return self + if fullname == "PyObjects._FemSolverZ88": + return self if fullname == "PyObjects._FemBeamSection": return self @@ -310,6 +312,9 @@ class FemMigrateApp(object): if module.__name__ == "PyObjects._FemSolverCalculix": import femobjects.solver_ccxtools module._FemSolverCalculix = femobjects.solver_ccxtools.SolverCcxTools + if module.__name__ == "PyObjects._FemSolverZ88": + import femsolver.z88.solver + module._FemSolverZ88 = femsolver.z88.solver.Proxy if module.__name__ == "PyObjects._FemBeamSection": import femobjects.element_geometry1D @@ -451,6 +456,7 @@ module="PyObjects._FemMeshRegion" module="PyObjects._FemMeshResult" module="PyObjects._FemResultMechanical" module="PyObjects._FemSolverCalculix" +module="PyObjects._FemSolverZ88" renamed between the second and third big moveings module="PyObjects._FemBeamSection"