From 871d660995917a1174617cc321664c4856e19095 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 1 Mar 2020 14:16:00 +0100 Subject: [PATCH] FEM: only define analysis types for calculix solver once --- src/Mod/Fem/femobjects/_FemSolverCalculix.py | 6 +++--- src/Mod/Fem/femsolver/calculix/solver.py | 2 +- src/Mod/Fem/femtools/ccxtools.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Fem/femobjects/_FemSolverCalculix.py b/src/Mod/Fem/femobjects/_FemSolverCalculix.py index 3aa67151440e..999d1b56d69d 100644 --- a/src/Mod/Fem/femobjects/_FemSolverCalculix.py +++ b/src/Mod/Fem/femobjects/_FemSolverCalculix.py @@ -28,7 +28,7 @@ # \brief FreeCAD FEM _FemSolverCalculix import FreeCAD -from femtools import ccxtools +from femsolver.calculix.solver import ANALYSIS_TYPES class _FemSolverCalculix(): @@ -58,9 +58,9 @@ def __init__(self, obj): "Fem", "Type of the analysis" ) - obj.AnalysisType = ccxtools.FemToolsCcx.known_analysis_types + obj.AnalysisType = ANALYSIS_TYPES analysis_type = ccx_prefs.GetInt("AnalysisType", 0) - obj.AnalysisType = ccxtools.FemToolsCcx.known_analysis_types[analysis_type] + obj.AnalysisType = ANALYSIS_TYPES[analysis_type] choices_geom_nonlinear = ["linear", "nonlinear"] obj.addProperty( diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index 80ac25a78733..90880593948f 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -39,7 +39,7 @@ if FreeCAD.GuiUp: import FemGui -ANALYSIS_TYPES = ["static", "frequency", "thermomech"] +ANALYSIS_TYPES = ["static", "frequency", "thermomech", "check"] def create(doc, name="SolverCalculiX"): diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py index a6f2f39b2cda..57e04be6a35b 100644 --- a/src/Mod/Fem/femtools/ccxtools.py +++ b/src/Mod/Fem/femtools/ccxtools.py @@ -34,6 +34,7 @@ import FreeCAD +from femsolver.calculix.solver import ANALYSIS_TYPES from femtools import femutils from femtools import membertools @@ -66,7 +67,6 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): Updated with update_objects """ - known_analysis_types = ["static", "frequency", "thermomech", "check"] finished = QtCore.Signal(int) def __init__(self, analysis=None, solver=None, test_mode=False): @@ -248,7 +248,7 @@ def check_prerequisites(self): if not self.solver: message += "No solver object defined in the analysis\n" else: - if self.solver.AnalysisType not in self.known_analysis_types: + if self.solver.AnalysisType not in ANALYSIS_TYPES: message += ( "Unknown analysis type: {}\n" .format(self.solver.AnalysisType)