FEM: mechanical result object, move make def into make objects FEM mo…

…dule
FreeCAD · Feb 21, 2017 · feae651 · feae651
1 parent b03b080
commit feae651
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 51 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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"):