suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: material object, move make def into make objects FEM module

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-02-20 17:58:59 +01:00 committed by wmayer
parent feae6513bb
commit de9b534366
6 changed files with 31 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Fem/App/CMakeLists.txt
View File

@ -134,7 +134,6 @@ SET(FemScripts_SRCS
FemTools.py
FemToolsCcx.py
FemToolsZ88.py
FemMaterial.py
FemSelectionObserver.py
ObjectsFem.py
TestFem.py

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

@ -87,7 +87,6 @@ INSTALL(
_ViewProviderFemConstraintSelfWeight.py
_CommandConstraintSelfWeight.py
FemMaterial.py
_FemMaterial.py
_ViewProviderFemMaterial.py
_CommandMaterialSolid.py

60
src/Mod/Fem/FemMaterial.py
View File

@ -1,60 +0,0 @@
# ***************************************************************************
# * *
# * Copyright (c) 2013 - Juergen Riegel <FreeCAD@juergen-riegel.net> *
# * *
# * 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__ = "FemMaterial"
__author__ = "Juergen Riegel, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## \addtogroup FEM
# @{
import FreeCAD
import _FemMaterial
def makeSolidMaterial(name):
'''makeSolidMaterial(name): makes an FEM Material for solid
'''
obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name)
_FemMaterial._FemMaterial(obj)
obj.Category = 'Solid'
if FreeCAD.GuiUp:
import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
# FreeCAD.ActiveDocument.recompute()
return obj
def makeFluidMaterial(name):
'''makeFluidMaterial(name): makes an FEM Material for fluid
'''
obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name)
_FemMaterial._FemMaterial(obj)
obj.Category = 'Fluid'
if FreeCAD.GuiUp:
import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
# FreeCAD.ActiveDocument.recompute()
return obj
makeFemMaterial = makeSolidMaterial # alias to be compatible for FemTest.py
# @}

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

@ -95,6 +95,33 @@ def makeShellThickness(thickness=20.0, name="ShellThickness"):
return obj
########## materials ##########
def makeMaterialSolid(name):
'''makeMaterialSolid(name): makes an FEM Material for solid'''
obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name)
import _FemMaterial
_FemMaterial._FemMaterial(obj)
obj.Category = 'Solid'
if FreeCAD.GuiUp:
import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
# FreeCAD.ActiveDocument.recompute()
return obj
def makeMaterialFluid(name):
'''makeMaterialFluid(name): makes an FEM Material for fluid'''
obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name)
import _FemMaterial
_FemMaterial._FemMaterial(obj)
obj.Category = 'Fluid'
if FreeCAD.GuiUp:
import _ViewProviderFemMaterial
_ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject)
# FreeCAD.ActiveDocument.recompute()
return obj
########## results ##########
def makeMechanicalResult(name="MechanicalResult"):
'''makeMechanicalResult(name): creates an mechanical object result to hold FEM results'''

5
src/Mod/Fem/TestFem.py
View File

@ -28,7 +28,6 @@ import Fem
import FemToolsCcx
import FreeCAD
import ObjectsFem
import FemMaterial
import csv
import tempfile
import unittest
@ -114,7 +113,7 @@ class FemTest(unittest.TestCase):
self.active_doc.recompute()
def create_new_material(self):
self.new_material_object = FemMaterial.makeFemMaterial('MechanicalMaterial')
self.new_material_object = ObjectsFem.makeMaterialSolid('MechanicalMaterial')
mat = self.new_material_object.Material
mat['Name'] = "Steel-Generic"
mat['YoungsModulus'] = "200000 MPa"
@ -335,7 +334,7 @@ class TherMechFemTest(unittest.TestCase):
self.active_doc.recompute()
def create_new_material(self):
self.new_material_object = FemMaterial.makeFemMaterial('MechanicalMaterial')
self.new_material_object = ObjectsFem.makeMaterialSolid('MechanicalMaterial')
mat = self.new_material_object.Material
mat['Name'] = "Steel-Generic"
mat['YoungsModulus'] = "200000 MPa"

4
src/Mod/Fem/_CommandMaterialSolid.py
View File

@ -49,8 +49,8 @@ class _CommandMaterialSolid(FemCommands):
if FreeCAD.ActiveDocument is not femDoc:
FreeCADGui.setActiveDocument(femDoc)
FreeCAD.ActiveDocument.openTransaction("Create Solid Material")
FreeCADGui.addModule("FemMaterial")
FreeCADGui.doCommand("FemMaterial.makeSolidMaterial('SolidMaterial')")
FreeCADGui.addModule("ObjectsFem")
FreeCADGui.doCommand("ObjectsFem.makeMaterialSolid('SolidMaterial')")
FreeCADGui.doCommand("App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member = App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member + [App.ActiveDocument.ActiveObject]")
FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)")