suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: move prefs path off General prefs tab to BaseApp/Preferences/Mod/Fem/General

Browse Source
This commit is contained in:
Bernd Hahnebach 2016-08-16 06:30:53 +01:00 committed by wmayer
parent d9b4213989
commit 302dccdb3d
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/FemCommands.py
View File

@ -103,7 +103,7 @@ class FemCommands(object):
for acnstrmesh in FemGui.getActiveAnalysis().Member:
# if "Constraint" in acnstrmesh.TypeId:
# acnstrmesh.ViewObject.Visibility = False
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
hide_constraints = fem_prefs.GetBool("HideConstraint", False)
if hide_constraints:
if "Constraint" in acnstrmesh.TypeId:

6
src/Mod/Fem/FemTools.py
View File

@ -85,7 +85,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject):
## Resets mesh color, deformation and removes all result objects if preferences to keep them is not set
# @param self The python object self
def reset_mesh_purge_results_checked(self):
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
keep_results_on_rerun = self.fem_prefs.GetBool("KeepResultsOnReRun", False)
if not keep_results_on_rerun:
self.purge_results()
@ -420,7 +420,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject):
try:
self.analysis_type = self.solver.AnalysisType
except:
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
self.analysis_type = self.fem_prefs.GetString("AnalysisType", "static")
## Sets working dir for solver execution. Called with no working_dir uses WorkingDir from FEM preferences
@ -432,7 +432,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject):
self.working_dir = working_dir
else:
self.working_dir = ''
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
if self.fem_prefs.GetString("WorkingDir"):
try:
self.working_dir = self.fem_prefs.GetString("WorkingDir")

2
src/Mod/Fem/FemToolsZ88.py
View File

@ -100,7 +100,7 @@ class FemToolsZ88(FemTools.FemTools):
def setup_z88(self, z88_binary=None):
from platform import system
if not z88_binary:
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
z88_binary = self.fem_prefs.GetString("z88BinaryPath", "")
if not z88_binary:
if system() == "Linux":

20
src/Mod/Fem/Gui/DlgSettingsFem.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>FEM</string>
<string>General</string>
</property>
<layout class="QGridLayout" name="gridLayout1">
<property name="margin">
@ -68,7 +68,7 @@
<cstring>WorkingDir</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -153,7 +153,7 @@
<cstring>z88BinaryPath</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -197,7 +197,7 @@
<cstring>UseBuiltInMaterials</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -213,7 +213,7 @@
<cstring>UseMaterialsFromConfigDir</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -229,7 +229,7 @@
<cstring>UseMaterialsFromCustomDir</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -256,7 +256,7 @@
<cstring>CustomMaterialsDir</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -306,7 +306,7 @@
<cstring>KeepResultsOnReRun</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -322,7 +322,7 @@
<cstring>RestoreResultDialog</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
@ -344,7 +344,7 @@
<cstring>HideConstraint</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>

4
src/Mod/Fem/InitGui.py
View File

@ -79,7 +79,7 @@ class FemWorkbench (Workbench):
FreeCAD.Console.PrintError(e.message)
import os
working_dir = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").GetString("WorkingDir")
working_dir = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General").GetString("WorkingDir")
if not (os.path.isdir(working_dir)):
try:
os.makedirs(working_dir)
@ -89,7 +89,7 @@ class FemWorkbench (Workbench):
working_dir = tempfile.gettempdir()
print ("Dir \'{}\' will be used instead.".format(working_dir))
if working_dir:
FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").SetString("WorkingDir", working_dir)
FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General").SetString("WorkingDir", working_dir)
else:
FreeCAD.Console.PrintError("Setting working directory \'{}\' for ccx failed!\n")

2
src/Mod/Fem/_FemSolverCalculix.py
View File

@ -40,7 +40,7 @@ class _FemSolverCalculix():
obj.addProperty("App::PropertyString", "SolverType", "Base", "Type of the solver", 1) # the 1 set the property to ReadOnly
obj.SolverType = str(self.Type)
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
ccx_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx")
obj.addProperty("App::PropertyPath", "WorkingDir", "Fem", "Working directory for calculations")

2
src/Mod/Fem/_FemSolverZ88.py
View File

@ -40,7 +40,7 @@ class _FemSolverZ88():
obj.addProperty("App::PropertyString", "SolverType", "Base", "Type of the solver", 1) # the 1 set the property to ReadOnly
obj.SolverType = str(self.Type)
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
obj.addProperty("App::PropertyPath", "WorkingDir", "Fem", "Working directory for calculations")
obj.WorkingDir = fem_prefs.GetString("WorkingDir", "")

10
src/Mod/Fem/_TaskPanelMechanicalMaterial.py
View File

@ -292,20 +292,20 @@ class _TaskPanelMechanicalMaterial:
self.materials = {}
self.pathList = []
self.form.cb_materials.clear()
self.fem_preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
use_built_in_materials = self.fem_preferences.GetBool("UseBuiltInMaterials", True)
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
use_built_in_materials = self.fem_prefs.GetBool("UseBuiltInMaterials", True)
if use_built_in_materials:
system_mat_dir = FreeCAD.getResourceDir() + "/Mod/Material/StandardMaterial"
self.add_mat_dir(system_mat_dir, ":/icons/freecad.svg")
use_mat_from_config_dir = self.fem_preferences.GetBool("UseMaterialsFromConfigDir", True)
use_mat_from_config_dir = self.fem_prefs.GetBool("UseMaterialsFromConfigDir", True)
if use_mat_from_config_dir:
user_mat_dirname = FreeCAD.getUserAppDataDir() + "Materials"
self.add_mat_dir(user_mat_dirname, ":/icons/preferences-general.svg")
use_mat_from_custom_dir = self.fem_preferences.GetBool("UseMaterialsFromCustomDir", True)
use_mat_from_custom_dir = self.fem_prefs.GetBool("UseMaterialsFromCustomDir", True)
if use_mat_from_custom_dir:
custom_mat_dir = self.fem_preferences.GetString("CustomMaterialsDir", "")
custom_mat_dir = self.fem_prefs.GetString("CustomMaterialsDir", "")
self.add_mat_dir(custom_mat_dir, ":/icons/user.svg")
def references_list_right_clicked(self, QPos):

2
src/Mod/Fem/_TaskPanelShowResult.py
View File

@ -41,7 +41,7 @@ class _TaskPanelShowResult:
'''The task panel for the post-processing'''
def __init__(self):
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelShowResult.ui")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
self.restore_result_settings_in_dialog = self.fem_prefs.GetBool("RestoreResultDialog", True)
# Connect Signals and Slots