FEM: shell thickness object, move make def into make objects FEM module

FreeCAD · Feb 21, 2017 · 6ffbac3 · 6ffbac3
1 parent b7111c3
commit 6ffbac3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 48 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -133,7 +133,6 @@ SET(FemScripts_SRCS
     FemMeshGroup.py
     FemMeshRegion.py
     FemMeshTools.py
-    FemShellThickness.py
     FemSolverCalculix.py
     FemSolverZ88.py
     FemTools.py

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -78,7 +78,6 @@ INSTALL(
         _TaskPanelFemBeamSection.py
         TaskPanelFemBeamSection.ui
 
-        FemShellThickness.py
         _FemShellThickness.py
         _ViewProviderFemShellThickness.py
         _CommandShellThickness.py

diff --git a/src/Mod/Fem/FemShellThickness.py b/src/Mod/Fem/FemShellThickness.py
diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py
@@ -60,6 +60,18 @@ def makeBeamSection(sectiontype='Rectangular', width=10.0, height=25.0, name="Be
     return obj
 
 
+def makeShellThickness(thickness=20.0, name="ShellThickness"):
+    '''makeShellThickness([thickness], [name]): creates an shellthickness object to define a plate thickness'''
+    obj = FreeCAD.ActiveDocument.addObject("Fem::FeaturePython", name)
+    import _FemShellThickness
+    _FemShellThickness._FemShellThickness(obj)
+    obj.Thickness = thickness
+    if FreeCAD.GuiUp:
+        import _ViewProviderFemShellThickness
+        _ViewProviderFemShellThickness._ViewProviderFemShellThickness(obj.ViewObject)
+    return obj
+
+
 ########## constraints ##########
 def makeConstraintBearing(name):
     '''makeConstraintBearing(name): makes a Fem ConstraintBearing object'''

diff --git a/src/Mod/Fem/_CommandShellThickness.py b/src/Mod/Fem/_CommandShellThickness.py
@@ -45,8 +45,8 @@ def __init__(self):
 
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create FemShellThickness")
-        FreeCADGui.addModule("FemShellThickness")
-        FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemShellThickness.makeFemShellThickness()]")
+        FreeCADGui.addModule("ObjectsFem")
+        FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeShellThickness()]")
 
 
 FreeCADGui.addCommand('Fem_ShellThickness', _CommandShellThickness())