From d9b5fb79dd7713fcd2a655e02c024122e4da701c Mon Sep 17 00:00:00 2001 From: james <81617086+je-cook@users.noreply.github.com> Date: Wed, 29 May 2024 11:01:24 +0100 Subject: [PATCH 1/2] Fix deprecated import style --- src/Mod/Fem/femguiutils/migrate_gui.py | 182 ++++++++-------------- src/Mod/Fem/femtools/migrate_app.py | 206 +++++++++---------------- 2 files changed, 133 insertions(+), 255 deletions(-) diff --git a/src/Mod/Fem/femguiutils/migrate_gui.py b/src/Mod/Fem/femguiutils/migrate_gui.py index ce0c5fc941..b682f73304 100644 --- a/src/Mod/Fem/femguiutils/migrate_gui.py +++ b/src/Mod/Fem/femguiutils/migrate_gui.py @@ -30,129 +30,73 @@ __title__ = "FEM GUI that migrates old scripted objects" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecad.org" +from importlib.util import spec_from_loader + class FemMigrateGui(object): - def find_module(self, fullname, path): + def find_spec(self, fullname, path, target=None): - if fullname == "femguiobjects": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintBodyHeatSource": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintElectrostaticPotential": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintFlowVelocity": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintSelfWeight": - return self - if fullname == "femguiobjects._ViewProviderFemConstraintTie": - return self - if fullname == "femguiobjects._ViewProviderFemElementFluid1D": - return self - if fullname == "femguiobjects._ViewProviderFemElementGeometry1D": - return self - if fullname == "femguiobjects._ViewProviderFemElementGeometry2D": - return self - if fullname == "femguiobjects._ViewProviderFemElementRotation1D": - return self - if fullname == "femguiobjects._ViewProviderFemMaterial": - return self - if fullname == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear": - return self - if fullname == "femguiobjects._ViewProviderFemMaterialReinforced": - return self - if fullname == "femguiobjects._ViewProviderFemMeshBoundaryLayer": - return self - if fullname == "femguiobjects._ViewProviderFemMeshGmsh": - return self - if fullname == "femguiobjects._ViewProviderFemMeshGroup": - return self - if fullname == "femguiobjects._ViewProviderFemMeshRegion": - return self - if fullname == "femguiobjects._ViewProviderFemMeshResult": - return self - if fullname == "femguiobjects._ViewProviderFemResultMechanical": - return self - if fullname == "femguiobjects._ViewProviderFemSolverCalculix": - return self - - if fullname == "PyGui": - return self - if fullname == "PyGui._ViewProviderFemConstraintBodyHeatSource": - return self - if fullname == "PyGui._ViewProviderFemConstraintElectrostaticPotential": - return self - if fullname == "PyGui._ViewProviderFemConstraintFlowVelocity": - return self - if fullname == "PyGui._ViewProviderFemConstraintSelfWeight": - return self - if fullname == "PyGui._ViewProviderFemElementFluid1D": - return self - if fullname == "PyGui._ViewProviderFemElementGeometry1D": - return self - if fullname == "PyGui._ViewProviderFemElementGeometry2D": - return self - if fullname == "PyGui._ViewProviderFemElementRotation1D": - return self - if fullname == "PyGui._ViewProviderFemMaterial": - return self - if fullname == "PyGui._ViewProviderFemMaterialMechanicalNonlinear": - return self - if fullname == "PyGui._ViewProviderFemMeshBoundaryLayer": - return self - if fullname == "PyGui._ViewProviderFemMeshGmsh": - return self - if fullname == "PyGui._ViewProviderFemMeshGroup": - return self - if fullname == "PyGui._ViewProviderFemMeshRegion": - return self - if fullname == "PyGui._ViewProviderFemMeshResult": - return self - if fullname == "PyGui._ViewProviderFemResultMechanical": - return self - if fullname == "PyGui._ViewProviderFemSolverCalculix": - return self - if fullname == "PyGui._ViewProviderFemSolverZ88": - return self - - if fullname == "PyGui._ViewProviderFemBeamSection": - return self - if fullname == "PyGui._ViewProviderFemFluidSection": - return self - if fullname == "PyGui._ViewProviderFemShellThickness": - return self - - if fullname == "_ViewProviderFemBeamSection": - return self - if fullname == "_ViewProviderFemConstraintSelfWeight": - return self - if fullname == "_ViewProviderFemMaterial": - return self - if fullname == "_ViewProviderFemMaterialMechanicalNonlinear": - return self - if fullname == "_ViewProviderFemMeshGmsh": - return self - if fullname == "_ViewProviderFemMeshGroup": - return self - if fullname == "_ViewProviderFemMeshRegion": - return self - if fullname == "_ViewProviderFemResultMechanical": - return self - if fullname == "_ViewProviderFemShellThickness": - return self - if fullname == "_ViewProviderFemSolverCalculix": - return self - if fullname == "_ViewProviderFemSolverZ88": - return self - - if fullname == "_ViewProviderFemMechanicalResult": - return self - if fullname == "ViewProviderFemResult": - return self - if fullname == "_ViewProviderMechanicalMaterial": - return self + if fullname in { + "femguiobjects", + "femguiobjects._ViewProviderFemConstraintBodyHeatSource", + "femguiobjects._ViewProviderFemConstraintElectrostaticPotential", + "femguiobjects._ViewProviderFemConstraintFlowVelocity", + "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity", + "femguiobjects._ViewProviderFemConstraintSelfWeight", + "femguiobjects._ViewProviderFemConstraintTie", + "femguiobjects._ViewProviderFemElementFluid1D", + "femguiobjects._ViewProviderFemElementGeometry1D", + "femguiobjects._ViewProviderFemElementGeometry2D", + "femguiobjects._ViewProviderFemElementRotation1D", + "femguiobjects._ViewProviderFemMaterial", + "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear", + "femguiobjects._ViewProviderFemMaterialReinforced", + "femguiobjects._ViewProviderFemMeshBoundaryLayer", + "femguiobjects._ViewProviderFemMeshGmsh", + "femguiobjects._ViewProviderFemMeshGroup", + "femguiobjects._ViewProviderFemMeshRegion", + "femguiobjects._ViewProviderFemMeshResult", + "femguiobjects._ViewProviderFemResultMechanical", + "femguiobjects._ViewProviderFemSolverCalculix", + "PyGui", + "PyGui._ViewProviderFemConstraintBodyHeatSource", + "PyGui._ViewProviderFemConstraintElectrostaticPotential", + "PyGui._ViewProviderFemConstraintFlowVelocity", + "PyGui._ViewProviderFemConstraintSelfWeight", + "PyGui._ViewProviderFemElementFluid1D", + "PyGui._ViewProviderFemElementGeometry1D", + "PyGui._ViewProviderFemElementGeometry2D", + "PyGui._ViewProviderFemElementRotation1D", + "PyGui._ViewProviderFemMaterial", + "PyGui._ViewProviderFemMaterialMechanicalNonlinear", + "PyGui._ViewProviderFemMeshBoundaryLayer", + "PyGui._ViewProviderFemMeshGmsh", + "PyGui._ViewProviderFemMeshGroup", + "PyGui._ViewProviderFemMeshRegion", + "PyGui._ViewProviderFemMeshResult", + "PyGui._ViewProviderFemResultMechanical", + "PyGui._ViewProviderFemSolverCalculix", + "PyGui._ViewProviderFemSolverZ88", + "PyGui._ViewProviderFemBeamSection", + "PyGui._ViewProviderFemFluidSection", + "PyGui._ViewProviderFemShellThickness", + "_ViewProviderFemBeamSection", + "_ViewProviderFemConstraintSelfWeight", + "_ViewProviderFemMaterial", + "_ViewProviderFemMaterialMechanicalNonlinear", + "_ViewProviderFemMeshGmsh", + "_ViewProviderFemMeshGroup", + "_ViewProviderFemMeshRegion", + "_ViewProviderFemResultMechanical", + "_ViewProviderFemShellThickness", + "_ViewProviderFemSolverCalculix", + "_ViewProviderFemSolverZ88", + "_ViewProviderFemMechanicalResult", + "ViewProviderFemResult", + "_ViewProviderMechanicalMaterial", + }: + return spec_from_loader(fullname, self) return None diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index ad3086f18b..5b6e70b426 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -30,147 +30,81 @@ __title__ = "FEM class and methods that migrates old App objects" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecad.org" +from importlib.util import spec_from_loader + import FreeCAD class FemMigrateApp(object): - def find_module(self, fullname, path): - - if fullname == "femsolver.elmer.equations": - return self - if fullname == "femsolver.elmer.equations.fluxsolver": - return self - - if fullname == "femobjects": - return self - if fullname == "femobjects._FemConstraintBodyHeatSource": - return self - if fullname == "femobjects._FemConstraintElectrostaticPotential": - return self - if fullname == "femobjects._FemConstraintFlowVelocity": - return self - if fullname == "femobjects._FemConstraintInitialFlowVelocity": - return self - if fullname == "femobjects._FemConstraintSelfWeight": - return self - if fullname == "femobjects._FemConstraintTie": - return self - if fullname == "femobjects._FemElementFluid1D": - return self - if fullname == "femobjects._FemElementGeometry1D": - return self - if fullname == "femobjects._FemElementGeometry2D": - return self - if fullname == "femobjects._FemElementRotation1D": - return self - if fullname == "femobjects._FemMaterial": - return self - if fullname == "femobjects._FemMaterialMechanicalNonlinear": - return self - if fullname == "femobjects._FemMaterialReinforced": - return self - if fullname == "femobjects._FemMeshBoundaryLayer": - return self - if fullname == "femobjects._FemMeshGmsh": - return self - if fullname == "femobjects._FemMeshGroup": - return self - if fullname == "femobjects._FemMeshRegion": - return self - if fullname == "femobjects._FemMeshResult": - return self - if fullname == "femobjects._FemResultMechanical": - return self - if fullname == "femobjects._FemSolverCalculix": - return self - - if fullname == "PyObjects": - return self - if fullname == "PyObjects._FemConstraintBodyHeatSource": - return self - if fullname == "PyObjects._FemConstraintElectrostaticPotential": - return self - if fullname == "PyObjects._FemConstraintFlowVelocity": - return self - if fullname == "PyObjects._FemConstraintInitialFlowVelocity": - return self - if fullname == "PyObjects._FemConstraintSelfWeight": - return self - if fullname == "PyObjects._FemElementFluid1D": - return self - if fullname == "PyObjects._FemElementGeometry1D": - return self - if fullname == "PyObjects._FemElementGeometry2D": - return self - if fullname == "PyObjects._FemElementRotation1D": - return self - if fullname == "PyObjects._FemMaterial": - return self - if fullname == "PyObjects._FemMaterialMechanicalNonlinear": - return self - if fullname == "PyObjects._FemMeshBoundaryLayer": - return self - if fullname == "PyObjects._FemMeshGmsh": - return self - if fullname == "PyObjects._FemMeshGroup": - return self - if fullname == "PyObjects._FemMeshRegion": - return self - if fullname == "PyObjects._FemMeshResult": - return self - if fullname == "PyObjects._FemResultMechanical": - return self - if fullname == "PyObjects._FemSolverCalculix": - return self - if fullname == "PyObjects._FemSolverZ88": - return self - - if fullname == "PyObjects._FemBeamSection": - return self - if fullname == "PyObjects._FemFluidSection": - return self - if fullname == "PyObjects._FemShellThickness": - return self - - if fullname == "_FemBeamSection": - return self - if fullname == "_FemConstraintSelfWeight": - return self - if fullname == "_FemMaterial": - return self - if fullname == "_FemMaterialMechanicalNonlinear": - return self - if fullname == "_FemMeshGmsh": - return self - if fullname == "_FemMeshGroup": - return self - if fullname == "_FemMeshRegion": - return self - if fullname == "_FemResultMechanical": - return self - if fullname == "_FemShellThickness": - return self - if fullname == "_FemSolverCalculix": - return self - if fullname == "_FemSolverZ88": - return self - - if fullname == "_FemMechanicalResult": - return self - if fullname == "FemResult": - return self - if fullname == "_MechanicalMaterial": - return self - - if fullname == "FemBeamSection": - return self - if fullname == "FemShellThickness": - return self - if fullname == "MechanicalAnalysis": - return self - if fullname == "MechanicalMaterial": - return self + def find_spec(self, fullname, path, target=None): + if fullname in { + "femsolver.elmer.equations", + "femsolver.elmer.equations.fluxsolver", + "femobjects", + "femobjects._FemConstraintBodyHeatSource", + "femobjects._FemConstraintElectrostaticPotential", + "femobjects._FemConstraintFlowVelocity", + "femobjects._FemConstraintInitialFlowVelocity", + "femobjects._FemConstraintSelfWeight", + "femobjects._FemConstraintTie", + "femobjects._FemElementFluid1D", + "femobjects._FemElementGeometry1D", + "femobjects._FemElementGeometry2D", + "femobjects._FemElementRotation1D", + "femobjects._FemMaterial", + "femobjects._FemMaterialMechanicalNonlinear", + "femobjects._FemMaterialReinforced", + "femobjects._FemMeshBoundaryLayer", + "femobjects._FemMeshGmsh", + "femobjects._FemMeshGroup", + "femobjects._FemMeshRegion", + "femobjects._FemMeshResult", + "femobjects._FemResultMechanical", + "femobjects._FemSolverCalculix", + "PyObjects", + "PyObjects._FemConstraintBodyHeatSource", + "PyObjects._FemConstraintElectrostaticPotential", + "PyObjects._FemConstraintFlowVelocity", + "PyObjects._FemConstraintInitialFlowVelocity", + "PyObjects._FemConstraintSelfWeight", + "PyObjects._FemElementFluid1D", + "PyObjects._FemElementGeometry1D", + "PyObjects._FemElementGeometry2D", + "PyObjects._FemElementRotation1D", + "PyObjects._FemMaterial", + "PyObjects._FemMaterialMechanicalNonlinear", + "PyObjects._FemMeshBoundaryLayer", + "PyObjects._FemMeshGmsh", + "PyObjects._FemMeshGroup", + "PyObjects._FemMeshRegion", + "PyObjects._FemMeshResult", + "PyObjects._FemResultMechanical", + "PyObjects._FemSolverCalculix", + "PyObjects._FemSolverZ88", + "PyObjects._FemBeamSection", + "PyObjects._FemFluidSection", + "PyObjects._FemShellThickness", + "_FemBeamSection", + "_FemConstraintSelfWeight", + "_FemMaterial", + "_FemMaterialMechanicalNonlinear", + "_FemMeshGmsh", + "_FemMeshGroup", + "_FemMeshRegion", + "_FemResultMechanical", + "_FemShellThickness", + "_FemSolverCalculix", + "_FemSolverZ88", + "_FemMechanicalResult", + "FemResult", + "_MechanicalMaterial", + "FemBeamSection", + "FemShellThickness", + "MechanicalAnalysis", + "MechanicalMaterial", + }: + return spec_from_loader(fullname, self) return None def create_module(self, spec): From ac2eb74929e259e4cfc75d39ac1c23f980a826fb Mon Sep 17 00:00:00 2001 From: james <81617086+je-cook@users.noreply.github.com> Date: Wed, 29 May 2024 11:01:35 +0100 Subject: [PATCH 2/2] black format --- src/Mod/Fem/femguiutils/migrate_gui.py | 182 ++++++++++++++++++------- src/Mod/Fem/femtools/migrate_app.py | 92 +++++++++++-- 2 files changed, 218 insertions(+), 56 deletions(-) diff --git a/src/Mod/Fem/femguiutils/migrate_gui.py b/src/Mod/Fem/femguiutils/migrate_gui.py index b682f73304..6824a4e8dd 100644 --- a/src/Mod/Fem/femguiutils/migrate_gui.py +++ b/src/Mod/Fem/femguiutils/migrate_gui.py @@ -112,220 +112,308 @@ class FemMigrateGui(object): module.__path__ = "femguiobjects" if module.__name__ == "femguiobjects._ViewProviderFemConstraintBodyHeatSource": import femviewprovider.view_constraint_bodyheatsource - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_bodyheatsource.VPConstraintBodyHeatSource + ) if module.__name__ == "femguiobjects._ViewProviderFemConstraintElectrostaticPotential": import femviewprovider.view_constraint_electrostaticpotential - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_electrostaticpotential.VPConstraintElectroStaticPotential + ) if module.__name__ == "femguiobjects._ViewProviderFemConstraintFlowVelocity": import femviewprovider.view_constraint_flowvelocity - module.ViewProxy = \ - femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity + + module.ViewProxy = femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity if module.__name__ == "femguiobjects._ViewProviderFemConstraintInitialFlowVelocity": import femviewprovider.view_constraint_initialflowvelocity - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity + ) if module.__name__ == "femguiobjects._ViewProviderFemConstraintSelfWeight": import femviewprovider.view_constraint_selfweight - module._ViewProviderFemConstraintSelfWeight = \ + + module._ViewProviderFemConstraintSelfWeight = ( femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight + ) if module.__name__ == "femguiobjects._ViewProviderFemConstraintTie": import femviewprovider.view_constraint_tie - module._ViewProviderFemConstraintTie = \ + + module._ViewProviderFemConstraintTie = ( femviewprovider.view_constraint_tie.VPConstraintTie + ) if module.__name__ == "femguiobjects._ViewProviderFemElementFluid1D": import femviewprovider.view_element_fluid1D - module._ViewProviderFemElementFluid1D = \ + + module._ViewProviderFemElementFluid1D = ( femviewprovider.view_element_fluid1D.VPElementFluid1D + ) if module.__name__ == "femguiobjects._ViewProviderFemElementGeometry1D": import femviewprovider.view_element_geometry1D - module._ViewProviderFemElementGeometry1D = \ + + module._ViewProviderFemElementGeometry1D = ( femviewprovider.view_element_geometry1D.VPElementGeometry1D + ) if module.__name__ == "femguiobjects._ViewProviderFemElementGeometry2D": import femviewprovider.view_element_geometry2D - module._ViewProviderFemElementGeometry2D = \ + + module._ViewProviderFemElementGeometry2D = ( femviewprovider.view_element_geometry2D.VPElementGeometry2D + ) if module.__name__ == "femguiobjects._ViewProviderFemElementRotation1D": import femviewprovider.view_element_rotation1D - module._ViewProviderFemElementRotation1D = \ + + module._ViewProviderFemElementRotation1D = ( femviewprovider.view_element_rotation1D.VPElementRotation1D + ) if module.__name__ == "femguiobjects._ViewProviderFemMaterial": import femviewprovider.view_material_common + module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon if module.__name__ == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear": import femviewprovider.view_material_mechanicalnonlinear - module._ViewProviderFemMaterialMechanicalNonlinear = \ + + module._ViewProviderFemMaterialMechanicalNonlinear = ( femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear + ) if module.__name__ == "femguiobjects._ViewProviderFemMaterialReinforced": import femviewprovider.view_material_reinforced - module._ViewProviderFemMaterialReinforced = \ + + module._ViewProviderFemMaterialReinforced = ( femviewprovider.view_material_reinforced.VPMaterialReinforced + ) if module.__name__ == "femguiobjects._ViewProviderFemMeshBoundaryLayer": import femviewprovider.view_mesh_boundarylayer - module._ViewProviderFemMeshBoundaryLayer = \ + + module._ViewProviderFemMeshBoundaryLayer = ( femviewprovider.view_mesh_boundarylayer.VPMeshBoundaryLayer + ) if module.__name__ == "femguiobjects._ViewProviderFemMeshGmsh": import femviewprovider.view_mesh_gmsh + module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh if module.__name__ == "femguiobjects._ViewProviderFemMeshGroup": import femviewprovider.view_mesh_group + module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup 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__ == "femguiobjects._ViewProviderFemResultMechanical": import femviewprovider.view_result_mechanical - module._ViewProviderFemResultMechanical = \ + + module._ViewProviderFemResultMechanical = ( femviewprovider.view_result_mechanical.VPResultMechanical + ) if module.__name__ == "femguiobjects._ViewProviderFemSolverCalculix": import femviewprovider.view_solver_ccxtools - module._ViewProviderFemSolverCalculix = \ + + module._ViewProviderFemSolverCalculix = ( femviewprovider.view_solver_ccxtools.VPSolverCcxTools + ) if module.__name__ == "PyGui": module.__path__ = "PyGui" if module.__name__ == "PyGui._ViewProviderFemConstraintBodyHeatSource": import femviewprovider.view_constraint_bodyheatsource - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_bodyheatsource.VPConstraintBodyHeatSource + ) if module.__name__ == "PyGui._ViewProviderFemConstraintElectrostaticPotential": import femviewprovider.view_constraint_electrostaticpotential - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_electrostaticpotential.VPConstraintElectroStaticPotential + ) if module.__name__ == "PyGui._ViewProviderFemConstraintFlowVelocity": import femviewprovider.view_constraint_flowvelocity - module.ViewProxy = \ - femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity + + module.ViewProxy = femviewprovider.view_constraint_flowvelocity.VPConstraintFlowVelocity if module.__name__ == "PyGui._ViewProviderFemConstraintInitialFlowVelocity": import femviewprovider.view_constraint_initialflowvelocity - module.ViewProxy = \ + + module.ViewProxy = ( femviewprovider.view_constraint_initialflowvelocity.VPConstraintInitialFlowVelocity + ) if module.__name__ == "PyGui._ViewProviderFemConstraintSelfWeight": import femviewprovider.view_constraint_selfweight - module._ViewProviderFemConstraintSelfWeight = \ + + module._ViewProviderFemConstraintSelfWeight = ( femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight + ) if module.__name__ == "PyGui._ViewProviderFemElementFluid1D": import femviewprovider.view_element_fluid1D - module._ViewProviderFemElementFluid1D = \ + + module._ViewProviderFemElementFluid1D = ( femviewprovider.view_element_fluid1D.VPElementFluid1D + ) if module.__name__ == "PyGui._ViewProviderFemElementGeometry1D": import femviewprovider.view_element_geometry1D - module._ViewProviderFemElementGeometry1D = \ + + module._ViewProviderFemElementGeometry1D = ( femviewprovider.view_element_geometry1D.VPElementGeometry1D + ) if module.__name__ == "PyGui._ViewProviderFemElementGeometry2D": import femviewprovider.view_element_geometry2D - module._ViewProviderFemElementGeometry2D = \ + + module._ViewProviderFemElementGeometry2D = ( femviewprovider.view_element_geometry2D.VPElementGeometry2D + ) if module.__name__ == "PyGui._ViewProviderFemElementRotation1D": import femviewprovider.view_element_rotation1D - module._ViewProviderFemElementRotation1D = \ + + module._ViewProviderFemElementRotation1D = ( femviewprovider.view_element_rotation1D.VPElementRotation1D + ) if module.__name__ == "PyGui._ViewProviderFemMaterial": import femviewprovider.view_material_common - module._ViewProviderFemMaterial = \ - femviewprovider.view_material_common.VPMaterialCommon + + module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon if module.__name__ == "PyGui._ViewProviderFemMaterialMechanicalNonlinear": import femviewprovider.view_material_mechanicalnonlinear - module._ViewProviderFemMaterialMechanicalNonlinear = \ + + module._ViewProviderFemMaterialMechanicalNonlinear = ( femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear + ) if module.__name__ == "PyGui._ViewProviderFemMeshBoundaryLayer": import femviewprovider.view_mesh_boundarylayer - module._ViewProviderFemMeshBoundaryLayer = \ + + module._ViewProviderFemMeshBoundaryLayer = ( femviewprovider.view_mesh_boundarylayer.VPMeshBoundaryLayer + ) if module.__name__ == "PyGui._ViewProviderFemMeshGmsh": import femviewprovider.view_mesh_gmsh + module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh if module.__name__ == "PyGui._ViewProviderFemMeshGroup": import femviewprovider.view_mesh_group + module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup if module.__name__ == "PyGui._ViewProviderFemMeshRegion": import femviewprovider.view_mesh_region + module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion if module.__name__ == "PyGui._ViewProviderFemMeshResult": import femviewprovider.view_mesh_result + module._ViewProviderFemMeshResult = femviewprovider.view_mesh_result.VPFemMeshResult if module.__name__ == "PyGui._ViewProviderFemResultMechanical": import femviewprovider.view_result_mechanical - module._ViewProviderFemResultMechanical = \ + + module._ViewProviderFemResultMechanical = ( femviewprovider.view_result_mechanical.VPResultMechanical + ) if module.__name__ == "PyGui._ViewProviderFemSolverCalculix": import femviewprovider.view_solver_ccxtools - module._ViewProviderFemSolverCalculix = \ + + 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 - module._ViewProviderFemBeamSection = \ + + module._ViewProviderFemBeamSection = ( femviewprovider.view_element_geometry1D.VPElementGeometry1D + ) if module.__name__ == "PyGui._ViewProviderFemFluidSection": import femviewprovider.view_element_fluid1D - module._ViewProviderFemFluidSection = \ + + module._ViewProviderFemFluidSection = ( femviewprovider.view_element_fluid1D.VPElementFluid1D + ) if module.__name__ == "PyGui._ViewProviderFemShellThickness": import femviewprovider.view_element_geometry2D - module._ViewProviderFemShellThickness = \ + + module._ViewProviderFemShellThickness = ( femviewprovider.view_element_geometry2D.VPElementGeometry2D + ) if module.__name__ == "_ViewProviderFemBeamSection": import femviewprovider.view_element_geometry1D - module._ViewProviderFemBeamSection = \ + + module._ViewProviderFemBeamSection = ( femviewprovider.view_element_geometry1D.VPElementGeometry1D + ) if module.__name__ == "_ViewProviderFemConstraintSelfWeight": import femviewprovider.view_constraint_selfweight - module._ViewProviderFemConstraintSelfWeight = \ + + module._ViewProviderFemConstraintSelfWeight = ( femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight + ) if module.__name__ == "_ViewProviderFemMaterial": import femviewprovider.view_material_common - module._ViewProviderFemMaterial = \ - femviewprovider.view_material_common.VPMaterialCommon + + module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon if module.__name__ == "_ViewProviderFemMaterialMechanicalNonlinear": import femviewprovider.view_material_mechanicalnonlinear - module._ViewProviderFemMaterialMechanicalNonlinear = \ + + module._ViewProviderFemMaterialMechanicalNonlinear = ( femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear + ) if module.__name__ == "_ViewProviderFemMeshGmsh": import femviewprovider.view_mesh_gmsh + module._ViewProviderFemMeshGmsh = femviewprovider.view_mesh_gmsh.VPMeshGmsh if module.__name__ == "_ViewProviderFemMeshGroup": import femviewprovider.view_mesh_group + module._ViewProviderFemMeshGroup = femviewprovider.view_mesh_group.VPMeshGroup if module.__name__ == "_ViewProviderFemMeshRegion": import femviewprovider.view_mesh_region + module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion if module.__name__ == "_ViewProviderFemResultMechanical": import femviewprovider.view_result_mechanical - module._ViewProviderFemResultMechanical = \ + + module._ViewProviderFemResultMechanical = ( femviewprovider.view_result_mechanical.VPResultMechanical + ) if module.__name__ == "_ViewProviderFemShellThickness": import femviewprovider.view_element_geometry2D - module._ViewProviderFemShellThickness = \ + + module._ViewProviderFemShellThickness = ( femviewprovider.view_element_geometry2D.VPElementGeometry2D + ) if module.__name__ == "_ViewProviderFemSolverCalculix": import femviewprovider.view_solver_ccxtools - module._ViewProviderFemSolverCalculix = \ + + module._ViewProviderFemSolverCalculix = ( femviewprovider.view_solver_ccxtools.VPSolverCcxTools + ) if module.__name__ == "_ViewProviderFemSolverZ88": import femsolver.z88.solver + module._ViewProviderFemSolverZ88 = femsolver.z88.solver.ViewProxy if module.__name__ == "_ViewProviderFemMechanicalResult": import femviewprovider.view_result_mechanical - module._ViewProviderFemMechanicalResult = \ + + module._ViewProviderFemMechanicalResult = ( femviewprovider.view_result_mechanical.VPResultMechanical + ) if module.__name__ == "ViewProviderFemResult": import femviewprovider.view_result_mechanical - module.ViewProviderFemResult = \ - femviewprovider.view_result_mechanical.VPResultMechanical + + module.ViewProviderFemResult = femviewprovider.view_result_mechanical.VPResultMechanical if module.__name__ == "_ViewProviderMechanicalMaterial": import femviewprovider.view_material_common - module._ViewProviderMechanicalMaterial = \ + + module._ViewProviderMechanicalMaterial = ( femviewprovider.view_material_common.VPMaterialCommon + ) return None diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py index 5b6e70b426..26c9085c6b 100644 --- a/src/Mod/Fem/femtools/migrate_app.py +++ b/src/Mod/Fem/femtools/migrate_app.py @@ -119,6 +119,7 @@ class FemMigrateApp(object): return self if module.__name__ == "femsolver.elmer.equations.fluxsolver": import femsolver.elmer.equations.flux + module.Proxy = femsolver.elmer.equations.flux.Proxy if FreeCAD.GuiUp: module.ViewProxy = femsolver.elmer.equations.flux.ViewProxy @@ -127,212 +128,285 @@ class FemMigrateApp(object): module.__path__ = "femobjects" if module.__name__ == "femobjects._FemConstraintBodyHeatSource": import femobjects.constraint_bodyheatsource + module.Proxy = femobjects.constraint_bodyheatsource.ConstraintBodyHeatSource if module.__name__ == "femobjects._FemConstraintElectrostaticPotential": import femobjects.constraint_electrostaticpotential - module.Proxy = \ + + module.Proxy = ( femobjects.constraint_electrostaticpotential.ConstraintElectrostaticPotential + ) 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__ == "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__ == "femobjects._FemElementFluid1D": import femobjects.element_fluid1D + module._FemElementFluid1D = femobjects.element_fluid1D.ElementFluid1D if module.__name__ == "femobjects._FemElementGeometry1D": import femobjects.element_geometry1D + module._FemElementGeometry1D = femobjects.element_geometry1D.ElementGeometry1D if module.__name__ == "femobjects._FemElementGeometry2D": import femobjects.element_geometry2D + module._FemElementGeometry2D = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "femobjects._FemElementRotation1D": import femobjects.element_rotation1D + module._FemElementRotation1D = femobjects.element_rotation1D.ElementRotation1D if module.__name__ == "femobjects._FemMaterial": import femobjects.material_common + module._FemMaterial = femobjects.material_common.MaterialCommon if module.__name__ == "femobjects._FemMaterialMechanicalNonlinear": import femobjects.material_mechanicalnonlinear - module._FemMaterialMechanicalNonlinear = \ + + module._FemMaterialMechanicalNonlinear = ( femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear + ) if module.__name__ == "femobjects._FemMaterialReinforced": import femobjects.material_reinforced + module._FemMaterialReinforced = femobjects.material_reinforced.MaterialReinforced if module.__name__ == "femobjects._FemMeshBoundaryLayer": import femobjects.mesh_boundarylayer + module._FemMeshBoundaryLayer = femobjects.mesh_boundarylayer.MeshBoundaryLayer if module.__name__ == "femobjects._FemMeshGmsh": import femobjects.mesh_gmsh + module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh if module.__name__ == "femobjects._FemMeshGroup": import femobjects.mesh_group + module._FemMeshGroup = femobjects.mesh_group.MeshGroup 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__ == "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" if module.__name__ == "PyObjects._FemConstraintBodyHeatSource": import femobjects.constraint_bodyheatsource + module.Proxy = femobjects.constraint_bodyheatsource.ConstraintBodyHeatSource if module.__name__ == "PyObjects._FemConstraintElectrostaticPotential": import femobjects.constraint_electrostaticpotential - module.Proxy = \ + + module.Proxy = ( femobjects.constraint_electrostaticpotential.ConstraintElectrostaticPotential + ) if module.__name__ == "PyObjects._FemConstraintFlowVelocity": import femobjects.constraint_flowvelocity + module.Proxy = femobjects.constraint_flowvelocity.ConstraintFlowVelocity if module.__name__ == "PyObjects._FemConstraintInitialFlowVelocity": import femobjects.constraint_initialflowvelocity + module.Proxy = femobjects.constraint_initialflowvelocity.ConstraintInitialFlowVelocity if module.__name__ == "PyObjects._FemConstraintSelfWeight": import femobjects.constraint_selfweight + module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight if module.__name__ == "PyObjects._FemElementFluid1D": import femobjects.element_fluid1D + module._FemElementFluid1D = femobjects.element_fluid1D.ElementFluid1D if module.__name__ == "PyObjects._FemElementGeometry1D": import femobjects.element_geometry1D + module._FemElementGeometry1D = femobjects.element_geometry1D.ElementGeometry1D if module.__name__ == "PyObjects._FemElementGeometry2D": import femobjects.element_geometry2D + module._FemElementGeometry2D = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "PyObjects._FemElementRotation1D": import femobjects.element_rotation1D + module._FemElementRotation1D = femobjects.element_rotation1D.ElementRotation1D if module.__name__ == "PyObjects._FemMaterial": import femobjects.material_common + module._FemMaterial = femobjects.material_common.MaterialCommon if module.__name__ == "PyObjects._FemMaterialMechanicalNonlinear": import femobjects.material_mechanicalnonlinear - module._FemMaterialMechanicalNonlinear = \ + + module._FemMaterialMechanicalNonlinear = ( femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear + ) if module.__name__ == "PyObjects._FemMeshBoundaryLayer": import femobjects.mesh_boundarylayer + module._FemMeshBoundaryLayer = femobjects.mesh_boundarylayer.MeshBoundaryLayer if module.__name__ == "PyObjects._FemMeshGmsh": import femobjects.mesh_gmsh + module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh if module.__name__ == "PyObjects._FemMeshGroup": import femobjects.mesh_group + module._FemMeshGroup = femobjects.mesh_group.MeshGroup if module.__name__ == "PyObjects._FemMeshRegion": import femobjects.mesh_region + module._FemMeshRegion = femobjects.mesh_region.MeshRegion if module.__name__ == "PyObjects._FemMeshResult": import femobjects.mesh_result + module._FemMeshResult = femobjects.mesh_result.MeshResult if module.__name__ == "PyObjects._FemResultMechanical": import femobjects.result_mechanical + module._FemResultMechanical = femobjects.result_mechanical.ResultMechanical 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 + module._FemBeamSection = femobjects.element_geometry1D.ElementGeometry1D if module.__name__ == "PyObjects._FemFluidSection": import femobjects.element_fluid1D + module._FemFluidSection = femobjects.element_fluid1D.ElementFluid1D if module.__name__ == "PyObjects._FemShellThickness": import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "_FemBeamSection": import femobjects.element_geometry1D + module._FemBeamSection = femobjects.element_geometry1D.ElementGeometry1D if module.__name__ == "_FemConstraintSelfWeight": import femobjects.constraint_selfweight + module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight if module.__name__ == "_FemMaterial": import femobjects.material_common + module._FemMaterial = femobjects.material_common.MaterialCommon if module.__name__ == "_FemMaterialMechanicalNonlinear": import femobjects.material_mechanicalnonlinear - module._FemMaterialMechanicalNonlinear = \ + + module._FemMaterialMechanicalNonlinear = ( femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear + ) if module.__name__ == "_FemMeshGmsh": import femobjects.mesh_gmsh + module._FemMeshGmsh = femobjects.mesh_gmsh.MeshGmsh if module.__name__ == "_FemMeshGroup": import femobjects.mesh_group + module._FemMeshGroup = femobjects.mesh_group.MeshGroup if module.__name__ == "_FemMeshRegion": import femobjects.mesh_region + module._FemMeshRegion = femobjects.mesh_region.MeshRegion if module.__name__ == "_FemResultMechanical": import femobjects.result_mechanical + module._FemResultMechanical = femobjects.result_mechanical.ResultMechanical if module.__name__ == "_FemShellThickness": import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if module.__name__ == "_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 if module.__name__ == "_FemMechanicalResult": import femobjects.result_mechanical + module._FemMechanicalResult = femobjects.result_mechanical.ResultMechanical if module.__name__ == "FemResult": import femobjects.result_mechanical + module.FemResult = femobjects.result_mechanical.ResultMechanical if module.__name__ == "_MechanicalMaterial": import femobjects.material_common + module._MechanicalMaterial = femobjects.material_common.MaterialCommon if module.__name__ == "FemBeamSection": import femobjects.element_geometry1D + module._FemBeamSection = femobjects.element_geometry1D.ElementGeometry1D if FreeCAD.GuiUp: import femviewprovider.view_element_geometry1D - module._ViewProviderFemBeamSection = \ + + module._ViewProviderFemBeamSection = ( femviewprovider.view_element_geometry1D.VPElementGeometry1D + ) if module.__name__ == "FemShellThickness": import femobjects.element_geometry2D + module._FemShellThickness = femobjects.element_geometry2D.ElementGeometry2D if FreeCAD.GuiUp: import femviewprovider.view_element_geometry2D - module._ViewProviderFemShellThickness = \ + + module._ViewProviderFemShellThickness = ( femviewprovider.view_element_geometry2D.VPElementGeometry2D + ) if module.__name__ == "MechanicalAnalysis": import femobjects.base_fempythonobject + module._FemAnalysis = femobjects.base_fempythonobject.BaseFemPythonObject if FreeCAD.GuiUp: import femviewprovider.view_base_femobject - module._ViewProviderFemAnalysis = \ + + module._ViewProviderFemAnalysis = ( femviewprovider.view_base_femobject.VPBaseFemObject + ) if module.__name__ == "MechanicalMaterial": import femobjects.material_common + module._MechanicalMaterial = femobjects.material_common.MaterialCommon if FreeCAD.GuiUp: import femviewprovider.view_material_common - module._ViewProviderMechanicalMaterial = \ + + module._ViewProviderMechanicalMaterial = ( femviewprovider.view_material_common.VPMaterialCommon + ) return None