Fem: Remove dependency of calculix solver classes on user parameters - fixes #13383

This commit is contained in:
marioalexis
2024-06-07 13:35:33 -03:00
committed by Chris Hennes
parent 3052760541
commit aaef5236b8
3 changed files with 450 additions and 394 deletions

View File

@@ -32,11 +32,10 @@ __url__ = "https://www.freecad.org"
import FreeCAD
from . import base_fempythonobject
from femsolver.calculix.solver import add_attributes
from femsolver.calculix.solver import on_restore_of_document
from femsolver.calculix.solver import _BaseSolverCalculix
class SolverCcxTools(base_fempythonobject.BaseFemPythonObject):
class SolverCcxTools(base_fempythonobject.BaseFemPythonObject, _BaseSolverCalculix):
"""The Fem::FemSolver's Proxy python type, add solver specific properties
"""
@@ -45,11 +44,8 @@ class SolverCcxTools(base_fempythonobject.BaseFemPythonObject):
def __init__(self, obj):
super(SolverCcxTools, self).__init__(obj)
ccx_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx")
# add attributes
# implemented in framework calculix solver module
add_attributes(obj, ccx_prefs)
self.add_attributes(obj)
obj.addProperty(
"App::PropertyPath",
@@ -62,8 +58,4 @@ class SolverCcxTools(base_fempythonobject.BaseFemPythonObject):
# only used if the preferences working directory is left blank
def onDocumentRestored(self, obj):
ccx_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx")
# implemented in framework calculix solver module
on_restore_of_document(obj, ccx_prefs)
self.on_restore_of_document(obj)