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

FEM: task panel solver calculix: add thermomech analysis button

Browse Source
This commit is contained in:
vdwalts 2016-08-01 21:58:10 +01:00 committed by wmayer
parent e8143ab0cf
commit 6965b4553f
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Fem/TaskPanelFemSolverCalculix.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>258</width> <width>347</width>
<height>458</height> <height>458</height>
</rect> </rect>
</property> </property>
@ -54,14 +54,14 @@
<property name="title"> <property name="title">
<string>Analysis type</string> <string>Analysis type</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<item> <item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="rb_static_analysis"> <widget class="Gui::PrefRadioButton" name="rb_static_analysis">
<property name="text"> <property name="text">
<string>Static</string> <string>Static</string>
@ -71,13 +71,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="Gui::PrefRadioButton" name="rb_frequency_analysis"> <widget class="Gui::PrefRadioButton" name="rb_frequency_analysis">
<property name="text"> <property name="text">
<string>Frequency</string> <string>Frequency</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="Gui::PrefRadioButton" name="rb_thermomech_analysis">
<property name="text">
<string>Thermo mechanical</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

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

@ -70,6 +70,7 @@ class _TaskPanelFemSolverCalculix:
QtCore.QObject.connect(self.form.pb_run_ccx, QtCore.SIGNAL("clicked()"), self.runCalculix) QtCore.QObject.connect(self.form.pb_run_ccx, QtCore.SIGNAL("clicked()"), self.runCalculix)
QtCore.QObject.connect(self.form.rb_static_analysis, QtCore.SIGNAL("clicked()"), self.select_static_analysis) QtCore.QObject.connect(self.form.rb_static_analysis, QtCore.SIGNAL("clicked()"), self.select_static_analysis)
QtCore.QObject.connect(self.form.rb_frequency_analysis, QtCore.SIGNAL("clicked()"), self.select_frequency_analysis) QtCore.QObject.connect(self.form.rb_frequency_analysis, QtCore.SIGNAL("clicked()"), self.select_frequency_analysis)
QtCore.QObject.connect(self.form.rb_thermomech_analysis, QtCore.SIGNAL("clicked()"), self.select_thermomech_analysis)
QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("started()"), self.calculixStarted) QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("started()"), self.calculixStarted)
QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("stateChanged(QProcess::ProcessState)"), self.calculixStateChanged) QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("stateChanged(QProcess::ProcessState)"), self.calculixStateChanged)
@ -159,6 +160,8 @@ class _TaskPanelFemSolverCalculix:
self.form.rb_static_analysis.setChecked(True) self.form.rb_static_analysis.setChecked(True)
elif self.solver_object.AnalysisType == 'frequency': elif self.solver_object.AnalysisType == 'frequency':
self.form.rb_frequency_analysis.setChecked(True) self.form.rb_frequency_analysis.setChecked(True)
elif self.solver_object.AnalysisType == 'thermomech':
self.form.rb_thermomech_analysis.setChecked(True)
return return
def accept(self): def accept(self):
@ -256,6 +259,9 @@ class _TaskPanelFemSolverCalculix:
def select_frequency_analysis(self): def select_frequency_analysis(self):
self.select_analysis_type('frequency') self.select_analysis_type('frequency')
def select_thermomech_analysis(self):
self.select_analysis_type('thermomech')
# That function overlaps with FemTools setup_working_dir and needs to be removed when we migrate fully to FemTools # That function overlaps with FemTools setup_working_dir and needs to be removed when we migrate fully to FemTools
def setup_working_dir(self): def setup_working_dir(self):
wd = self.solver_object.WorkingDir wd = self.solver_object.WorkingDir