diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 12cb8bd54..5c86e29c9 100644 --- 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 index 6018a607a..d99658b04 100755 --- 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 deleted file mode 100644 index 89c95c962..000000000 --- a/src/Mod/Fem/FemShellThickness.py +++ /dev/null @@ -1,44 +0,0 @@ -# *************************************************************************** -# * * -# * Copyright (c) 2015 - Bernd Hahnebach * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU Lesser General Public License (LGPL) * -# * as published by the Free Software Foundation; either version 2 of * -# * the License, or (at your option) any later version. * -# * for detail see the LICENCE text file. * -# * * -# * This program is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# * GNU Library General Public License for more details. * -# * * -# * You should have received a copy of the GNU Library General Public * -# * License along with this program; if not, write to the Free Software * -# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -# * USA * -# * * -# *************************************************************************** - -__title__ = "FemShellThickness" -__author__ = "Bernd Hahnebach" -__url__ = "http://www.freecadweb.org" - -## \addtogroup FEM -# @{ - -import FreeCAD -import _FemShellThickness - - -def makeFemShellThickness(thickness=20.0, name="ShellThickness"): - '''makeFemShellThickness([thickness], [name]): creates an shellthickness object to define a plate thickness''' - obj = FreeCAD.ActiveDocument.addObject("Fem::FeaturePython", name) - _FemShellThickness._FemShellThickness(obj) - obj.Thickness = thickness - if FreeCAD.GuiUp: - import _ViewProviderFemShellThickness - _ViewProviderFemShellThickness._ViewProviderFemShellThickness(obj.ViewObject) - return obj - -# @} diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 96a18cd62..4bd4ba5ca 100644 --- 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 index 9e757921b..7ba1693f2 100644 --- a/src/Mod/Fem/_CommandShellThickness.py +++ b/src/Mod/Fem/_CommandShellThickness.py @@ -45,8 +45,8 @@ class _CommandShellThickness(FemCommands): 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())