diff --git a/src/Mod/Fem/Gui/DlgSettingsFem.ui b/src/Mod/Fem/Gui/DlgSettingsFem.ui
index be4d9abbc..198eb274e 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFem.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFem.ui
@@ -457,6 +457,35 @@
+ -
+
+
+ Results
+
+
+
-
+
+
-
+
+
+ Restore result dialog settings
+
+
+ true
+
+
+ RestoreResultDialog
+
+
+ Mod/Fem
+
+
+
+
+
+
+
+
-
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemImp.cpp
index f57f6d236..371541f9b 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemImp.cpp
@@ -60,6 +60,7 @@ void DlgSettingsFemImp::saveSettings()
cb_use_mat_from_config_dir->onSave();
cb_use_mat_from_custom_dir->onSave();
fc_custom_mat_dir->onSave();
+ cb_restore_result_dialog->onSave();
}
void DlgSettingsFemImp::loadSettings()
@@ -76,6 +77,7 @@ void DlgSettingsFemImp::loadSettings()
cb_use_mat_from_config_dir->onRestore();
cb_use_mat_from_custom_dir->onRestore();
fc_custom_mat_dir->onRestore();
+ cb_restore_result_dialog->onRestore();
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Mod/Fem");
diff --git a/src/Mod/Fem/_TaskPanelResultControl.py b/src/Mod/Fem/_TaskPanelResultControl.py
index 8332896b1..c4d892aa2 100644
--- a/src/Mod/Fem/_TaskPanelResultControl.py
+++ b/src/Mod/Fem/_TaskPanelResultControl.py
@@ -40,6 +40,8 @@ class _TaskPanelResultControl:
'''The control for the displacement post-processing'''
def __init__(self):
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelShowDisplacement.ui")
+ self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
+ self.restore_result_settings_in_dialog = self.fem_prefs.GetBool("RestoreResultDialog", True)
#Connect Signals and Slots
QtCore.QObject.connect(self.form.rb_none, QtCore.SIGNAL("toggled(bool)"), self.none_selected)
@@ -55,7 +57,10 @@ class _TaskPanelResultControl:
QtCore.QObject.connect(self.form.sb_displacement_factor_max, QtCore.SIGNAL("valueChanged(int)"), self.sb_disp_factor_max_changed)
self.update()
- self.restore_result_dialog()
+ if self.restore_result_settings_in_dialog:
+ self.restore_result_dialog()
+ else:
+ self.restore_initial_result_dialog()
def restore_result_dialog(self):
try:
@@ -90,8 +95,14 @@ class _TaskPanelResultControl:
self.form.sb_displacement_factor_max.setValue(dfm)
self.form.sb_displacement_factor.setValue(df)
except:
- FreeCAD.FEM_dialog = {"results_type": "None", "show_disp": False,
- "disp_factor": 0, "disp_factor_max": 100}
+ self.restore_initial_result_dialog()
+
+ def restore_initial_result_dialog(self):
+ FreeCAD.FEM_dialog = {"results_type": "None", "show_disp": False,
+ "disp_factor": 0, "disp_factor_max": 100}
+ fea = FemTools()
+ fea.reset_mesh_color()
+ fea.reset_mesh_deformation()
def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Close)