FEM: only define analysis types for calculix solver once

FreeCAD · Mar 1, 2020 · 871d660 · 871d660
1 parent c165edd
commit 871d660
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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)