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

FEM: element geometry 1D, rename class and module

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-22 01:07:43 +02:00
parent 19ff305189
commit 90d9b439ac
6 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ SET(FemObjectsScripts_SRCS
femobjects/constraint_selfweight.py
femobjects/constraint_tie.py
femobjects/element_fluid1D.py
femobjects/_FemElementGeometry1D.py
femobjects/element_geometry1D.py
femobjects/_FemElementGeometry2D.py
femobjects/_FemElementRotation1D.py
femobjects/_FemMaterial.py
@@ -328,11 +328,11 @@ SET(FemGuiViewObjects_SRCS
femviewprovider/view_constraint_selfweight.py
femviewprovider/view_constraint_tie.py
femviewprovider/view_element_fluid1D.py
femviewprovider/view_element_geometry1D.py
)
SET(FemGuiScripts_SRCS
femguiobjects/__init__.py
femguiobjects/_ViewProviderFemElementGeometry1D.py
femguiobjects/_ViewProviderFemElementGeometry2D.py
femguiobjects/_ViewProviderFemElementRotation1D.py
femguiobjects/_ViewProviderFemMaterial.py

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

@@ -309,9 +309,9 @@ def makeElementGeometry1D(
"""makeElementGeometry1D(document, [width], [height], [name]):
creates an 1D geometry element object to define a cross section"""
obj = doc.addObject("Fem::FeaturePython", name)
from femobjects import _FemElementGeometry1D
_FemElementGeometry1D._FemElementGeometry1D(obj)
sec_types = _FemElementGeometry1D._FemElementGeometry1D.known_beam_types
from femobjects import element_geometry1D
element_geometry1D.ElementGeometry1D(obj)
sec_types = element_geometry1D.ElementGeometry1D.known_beam_types
if sectiontype not in sec_types:
FreeCAD.Console.PrintError("Section type is not known. Set to " + sec_types[0] + " \n")
obj.SectionType = sec_types[0]
@@ -323,8 +323,8 @@ def makeElementGeometry1D(
obj.PipeDiameter = height
obj.PipeThickness = width
if FreeCAD.GuiUp:
from femguiobjects import _ViewProviderFemElementGeometry1D
_ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D(obj.ViewObject)
from femviewprovider import view_element_geometry1D
view_element_geometry1D.VPElementGeometry1D(obj.ViewObject)
return obj

12
src/Mod/Fem/femobjects/_FemElementGeometry1D.py → src/Mod/Fem/femobjects/element_geometry1D.py
View File

@@ -25,23 +25,23 @@ __title__ = "FreeCAD FEM element geometry 1D document object"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package FemElementGeometry1D
## @package element_geometry1D
# \ingroup FEM
# \brief FreeCAD FEM element geometry 1D object
# \brief element geometry 1D object
from . import FemConstraint
class _FemElementGeometry1D(FemConstraint.Proxy):
class ElementGeometry1D(FemConstraint.Proxy):
"""
The FemElementGeometry1D object
The ElementGeometry1D object
"""
Type = "Fem::ElementGeometry1D"
known_beam_types = ["Rectangular", "Circular", "Pipe"]
def __init__(self, obj):
super(_FemElementGeometry1D, self).__init__(obj)
super(ElementGeometry1D, self).__init__(obj)
obj.addProperty(
"App::PropertyLength",
@@ -92,5 +92,5 @@ class _FemElementGeometry1D(FemConstraint.Proxy):
"List of beam section shapes"
)
obj.SectionType = _FemElementGeometry1D.known_beam_types
obj.SectionType = ElementGeometry1D.known_beam_types
obj.SectionType = "Rectangular"

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

@@ -53,6 +53,8 @@ class FemMigrateApp(object):
return self
if fullname == "femobjects._FemElementFluid1D":
return self
if fullname == "femobjects._FemElementGeometry1D":
return self
if fullname == "PyObjects":
return self
@@ -171,6 +173,9 @@ class FemMigrateApp(object):
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__ == "PyObjects":
module.__path__ = "PyObjects"
@@ -193,8 +198,8 @@ class FemMigrateApp(object):
import femobjects.element_fluid1D
module._FemElementFluid1D = femobjects.element_fluid1D.ElementFluid1D
if module.__name__ == "PyObjects._FemElementGeometry1D":
import femobjects._FemElementGeometry1D
module._FemElementGeometry1D = femobjects._FemElementGeometry1D._FemElementGeometry1D
import femobjects.element_geometry1D
module._FemElementGeometry1D = femobjects.element_geometry1D.ElementGeometry1D
if module.__name__ == "PyObjects._FemElementGeometry2D":
import femobjects._FemElementGeometry2D
module._FemElementGeometry2D = femobjects._FemElementGeometry2D._FemElementGeometry2D
@@ -230,8 +235,8 @@ class FemMigrateApp(object):
module._FemSolverCalculix = femobjects._FemSolverCalculix._FemSolverCalculix
if module.__name__ == "PyObjects._FemBeamSection":
import femobjects._FemElementGeometry1D
module._FemBeamSection = femobjects._FemElementGeometry1D._FemElementGeometry1D
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
@@ -240,8 +245,8 @@ class FemMigrateApp(object):
module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D
if module.__name__ == "_FemBeamSection":
import femobjects._FemElementGeometry1D
module._FemBeamSection = femobjects._FemElementGeometry1D._FemElementGeometry1D
import femobjects.element_geometry1D
module._FemBeamSection = femobjects.element_geometry1D.ElementGeometry1D
if module.__name__ == "_FemConstraintSelfWeight":
import femobjects.constraint_selfweight
module._FemConstraintSelfWeight = femobjects.constraint_selfweight.ConstraintSelfWeight
@@ -284,11 +289,11 @@ class FemMigrateApp(object):
module._MechanicalMaterial = femobjects._FemMaterial._FemMaterial
if module.__name__ == "FemBeamSection":
import femobjects._FemElementGeometry1D
module._FemBeamSection = femobjects._FemElementGeometry1D._FemElementGeometry1D
import femobjects.element_geometry1D
module._FemBeamSection = femobjects.element_geometry1D.ElementGeometry1D
if FreeCAD.GuiUp:
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
import femviewprovider.view_element_geometry1D
module._ViewProviderFemBeamSection = femviewprovider.view_element_geometry1D.VPElementGeometry1D
if module.__name__ == "FemShellThickness":
import femobjects._FemElementGeometry2D
module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D
@@ -324,6 +329,7 @@ module="femobjects._FemConstraintInitialFlowVelocity"
module="femobjects._FemConstraintSelfWeight"
module="femobjects._FemConstraintTie"
module="femobjects._FemElementFluid1D"
module="femobjects._FemElementGeometry1D"
third big moving
from PyObjects to femobjects, following the parent commit

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

@@ -51,6 +51,8 @@ class FemMigrateGui(object):
return self
if fullname == "femguiobjects._ViewProviderFemElementFluid1D":
return self
if fullname == "femguiobjects._ViewProviderFemElementGeometry1D":
return self
if fullname == "PyGui":
return self
@@ -159,7 +161,10 @@ class FemMigrateGui(object):
if module.__name__ == "femguiobjects._ViewProviderFemElementFluid1D":
import femviewprovider.view_element_fluid1D
module._ViewProviderFemElementFluid1D = femviewprovider.view_element_fluid1D.VPElementFluid1D
if module.__name__ == "femguiobjects._ViewProviderFemElementGeometry1D":
import femviewprovider.view_element_geometry1D
module._ViewProviderFemElementGeometry1D = femviewprovider.view_element_geometry1D.VPElementGeometry1D
if module.__name__ == "PyGui":
module.__path__ = "PyGui"
if module.__name__ == "PyGui._ViewProviderFemConstraintBodyHeatSource":
@@ -181,8 +186,8 @@ class FemMigrateGui(object):
import femviewprovider.view_element_fluid1D
module._ViewProviderFemElementFluid1D = femviewprovider.view_element_fluid1D.VPElementFluid1D
if module.__name__ == "PyGui._ViewProviderFemElementGeometry1D":
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemElementGeometry1D = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
import femviewprovider.view_element_geometry1D
module._ViewProviderFemElementGeometry1D = femviewprovider.view_element_geometry1D.VPElementGeometry1D
if module.__name__ == "PyGui._ViewProviderFemElementGeometry2D":
import femguiobjects._ViewProviderFemElementGeometry2D
module._ViewProviderFemElementGeometry2D = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D
@@ -218,8 +223,8 @@ class FemMigrateGui(object):
module._ViewProviderFemSolverCalculix = femguiobjects._ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix
if module.__name__ == "PyGui._ViewProviderFemBeamSection":
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
import femviewprovider.view_element_geometry1D
module._ViewProviderFemBeamSection = femviewprovider.view_element_geometry1D.VPElementGeometry1D
if module.__name__ == "PyGui._ViewProviderFemFluidSection":
import femviewprovider.view_element_fluid1D
module._ViewProviderFemFluidSection = femviewprovider.view_element_fluid1D.VPElementFluid1D
@@ -228,8 +233,8 @@ class FemMigrateGui(object):
module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D
if module.__name__ == "_ViewProviderFemBeamSection":
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
import femviewprovider.view_element_geometry1D
module._ViewProviderFemBeamSection = femviewprovider.view_element_geometry1D.VPElementGeometry1D
if module.__name__ == "_ViewProviderFemConstraintSelfWeight":
import femviewprovider.view_constraint_selfweight
module._ViewProviderFemConstraintSelfWeight = femviewprovider.view_constraint_selfweight.VPConstraintSelfWeight
@@ -288,6 +293,7 @@ module="femguiobjects._ViewProviderFemConstraintInitialFlowVelocity"
module="femguiobjects._ViewProviderFemConstraintSelfWeight"
module="femguiobjects._ViewProviderFemConstraintTie"
module="femguiobjects._ViewProviderFemElementFluid1D"
module="femguiobjects._ViewProviderFemElementGeometry1D"
third big moving
from PyGui to femguiobjects, following the parent commit

17
src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py → src/Mod/Fem/femviewprovider/view_element_geometry1D.py
View File

@@ -25,9 +25,9 @@ __title__ = "FreeCAD FEM element geometry 1D ViewProvider for the document objec
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package ViewProviderFemElementGeometry1D
## @package view_element_geometry1D
# \ingroup FEM
# \brief FreeCAD FEM _ViewProviderFemElementGeometry1D
# \brief view provider for element geometry 1D object
from PySide import QtCore
@@ -35,13 +35,13 @@ import FreeCAD
import FreeCADGui
from femguiutils import selection_widgets
from . import ViewProviderFemConstraint
from femobjects import _FemElementGeometry1D
from femguiobjects import ViewProviderFemConstraint
from femobjects import element_geometry1D
class _ViewProviderFemElementGeometry1D(ViewProviderFemConstraint.ViewProxy):
class VPElementGeometry1D(ViewProviderFemConstraint.ViewProxy):
"""
A View Provider for the FemElementGeometry1D object
A View Provider for the ElementGeometry1D object
"""
def setEdit(self, vobj, mode=0):
@@ -55,7 +55,7 @@ class _ViewProviderFemElementGeometry1D(ViewProviderFemConstraint.ViewProxy):
class _TaskPanel:
"""
The TaskPanel for editing References property of FemElementGeometry1D objects
The TaskPanel for editing References property of ElementGeometry1D objects
"""
def __init__(self, obj):
@@ -97,9 +97,8 @@ class _TaskPanel:
self.pipe_thickness_changed
)
# it is inside the class thus double _FemElementGeometry1D
self.parameterWidget.cb_crosssectiontype.addItems(
_FemElementGeometry1D._FemElementGeometry1D.known_beam_types
element_geometry1D.ElementGeometry1D.known_beam_types
)
self.get_beamsection_props()
self.updateParameterWidget()