From bcbe82de7492d7948ccf534ed53e77cbe115cdee Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 26 Mar 2019 22:17:33 +0100 Subject: [PATCH] FEM: ccx tools task panel and solver run, use new ccx tools class init without analysis --- src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py | 6 +++--- src/Mod/Fem/femsolver/run.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py index c073973ee1..fe65e94cf2 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py @@ -33,7 +33,6 @@ import FreeCADGui import FemGui # for the panel -from femtools import ccxtools from PySide import QtCore from PySide import QtGui from PySide.QtCore import Qt @@ -98,8 +97,9 @@ class _TaskPanelFemSolverCalculix: def __init__(self, solver_object): self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/SolverCalculix.ui") - # since open the task panel is only possible with an active analysis, we do not need to pass the analysis. it will be found - self.fea = ccxtools.FemToolsCcx(None, solver_object) + from femtools.ccxtools import CcxTools as ccx + # we do not need to pass the analysis, it will be found on fea init + self.fea = ccx(solver_object) self.fea.setup_working_dir() self.fea.setup_ccx() diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py index 7dfde95134..643f026b96 100644 --- a/src/Mod/Fem/femsolver/run.py +++ b/src/Mod/Fem/femsolver/run.py @@ -58,8 +58,8 @@ def run_fem_solver(solver, working_dir=None): if solver.Proxy.Type == 'Fem::FemSolverCalculixCcxTools': App.Console.PrintMessage("CalxuliX ccx tools solver!\n") - from femtools import ccxtools - fea = ccxtools.FemToolsCcx(None, solver) + from femtools.ccxtools import CcxTools as ccx + fea = ccx(solver) fea.reset_mesh_purge_results_checked() if working_dir is None: fea.run()