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

FEM: material common, rename class and module

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-22 01:08:08 +02:00
parent f09e7b62d0
commit 3e34731831
6 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,7 @@ SET(FemObjectsScripts_SRCS
femobjects/element_geometry1D.py
femobjects/element_geometry2D.py
femobjects/element_rotation1D.py
femobjects/_FemMaterial.py
femobjects/material_common.py
femobjects/material_mechanicalnonlinear.py
femobjects/material_reinforced.py
femobjects/mesh_boundarylayer.py
@@ -331,6 +331,7 @@ SET(FemGuiViewObjects_SRCS
femviewprovider/view_element_geometry1D.py
femviewprovider/view_element_geometry2D.py
femviewprovider/view_element_rotation1D.py
femviewprovider/view_material_common.py
femviewprovider/view_material_mechanicalnonlinear.py
femviewprovider/view_material_reinforced.py
femviewprovider/view_mesh_boundarylayer.py
@@ -344,7 +345,6 @@ SET(FemGuiViewObjects_SRCS
SET(FemGuiScripts_SRCS
femguiobjects/__init__.py
femguiobjects/_ViewProviderFemMaterial.py
femguiobjects/ViewProviderBaseObject.py
femguiobjects/ViewProviderFemConstraint.py
)

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

@@ -368,12 +368,12 @@ def makeMaterialFluid(
"""makeMaterialFluid(document, [name]):
makes a FEM Material for fluid"""
obj = doc.addObject("App::MaterialObjectPython", name)
from femobjects import _FemMaterial
_FemMaterial._FemMaterial(obj)
from femobjects import material_common
material_common.MaterialCommon(obj)
obj.Category = "Fluid"
if FreeCAD.GuiUp:
from femguiobjects import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
from femviewprovider import view_material_common
view_material_common.VPMaterialCommon(obj.ViewObject)
return obj
@@ -418,12 +418,12 @@ def makeMaterialSolid(
"""makeMaterialSolid(document, [name]):
makes a FEM Material for solid"""
obj = doc.addObject("App::MaterialObjectPython", name)
from femobjects import _FemMaterial
_FemMaterial._FemMaterial(obj)
from femobjects import material_common
material_common.MaterialCommon(obj)
obj.Category = "Solid"
if FreeCAD.GuiUp:
from femguiobjects import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
from femviewprovider import view_material_common
view_material_common.VPMaterialCommon(obj.ViewObject)
return obj

10
src/Mod/Fem/femobjects/_FemMaterial.py → src/Mod/Fem/femobjects/material_common.py
View File

@@ -26,22 +26,22 @@ __title__ = "FreeCAD FEM material document object"
__author__ = "Juergen Riegel, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package FemMaterial
## @package material_common
# \ingroup FEM
# \brief FEM material
# \brief material common object
from . import FemConstraint
class _FemMaterial(FemConstraint.Proxy):
class MaterialCommon(FemConstraint.Proxy):
"""
The FEM Material object
The MaterialCommon object
"""
Type = "Fem::MaterialCommon"
def __init__(self, obj):
super(_FemMaterial, self).__init__(obj)
super(MaterialCommon, self).__init__(obj)
self.add_properties(obj)
def onDocumentRestored(self, obj):

26
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._FemMaterial":
return self
if fullname == "femobjects._FemMaterialMechanicalNonlinear":
return self
if fullname == "femobjects._FemMaterialReinforced":
@@ -204,6 +206,9 @@ class FemMigrateApp(object):
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 = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
@@ -262,8 +267,8 @@ class FemMigrateApp(object):
import femobjects.element_rotation1D
module._FemElementRotation1D = femobjects.element_rotation1D.ElementRotation1D
if module.__name__ == "PyObjects._FemMaterial":
import femobjects._FemMaterial
module._FemMaterial = femobjects._FemMaterial._FemMaterial
import femobjects.material_common
module._FemMaterial = femobjects.material_common.MaterialCommon
if module.__name__ == "PyObjects._FemMaterialMechanicalNonlinear":
import femobjects.material_mechanicalnonlinear
module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
@@ -306,8 +311,8 @@ class FemMigrateApp(object):
import femobjects.constraint_selfweight
module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight
if module.__name__ == "_FemMaterial":
import femobjects._FemMaterial
module._FemMaterial = femobjects._FemMaterial._FemMaterial
import femobjects.material_common
module._FemMaterial = femobjects.material_common.MaterialCommon
if module.__name__ == "_FemMaterialMechanicalNonlinear":
import femobjects.material_mechanicalnonlinear
module._FemMaterialMechanicalNonlinear = femobjects.material_mechanicalnonlinear.MaterialMechanicalNonlinear
@@ -340,8 +345,8 @@ class FemMigrateApp(object):
import femobjects.result_mechanical
module.FemResult = femobjects.result_mechanical.ResultMechanical
if module.__name__ == "_MechanicalMaterial":
import femobjects._FemMaterial
module._MechanicalMaterial = femobjects._FemMaterial._FemMaterial
import femobjects.material_common
module._MechanicalMaterial = femobjects.material_common.MaterialCommon
if module.__name__ == "FemBeamSection":
import femobjects.element_geometry1D
@@ -362,11 +367,11 @@ class FemMigrateApp(object):
import femguiobjects.ViewProviderBaseObject
module._ViewProviderFemAnalysis = femguiobjects.ViewProviderBaseObject.ViewProxy
if module.__name__ == "MechanicalMaterial":
import femobjects._FemMaterial
module._MechanicalMaterial = femobjects._FemMaterial._FemMaterial
import femobjects.material_common
module._MechanicalMaterial = femobjects.material_common.MaterialCommon
if FreeCAD.GuiUp:
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
import femviewprovider.view_material_common
module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon
return None
@@ -387,6 +392,7 @@ module="femobjects._FemElementFluid1D"
module="femobjects._FemElementGeometry1D"
module="femobjects._FemElementGeometry2D"
module="femobjects._FemElementRotation1D"
module="femobjects._FemMaterial"
module="femobjects._FemMaterialMechanicalNonlinear"
module="femobjects._FemMaterialReinforced"
module="femobjects._FemMeshBoundaryLayer"

18
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._ViewProviderFemMaterial":
return self
if fullname == "femguiobjects._ViewProviderFemMaterialMechanicalNonlinear":
return self
if fullname == "femguiobjects._ViewProviderFemMaterialReinforced":
@@ -192,6 +194,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._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 = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
@@ -250,8 +255,8 @@ class FemMigrateGui(object):
import femviewprovider.view_element_rotation1D
module._ViewProviderFemElementRotation1D = femviewprovider.view_element_rotation1D.VPElementRotation1D
if module.__name__ == "PyGui._ViewProviderFemMaterial":
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderFemMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
import femviewprovider.view_material_common
module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon
if module.__name__ == "PyGui._ViewProviderFemMaterialMechanicalNonlinear":
import femviewprovider.view_material_mechanicalnonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
@@ -294,8 +299,8 @@ class FemMigrateGui(object):
import femviewprovider.view_constraint_selfweight
module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight
if module.__name__ == "_ViewProviderFemMaterial":
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderFemMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
import femviewprovider.view_material_common
module._ViewProviderFemMaterial = femviewprovider.view_material_common.VPMaterialCommon
if module.__name__ == "_ViewProviderFemMaterialMechanicalNonlinear":
import femviewprovider.view_material_mechanicalnonlinear
module._ViewProviderFemMaterialMechanicalNonlinear = femviewprovider.view_material_mechanicalnonlinear.VPMaterialMechanicalNonlinear
@@ -328,8 +333,8 @@ class FemMigrateGui(object):
import femviewprovider.view_result_mechanical
module.ViewProviderFemResult = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "_ViewProviderMechanicalMaterial":
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
import femviewprovider.view_material_common
module._ViewProviderMechanicalMaterial = femviewprovider.view_material_common.VPMaterialCommon
return None
@@ -351,6 +356,7 @@ module="femguiobjects._ViewProviderFemElementFluid1D"
module="femguiobjects._ViewProviderFemElementGeometry1D"
module="femguiobjects._ViewProviderFemElementGeometry2D"
module="femguiobjects._ViewProviderFemElementRotation1D"
module="femguiobjects._ViewProviderFemMaterial"
module="femguiobjects._ViewProviderFemMaterialMechanicalNonlinear"
module="femguiobjects._ViewProviderFemMaterialReinforced"
module="femguiobjects._ViewProviderFemMeshBoundaryLayer"

9
src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py → src/Mod/Fem/femviewprovider/view_material_common.py
View File

@@ -26,9 +26,10 @@ __title__ = "FreeCAD FEM material ViewProvider for the document object"
__author__ = "Juergen Riegel, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package _ViewProviderFemMaterial
## @package view_material_common
# \ingroup FEM
# \brief FreeCAD FEM _ViewProviderFemMaterial
# \brief view provider for common material object
import sys
from PySide import QtCore
@@ -39,16 +40,16 @@ import FreeCADGui
from FreeCAD import Units
from femguiutils import selection_widgets
from . import ViewProviderFemConstraint
from femguiobjects import ViewProviderFemConstraint
if sys.version_info.major >= 3:
unicode = str
class _ViewProviderFemMaterial(ViewProviderFemConstraint.ViewProxy):
class VPMaterialCommon(ViewProviderFemConstraint.ViewProxy):
"""
A View Provider for the FemMaterial object
A View Provider for the MaterialCommon object
"""
def getIcon(self):