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

FEM: ccx tools, use working dir prefs from solver framework

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-03-21 09:23:46 +01:00
committed by wmayer
parent 1d05f1bd9a
commit 6bd837f928
4 changed files with 63 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,82 +22,6 @@
</property>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="gb_1_analysis">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="title">
<string>Working directory for ccx tools solver only</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<layout class="QGridLayout" name="gl_analysis">
<item row="2" column="2">
<widget class="Gui::PrefFileChooser" name="fc_analysis_working_directory" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>WorkingDir</cstring>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="l_analysis_working_directory">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Use custom directory</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_2_workingdir">
<property name="sizePolicy">
@@ -107,7 +31,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Working directory for all frame work solver</string>
<string>Working directory for solving analysis</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@@ -312,6 +236,29 @@
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="Gui::PrefCheckBox" name="cb_overwrite_solver_working_directory">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Overwrite solver working directory with the directory choosen above</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>OverwriteSolverWorkingDirectory</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/General</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>

4
src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp
View File

@@ -44,7 +44,6 @@ DlgSettingsFemGeneralImp::~DlgSettingsFemGeneralImp()
void DlgSettingsFemGeneralImp::saveSettings()
{
fc_analysis_working_directory->onSave();
cb_analysis_group_meshing->onSave();
@@ -56,11 +55,11 @@ void DlgSettingsFemGeneralImp::saveSettings()
cb_wd_beside->onSave();
cb_wd_custom->onSave();
le_wd_custom->onSave();
cb_overwrite_solver_working_directory->onSave();
}
void DlgSettingsFemGeneralImp::loadSettings()
{
fc_analysis_working_directory->onRestore();
cb_analysis_group_meshing->onRestore();
@@ -72,6 +71,7 @@ void DlgSettingsFemGeneralImp::loadSettings()
cb_wd_beside->onRestore();
cb_wd_custom->onRestore();
le_wd_custom->onRestore();
cb_overwrite_solver_working_directory->onRestore();
}
/**