kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: material mechanical nonlinear, rename class and module

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-22 01:07:49 +02:00
parent 141afdfcef
commit 04463cdc39
6 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/CMakeLists.txt
View File

@@ -249,7 +249,7 @@ SET(FemObjectsScripts_SRCS
femobjects/element_geometry2D.py
femobjects/element_rotation1D.py
femobjects/_FemMaterial.py
femobjects/_FemMaterialMechanicalNonlinear.py
femobjects/material_mechanicalnonlinear.py
femobjects/_FemMaterialReinforced.py
femobjects/_FemMeshBoundaryLayer.py
femobjects/_FemMeshGmsh.py
@@ -331,12 +331,12 @@ SET(FemGuiViewObjects_SRCS
femviewprovider/view_element_geometry1D.py
femviewprovider/view_element_geometry2D.py
femviewprovider/view_element_rotation1D.py
femviewprovider/view_material_mechanicalnonlinear.py
)
SET(FemGuiScripts_SRCS
femguiobjects/__init__.py
femguiobjects/_ViewProviderFemMaterial.py
femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py
femguiobjects/_ViewProviderFemMaterialReinforced.py
femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
femguiobjects/_ViewProviderFemMeshGmsh.py

8
src/Mod/Fem/ObjectsFem.py
View File

@@ -385,12 +385,12 @@ def makeMaterialMechanicalNonlinear(
"""makeMaterialMechanicalNonlinear(document, base_material, [name]):
creates a nonlinear material object"""
obj = doc.addObject("Fem::FeaturePython", name)
from femobjects import _FemMaterialMechanicalNonlinear
_FemMaterialMechanicalNonlinear._FemMaterialMechanicalNonlinear(obj)
from femobjects import material_mechanicalnonlinear
material_mechanicalnonlinear.MaterialMechanicalNonlinear(obj)
obj.LinearBaseMaterial = base_material
if FreeCAD.GuiUp:
from femguiobjects import _ViewProviderFemMaterialMechanicalNonlinear
_ViewProviderFemMaterialMechanicalNonlinear._ViewProviderFemMaterialMechanicalNonlinear(
from femviewprovider import view_material_mechanicalnonlinear
view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear(
obj.ViewObject
)
return obj

10
src/Mod/Fem/femobjects/_FemMaterialMechanicalNonlinear.py → src/Mod/Fem/femobjects/material_mechanicalnonlinear.py
View File

@@ -25,22 +25,22 @@ __title__ = "FreeCAD FEM material mechanical nonlinear document object"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package FemMaterialMechanicalNonLinear
## @package material_mechanicalnonlinear
# \ingroup FEM
# \brief FEM nonlinear mechanical material object
# \brief nonlinear mechanical material object
from . import FemConstraint
class _FemMaterialMechanicalNonlinear(FemConstraint.Proxy):
class MaterialMechanicalNonlinear(FemConstraint.Proxy):
"""
The FemMaterialMechanicalNonlinear object
The MaterialMechanicalNonlinear object
"""
Type = "Fem::MaterialMechanicalNonlinear"
def __init__(self, obj):
super(_FemMaterialMechanicalNonlinear, self).__init__(obj)
super(MaterialMechanicalNonlinear, self).__init__(obj)
obj.addProperty(
"App::PropertyLink",

14
src/Mod/Fem/femtools/migrate_app.py
View File

@@ -59,6 +59,8 @@ class FemMigrateApp(object):
return self
if fullname == "femobjects._FemElementRotation1D":
return self
if fullname == "femobjects._FemMaterialMechanicalNonlinear":
return self
if fullname == "PyObjects":
return self
@@ -186,6 +188,9 @@ class FemMigrateApp(object):
if module.__name__ == "femobjects._FemElementRotation1D":
import femobjects.element_rotation1D
module._FemElementRotation1D = femobjects.element_rotation1D.ElementRotation1D
if module.__name__ == "femobjects._FemMaterialMechanicalNonlinear":
import femobjects.material_mechanicalnonlinear
module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
if module.__name__ == "PyObjects":
module.__path__ = "PyObjects"
@@ -220,8 +225,8 @@ class FemMigrateApp(object):
import femobjects._FemMaterial
module._FemMaterial = femobjects._FemMaterial._FemMaterial
if module.__name__ == "PyObjects._FemMaterialMechanicalNonlinear":
import femobjects._FemMaterialMechanicalNonlinear
module._FemMaterialMechanicalNonlinear = femobjects._FemMaterialMechanicalNonlinear._FemMaterialMechanicalNonlinear
import femobjects.material_mechanicalnonlinear
module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
if module.__name__ == "PyObjects._FemMeshBoundaryLayer":
import femobjects._FemMeshBoundaryLayer
module._FemMeshBoundaryLayer = femobjects._FemMeshBoundaryLayer._FemMeshBoundaryLayer
@@ -264,8 +269,8 @@ class FemMigrateApp(object):
import femobjects._FemMaterial
module._FemMaterial = femobjects._FemMaterial._FemMaterial
if module.__name__ == "_FemMaterialMechanicalNonlinear":
import femobjects._FemMaterialMechanicalNonlinear
module._FemMaterialMechanicalNonlinear = femobjects._FemMaterialMechanicalNonlinear._FemMaterialMechanicalNonlinear
import femobjects.material_mechanicalnonlinear
module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
if module.__name__ == "_FemMeshGmsh":
import femobjects._FemMeshGmsh
module._FemMeshGmsh = femobjects._FemMeshGmsh._FemMeshGmsh
@@ -342,6 +347,7 @@ module="femobjects._FemElementFluid1D"
module="femobjects._FemElementGeometry1D"
module="femobjects._FemElementGeometry2D"
module="femobjects._FemElementRotation1D"
module="femobjects._FemMaterialMechanicalNonlinear"
third big moving
from PyObjects to femobjects, following the parent commit

14
src/Mod/Fem/femtools/migrate_gui.py
View File

@@ -57,6 +57,8 @@ class FemMigrateGui(object):
return self
if fullname == "femguiobjects._ViewProviderFemElementRotation1D":
return self
if fullname == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear":
return self
if fullname == "PyGui":
return self
@@ -174,6 +176,9 @@ class FemMigrateGui(object):
if module.__name__ == "femguiobjects._ViewProviderFemElementRotation1D":
import femviewprovider.view_element_rotation1D
module._ViewProviderFemElementRotation1D = femviewprovider.view_element_rotation1D.VPElementRotation1D
if module.__name__ == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear":
import femviewprovider.view_material_mechanicalnonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
if module.__name__ == "PyGui":
module.__path__ = "PyGui"
@@ -208,8 +213,8 @@ class FemMigrateGui(object):
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderFemMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
if module.__name__ == "PyGui._ViewProviderFemMaterialMechanicalNonlinear":
import femguiobjects._ViewProviderFemMaterialMechanicalNonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femguiobjects._ViewProviderFemMaterialMechanicalNonlinear._ViewProviderFemMaterialMechanicalNonlinear
import femviewprovider.view_material_mechanicalnonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
if module.__name__ == "PyGui._ViewProviderFemMeshBoundaryLayer":
import femguiobjects._ViewProviderFemMeshBoundaryLayer
module._ViewProviderFemMeshBoundaryLayer = femguiobjects._ViewProviderFemMeshBoundaryLayer._ViewProviderFemMeshBoundaryLayer
@@ -252,8 +257,8 @@ class FemMigrateGui(object):
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderFemMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
if module.__name__ == "_ViewProviderFemMaterialMechanicalNonlinear":
import femguiobjects._ViewProviderFemMaterialMechanicalNonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femguiobjects._ViewProviderFemMaterialMechanicalNonlinear._ViewProviderFemMaterialMechanicalNonlinear
import femviewprovider.view_material_mechanicalnonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
if module.__name__ == "_ViewProviderFemMeshGmsh":
import femguiobjects._ViewProviderFemMeshGmsh
module._ViewProviderFemMeshGmsh = femguiobjects._ViewProviderFemMeshGmsh._ViewProviderFemMeshGmsh
@@ -306,6 +311,7 @@ module="femguiobjects._ViewProviderFemElementFluid1D"
module="femguiobjects._ViewProviderFemElementGeometry1D"
module="femguiobjects._ViewProviderFemElementGeometry2D"
module="femguiobjects._ViewProviderFemElementRotation1D"
module="femguiobjects._ViewProviderFemMaterialMechanicalNonlinear"
third big moving
from PyGui to femguiobjects, following the parent commit

10
src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py → src/Mod/Fem/femviewprovider/view_material_mechanicalnonlinear.py
View File

@@ -25,16 +25,16 @@ __title__ = "FreeCAD FEM material mechanical nonlinear ViewProvider for the docu
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package ViewProviderFemMaterialMechanicalNonLinear
## @package view_material_mechanicalnonlinear
# \ingroup FEM
# \brief FreeCAD FEM _ViewProviderFemMaterialMechanicalNonlinear
# \brief view provider for material mechanical nonlinear object
from . import ViewProviderFemConstraint
from femguiobjects import ViewProviderFemConstraint
class _ViewProviderFemMaterialMechanicalNonlinear(ViewProviderFemConstraint.ViewProxy):
class VPMaterialMechanicalNonlinear(ViewProviderFemConstraint.ViewProxy):
"""
A View Provider for the FemMaterialMechanicalNonlinear object
A View Provider for the MaterialMechanicalNonlinear object
"""
pass