kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: solver framework, fix pref group of working dir

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-02-24 22:17:59 +01:00
committed by wmayer
parent b30bc5ba97
commit 8612214984
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
View File

@@ -133,7 +133,7 @@
<bool>true</bool>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Elmer</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseTempDirectory</cstring>
@@ -177,7 +177,7 @@
<string>Beside .FCStd file</string>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Elmer</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseBesideDirectory</cstring>
@@ -221,7 +221,7 @@
<string>Use custom directory</string>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Elmer</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseCustomDirectory</cstring>
@@ -282,7 +282,7 @@
</size>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Elmer</cstring>
<cstring>Mod/Fem/General</cstring>
</property>
<property name="prefEntry" stdset="0">
<cstring>CustomDirectoryPath</cstring>

6
src/Mod/Fem/femsolver/settings.py
View File

@@ -34,6 +34,8 @@ TEMPORARY = "temporary"
BESIDE = "beside"
CUSTOM = "custom"
_GENERAL_PARAM = "User parameter:BaseApp/Preferences/Mod/Fem/General"
_ELMER_PARAM = "User parameter:BaseApp/Preferences/Mod/Fem/Elmer"
_GRID_PARAM = "User parameter:BaseApp/Preferences/Mod/Fem/Grid"
_CCX_PARAM = "User parameter:BaseApp/Preferences/Mod/Fem/Ccx"
@@ -87,12 +89,12 @@ def getBinary(name):
def getCustomDir():
param = App.ParamGet(_ELMER_PARAM)
param = App.ParamGet(_GENERAL_PARAM)
return param.GetString("CustomDirectoryPath")
def getDirSetting():
param = App.ParamGet(_ELMER_PARAM)
param = App.ParamGet(_GENERAL_PARAM)
if param.GetBool("UseTempDirectory"):
return TEMPORARY
elif param.GetBool("UseBesideDirectory"):