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

FEM: result mechanical, rename class and module

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-22 01:08:04 +02:00
parent 11de7a7ac2
commit 8c3cc8fc6c
6 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ SET(FemObjectsScripts_SRCS
femobjects/mesh_group.py
femobjects/mesh_region.py
femobjects/mesh_result.py
femobjects/_FemResultMechanical.py
femobjects/result_mechanical.py
femobjects/_FemSolverCalculix.py
femobjects/FemConstraint.py
)
@@ -338,12 +338,12 @@ SET(FemGuiViewObjects_SRCS
femviewprovider/view_mesh_group.py
femviewprovider/view_mesh_region.py
femviewprovider/view_mesh_result.py
femviewprovider/view_result_mechanical.py
)
SET(FemGuiScripts_SRCS
femguiobjects/__init__.py
femguiobjects/_ViewProviderFemMaterial.py
femguiobjects/_ViewProviderFemResultMechanical.py
femguiobjects/_ViewProviderFemSolverCalculix.py
femguiobjects/ViewProviderBaseObject.py
femguiobjects/ViewProviderFemConstraint.py

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

@@ -545,11 +545,11 @@ def makeResultMechanical(
"""makeResultMechanical(document, [name]):
creates an mechanical result object to hold FEM results"""
obj = doc.addObject("Fem::FemResultObjectPython", name)
from femobjects import _FemResultMechanical
_FemResultMechanical._FemResultMechanical(obj)
from femobjects import result_mechanical
result_mechanical.ResultMechanical(obj)
if FreeCAD.GuiUp:
from femguiobjects import _ViewProviderFemResultMechanical
_ViewProviderFemResultMechanical._ViewProviderFemResultMechanical(obj.ViewObject)
from femviewprovider import view_result_mechanical
view_result_mechanical.VPResultMechanical(obj.ViewObject)
return obj

10
src/Mod/Fem/femobjects/_FemResultMechanical.py → src/Mod/Fem/femobjects/result_mechanical.py
View File

@@ -26,22 +26,22 @@ __title__ = "FreeCAD FEM result mechanical document object"
__author__ = "Qingfeng Xia, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package FemResultMechanical
## @package result_mechanical
# \ingroup FEM
# \brief FreeCAD DocumentObject class to hold mechanical results in FEM workbench
# \brief mechanical result object
from . import FemConstraint
class _FemResultMechanical(FemConstraint.Proxy):
class ResultMechanical(FemConstraint.Proxy):
"""
The Fem::_FemResultMechanical's Proxy python type, add result specific properties
The Fem::ResultMechanical's Proxy python type, add result specific properties
"""
Type = "Fem::ResultMechanical"
def __init__(self, obj):
super(_FemResultMechanical, self).__init__(obj)
super(ResultMechanical, self).__init__(obj)
obj.addProperty(
"App::PropertyString",

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

@@ -73,6 +73,8 @@ class FemMigrateApp(object):
return self
if fullname == "femobjects._FemMeshResult":
return self
if fullname == "femobjects._FemResultMechanical":
return self
if fullname == "PyObjects":
return self
@@ -221,6 +223,9 @@ class FemMigrateApp(object):
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__ == "PyObjects":
module.__path__ = "PyObjects"
@@ -273,8 +278,8 @@ class FemMigrateApp(object):
import femobjects.mesh_result
module._FemMeshResult = femobjects.mesh_result.MeshResult
if module.__name__ == "PyObjects._FemResultMechanical":
import femobjects._FemResultMechanical
module._FemResultMechanical = femobjects._FemResultMechanical._FemResultMechanical
import femobjects.result_mechanical
module._FemResultMechanical = femobjects.result_mechanical.ResultMechanical
if module.__name__ == "PyObjects._FemSolverCalculix":
import femobjects._FemSolverCalculix
module._FemSolverCalculix = femobjects._FemSolverCalculix._FemSolverCalculix
@@ -311,8 +316,8 @@ class FemMigrateApp(object):
import femobjects.mesh_region
module._FemMeshRegion = femobjects.mesh_region.MeshRegion
if module.__name__ == "_FemResultMechanical":
import femobjects._FemResultMechanical
module._FemResultMechanical = femobjects._FemResultMechanical._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
@@ -324,11 +329,11 @@ class FemMigrateApp(object):
module._FemSolverZ88 = femsolver.z88.solver.Proxy
if module.__name__ == "_FemMechanicalResult":
import femobjects._FemResultMechanical
module._FemMechanicalResult = femobjects._FemResultMechanical._FemResultMechanical
import femobjects.result_mechanical
module._FemMechanicalResult = femobjects.result_mechanical.ResultMechanical
if module.__name__ == "FemResult":
import femobjects._FemResultMechanical
module.FemResult = femobjects._FemResultMechanical._FemResultMechanical
import femobjects.result_mechanical
module.FemResult = femobjects.result_mechanical.ResultMechanical
if module.__name__ == "_MechanicalMaterial":
import femobjects._FemMaterial
module._MechanicalMaterial = femobjects._FemMaterial._FemMaterial
@@ -384,6 +389,7 @@ module="femobjects._FemMeshGmsh"
module="femobjects._FemMeshGroup"
module="femobjects._FemMeshRegion"
module="femobjects._FemMeshResult"
module="femobjects._FemResultMechanical"
third big moving
from PyObjects to femobjects, following the parent commit

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

@@ -71,6 +71,8 @@ class FemMigrateGui(object):
return self
if fullname == "femguiobjects._ViewProviderFemMeshResult":
return self
if fullname == "femguiobjects._ViewProviderFemResultMechanical":
return self
if fullname == "PyGui":
return self
@@ -209,6 +211,9 @@ class FemMigrateGui(object):
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 = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "PyGui":
module.__path__ = "PyGui"
@@ -261,8 +266,8 @@ class FemMigrateGui(object):
import femviewprovider.view_mesh_result
module._ViewProviderFemMeshResult = femviewprovider.view_mesh_result.VPFemMeshResult
if module.__name__ == "PyGui._ViewProviderFemResultMechanical":
import femguiobjects._ViewProviderFemResultMechanical
module._ViewProviderFemResultMechanical = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical
import femviewprovider.view_result_mechanical
module._ViewProviderFemResultMechanical = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "PyGui._ViewProviderFemSolverCalculix":
import femguiobjects._ViewProviderFemSolverCalculix
module._ViewProviderFemSolverCalculix = femguiobjects._ViewProviderFemSolverCalculix._ViewProviderFemSolverCalculix
@@ -299,8 +304,8 @@ class FemMigrateGui(object):
import femviewprovider.view_mesh_region
module._ViewProviderFemMeshRegion = femviewprovider.view_mesh_region.VPMeshRegion
if module.__name__ == "_ViewProviderFemResultMechanical":
import femguiobjects._ViewProviderFemResultMechanical
module._ViewProviderFemResultMechanical = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical
import femviewprovider.view_result_mechanical
module._ViewProviderFemResultMechanical = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "_ViewProviderFemShellThickness":
import femviewprovider.view_element_geometry2D
module._ViewProviderFemShellThickness = femviewprovider.view_element_geometry2D.VPElementGeometry2D
@@ -312,11 +317,11 @@ class FemMigrateGui(object):
module._ViewProviderFemSolverZ88 = femsolver.z88.solver.ViewProxy
if module.__name__ == "_ViewProviderFemMechanicalResult":
import femguiobjects._ViewProviderFemResultMechanical
module._ViewProviderFemMechanicalResult = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical
import femviewprovider.view_result_mechanical
module._ViewProviderFemMechanicalResult = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "ViewProviderFemResult":
import femguiobjects._ViewProviderFemResultMechanical
module.ViewProviderFemResult = femguiobjects._ViewProviderFemResultMechanical._ViewProviderFemResultMechanical
import femviewprovider.view_result_mechanical
module.ViewProviderFemResult = femviewprovider.view_result_mechanical.VPResultMechanical
if module.__name__ == "_ViewProviderMechanicalMaterial":
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
@@ -348,6 +353,7 @@ module="femguiobjects._ViewProviderFemMeshGmsh"
module="femguiobjects._ViewProviderFemMeshGroup"
module="femguiobjects._ViewProviderFemMeshRegion"
module="femguiobjects._ViewProviderFemMeshResult"
module="femguiobjects._ViewProviderFemResultMechanical"
third big moving
from PyGui to femguiobjects, following the parent commit

10
src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py → src/Mod/Fem/femviewprovider/view_result_mechanical.py
View File

@@ -26,9 +26,9 @@ __title__ = "FreeCAD result mechanical ViewProvider for the document object"
__author__ = "Qingfeng Xia, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## @package _ViewProviderFemResultMechanical
## @package view_result_mechanical
# \ingroup FEM
# \brief FreeCAD ViewProvider for mechanical ResultObjectPython in FEM workbench
# \brief view provider for mechanical ResultObjectPython
import matplotlib.pyplot as plt
import numpy as np
@@ -41,13 +41,13 @@ from PySide.QtGui import QApplication
import FreeCAD
import FreeCADGui
from . import ViewProviderFemConstraint
from femguiobjects import ViewProviderFemConstraint
import femresult.resulttools as resulttools
class _ViewProviderFemResultMechanical(ViewProviderFemConstraint.ViewProxy):
class VPResultMechanical(ViewProviderFemConstraint.ViewProxy):
"""
A View Provider for the FemResultObject Python derived FemResult class
A View Provider for the ResultObject Python derived FemResult class
"""
def setEdit(self, vobj, mode=0):