diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui index 1f20ad05f1..929cdfdec1 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui @@ -96,7 +96,221 @@ - + + + + 0 + 0 + + + + Working Directory + + + + + + 2 + + + + + + 75 + true + + + + sdfsdfsdfds + + + Temporary Directories + + + true + + + Mod/Fem/Elmer + + + UseTempDirectory + + + + + + + + true + + + + Let FreeCAD manage (create, delete) the working directories for all solver. Use temporary directories. + + + true + + + 10 + + + + + + + + + 2 + + + + + + 75 + true + + + + Beside .fcstd File + + + Mod/Fem/Elmer + + + UseBesideDirectory + + + + + + + + true + + + + Create a directory in the same folder in which the fcstd file of the document is located. Use Subfolder for each solver (e.g. for a file ./mydoc.fcstd and a solver with the label Elmer002 use ./mydoc/Elmer002). + + + true + + + 10 + + + + + + + + + 2 + + + + + + 75 + true + + + + Use Custom Directory + + + Mod/Fem/Elmer + + + UseCustomDirectory + + + + + + + + true + + + + Use directory set below. Create own subdirectory for every solver. Name directory after the solver label prefixed with the document name. + + + true + + + 10 + + + + + + + 0 + + + 3 + + + 0 + + + 0 + + + + + Path: + + + 10 + + + + + + + false + + + + 250 + 16777215 + + + + Mod/Fem/Elmer + + + CustomDirectoryPath + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 0 + 20 + + + + + + + + + + + + + Mesh @@ -125,7 +339,7 @@ - + Materials @@ -231,7 +445,7 @@ - + Results @@ -334,6 +548,11 @@ Gui::FileChooser
Gui/PrefWidgets.h
+ + Gui::PrefRadioButton + QRadioButton +
Gui/PrefWidgets.h
+
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp index f54a59163e..85028fe95c 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp @@ -56,6 +56,11 @@ void DlgSettingsFemGeneralImp::saveSettings() cb_restore_result_dialog->onSave(); cb_keep_results_on_rerun->onSave(); cb_hide_constraint->onSave(); + + cb_wd_temp->onSave(); + cb_wd_beside->onSave(); + cb_wd_custom->onSave(); + le_wd_custom->onSave(); } void DlgSettingsFemGeneralImp::loadSettings() @@ -72,6 +77,11 @@ void DlgSettingsFemGeneralImp::loadSettings() cb_restore_result_dialog->onRestore(); cb_keep_results_on_rerun->onRestore(); cb_hide_constraint->onRestore(); + + cb_wd_temp->onRestore(); + cb_wd_beside->onRestore(); + cb_wd_custom->onRestore(); + le_wd_custom->onRestore(); } /**