diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index c30e8654e82d..5d66dc2a51ee 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -126,7 +126,6 @@ SET(FemScripts_SRCS FemInputWriterCcx.py FemInputWriterZ88.py FemMaterialMechanicalNonlinear.py - FemMechanicalResult.py FemMesh2Mesh.py FemMeshGmsh.py FemMeshGroup.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index cfd6d8b0c8b7..be67e72e5177 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -37,7 +37,6 @@ INSTALL( _CommandRunSolver.py _CommandControlSolver.py - FemMechanicalResult.py _FemMechanicalResult.py _ViewProviderFemMechanicalResult.py _CommandShowResult.py diff --git a/src/Mod/Fem/FemMechanicalResult.py b/src/Mod/Fem/FemMechanicalResult.py deleted file mode 100644 index aa4b6c19d00a..000000000000 --- a/src/Mod/Fem/FemMechanicalResult.py +++ /dev/null @@ -1,43 +0,0 @@ -#*************************************************************************** -#* * -#* Copyright (c) 2016 - Qingfeng Xia * -#* * -#* 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__ = "module to make a mechanical FEM result object" -__author__ = "Qingfeng Xia, Bernd Hahnebach" -__url__ = "http://www.freecadweb.org" - -## \addtogroup FEM -# \brief FreeCAD module to make mechanical result object in FEM workbench -# @{ - -import FreeCAD -import _FemMechanicalResult - - -def makeFemMechanicalResult(result_obj_name): - obj = FreeCAD.ActiveDocument.addObject('Fem::FemResultObjectPython', result_obj_name) - _FemMechanicalResult._FemMechanicalResult(obj) - if FreeCAD.GuiUp: - from _ViewProviderFemMechanicalResult import _ViewProviderFemMechanicalResult - _ViewProviderFemMechanicalResult(obj.ViewObject) - return obj - -# @} diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 497fbf9d2421..52e5f301630d 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -95,6 +95,18 @@ def makeShellThickness(thickness=20.0, name="ShellThickness"): return obj +########## results ########## +def makeMechanicalResult(name="MechanicalResult"): + '''makeMechanicalResult(name): creates an mechanical object result to hold FEM results''' + obj = FreeCAD.ActiveDocument.addObject('Fem::FemResultObjectPython', name) + import _FemMechanicalResult + _FemMechanicalResult._FemMechanicalResult(obj) + if FreeCAD.GuiUp: + from _ViewProviderFemMechanicalResult import _ViewProviderFemMechanicalResult + _ViewProviderFemMechanicalResult(obj.ViewObject) + return obj + + ########## constraints ########## def makeConstraintBearing(name): '''makeConstraintBearing(name): makes a Fem ConstraintBearing object''' diff --git a/src/Mod/Fem/importCcxFrdResults.py b/src/Mod/Fem/importCcxFrdResults.py index 226c7c36be34..56b9948f2831 100644 --- a/src/Mod/Fem/importCcxFrdResults.py +++ b/src/Mod/Fem/importCcxFrdResults.py @@ -108,8 +108,8 @@ def importFrd(filename, analysis=None, result_name_prefix=None): results_name = result_name_prefix + 'time_' + str(step_time) + '_results' else: results_name = result_name_prefix + 'results' - import FemMechanicalResult - results = FemMechanicalResult.makeFemMechanicalResult(results_name) + import ObjectsFem + results = ObjectsFem.makeMechanicalResult(results_name) for m in analysis_object.Member: if m.isDerivedFrom("Fem::FemMeshObject"): results.Mesh = m diff --git a/src/Mod/Fem/importVTKResults.py b/src/Mod/Fem/importVTKResults.py index 6173d0742f68..6aa0f272dece 100644 --- a/src/Mod/Fem/importVTKResults.py +++ b/src/Mod/Fem/importVTKResults.py @@ -86,8 +86,8 @@ def importVTK(filename, analysis=None, result_name_prefix=None): # if properties can be added in FemVTKTools importCfdResult(), this file can be used for CFD workbench results_name = result_name_prefix + 'results' - from FemMechanicalResult import makeFemMechanicalResult - result_obj = makeFemMechanicalResult(results_name) + import ObjectsFem + result_obj = ObjectsFem.makeMechanicalResult(results_name) # result_obj = FreeCAD.ActiveDocument.addObject('Fem::FemResultObject', results_name) Fem.readResult(filename, result_obj.Name) # readResult always creates a new femmesh named ResultMesh diff --git a/src/Mod/Fem/importZ88O2Results.py b/src/Mod/Fem/importZ88O2Results.py index 8e4608fc903a..e4ce47360394 100644 --- a/src/Mod/Fem/importZ88O2Results.py +++ b/src/Mod/Fem/importZ88O2Results.py @@ -79,8 +79,8 @@ def import_z88_disp(filename, analysis=None, result_name_prefix=None): for result_set in m['Results']: results_name = result_name_prefix + 'results' - import FemMechanicalResult - results = FemMechanicalResult.makeFemMechanicalResult(results_name) + import ObjectsFem + results = ObjectsFem.makeMechanicalResult(results_name) #results = FreeCAD.ActiveDocument.addObject('Fem::FemResultObject', results_name) for m in analysis_object.Member: if m.isDerivedFrom("Fem::FemMeshObject"):