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

FEM: migrate, improve migration class

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-18 21:16:49 +02:00
parent 702abe669f
commit e650cefbe3
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,13 +22,16 @@
# ***************************************************************************
""" Class and methods to migrate old FEM App objects
TODO more information
see module end as well as forum topic
https://forum.freecadweb.org/viewtopic.php?&t=46218
"""
__title__ = "migrate app"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
import FreeCAD
class FemMigrateApp(object):
@@ -114,6 +117,8 @@ class FemMigrateApp(object):
return self
if fullname == "FemShellThickness":
return self
if fullname == "MechanicalAnalysis":
return self
if fullname == "MechanicalMaterial":
return self
return None
@@ -240,13 +245,27 @@ class FemMigrateApp(object):
if module.__name__ == "FemBeamSection":
import femobjects._FemElementGeometry1D
module._FemBeamSection = femobjects._FemElementGeometry1D._FemElementGeometry1D
if FreeCAD.GuiUp:
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
if module.__name__ == "FemShellThickness":
import femobjects._FemElementGeometry2D
module._FemShellThickness = femobjects._FemElementGeometry2D._FemElementGeometry2D
if FreeCAD.GuiUp:
import femguiobjects._ViewProviderFemElementGeometry2D
module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D
if module.__name__ == "MechanicalAnalysis":
import femobjects.FemConstraint
module._FemAnalysis = femobjects.FemConstraint.Proxy
if FreeCAD.GuiUp:
import femguiobjects.ViewProviderBaseObject
module._ViewProviderFemAnalysis = femguiobjects.ViewProviderBaseObject.ViewProxy
if module.__name__ == "MechanicalMaterial":
import femobjects._FemMaterial
module._MechanicalMaterial = femobjects._FemMaterial._FemMaterial
if FreeCAD.GuiUp:
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
return None
@@ -309,8 +328,6 @@ https://github.com/berndhahnebach/FreeCAD_bhb/tree/c3328d6b4e/src/Mod/Fem
in this modules there where object class and viewprovider class together
module="FemBeamSection"
module="FemShellThickness"
module="MechanicalAnalysis" # TODO
module="MechanicalAnalysis"
module="MechanicalMaterial"
"""

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

@@ -22,7 +22,8 @@
# ***************************************************************************
""" Class and methods to migrate old FEM Gui objects
TODO more information
see module end as well as forum topic
https://forum.freecadweb.org/viewtopic.php?&t=46218
"""
__title__ = "migrate gui"
@@ -108,13 +109,6 @@ class FemMigrateGui(object):
if fullname == "_ViewProviderMechanicalMaterial":
return self
if fullname == "FemBeamSection":
return self
if fullname == "FemShellThickness":
return self
if fullname == "MechanicalMaterial":
return self
return None
def create_module(self, spec):
@@ -236,16 +230,6 @@ class FemMigrateGui(object):
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
if module.__name__ == "FemBeamSection":
import femguiobjects._ViewProviderFemElementGeometry1D
module._ViewProviderFemBeamSection = femguiobjects._ViewProviderFemElementGeometry1D._ViewProviderFemElementGeometry1D
if module.__name__ == "FemShellThickness":
import femguiobjects._ViewProviderFemElementGeometry2D
module._ViewProviderFemShellThickness = femguiobjects._ViewProviderFemElementGeometry2D._ViewProviderFemElementGeometry2D
if module.__name__ == "MechanicalMaterial":
import femguiobjects._ViewProviderFemMaterial
module._ViewProviderMechanicalMaterial = femguiobjects._ViewProviderFemMaterial._ViewProviderFemMaterial
return None
@@ -306,9 +290,10 @@ new obj class module names had a _
following the parent commit of the first split commit
https://github.com/berndhahnebach/FreeCAD_bhb/tree/c3328d6b4e/src/Mod/Fem
in this modules there where object class and viewprovider class together
# see migrate App
module="FemBeamSection"
module="FemShellThickness"
module="MechanicalAnalysis" # TODO
module="MechanicalAnalysis"
module="MechanicalMaterial"