From e606062f4c91837de2d5afb1d51753024dbbc41b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 4 Mar 2019 09:22:08 +0100 Subject: [PATCH] FEM: solver tasks, use FreeCAD instead of App --- src/Mod/Fem/femsolver/calculix/tasks.py | 6 +++--- src/Mod/Fem/femsolver/z88/tasks.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index 47ff46ed7c..8b8e9218f8 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -31,7 +31,7 @@ import os import subprocess import os.path -import FreeCAD as App +import FreeCAD import femtools.femutils as femutils import feminout.importCcxFrdResults as importCcxFrdResults import feminout.importCcxDatResults as importCcxDatResults @@ -105,7 +105,7 @@ class Results(run.Results): if not _inputFileName: # TODO do not run solver, do not try to read results in a smarter way than an Exception raise Exception('Error on writing CalculiX input file.\n') - prefs = App.ParamGet( + prefs = FreeCAD.ParamGet( "User parameter:BaseApp/Preferences/Mod/Fem/General") if not prefs.GetBool("KeepResultsOnReRun", False): self.purge_results() @@ -117,7 +117,7 @@ class Results(run.Results): if femutils.is_of_type(m.Mesh, "Fem::FemMeshResult"): self.analysis.Document.removeObject(m.Mesh.Name) self.analysis.Document.removeObject(m.Name) - App.ActiveDocument.recompute() + FreeCAD.ActiveDocument.recompute() def load_results_ccxfrd(self): frd_result_file = os.path.join( diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index e871396592..c16d967161 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -30,7 +30,7 @@ import os import subprocess import os.path -import FreeCAD as App +import FreeCAD import femtools.femutils as femutils import feminout.importZ88O2Results as importZ88O2Results @@ -108,7 +108,7 @@ class Solve(run.Solve): class Results(run.Results): def run(self): - prefs = App.ParamGet( + prefs = FreeCAD.ParamGet( "User parameter:BaseApp/Preferences/Mod/Fem/General") if not prefs.GetBool("KeepResultsOnReRun", False): self.purge_results() @@ -119,7 +119,7 @@ class Results(run.Results): if femutils.is_of_type(m.Mesh, "Fem::FemMeshResult"): self.analysis.Document.removeObject(m.Mesh.Name) self.analysis.Document.removeObject(m.Name) - App.ActiveDocument.recompute() + FreeCAD.ActiveDocument.recompute() def load_results_z88o2(self): disp_result_file = os.path.join(