Skip to content

Commit

Permalink
Fem: modify taskpanelFemMaterial to support simple Fluid Material
Browse files Browse the repository at this point in the history
  • Loading branch information
@qingfengxia
qingfengxia committed Jan 18, 2017
1 parent 61fb3d4 commit a378a16
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 108 deletions.
1 change: 1 addition & 0 deletions src/Mod/Fem/FemMaterial.py
View file
Expand Up @@ -56,4 +56,5 @@ def makeFluidMaterial(name):
# FreeCAD.ActiveDocument.recompute()
return obj

makeFemMaterial = makeSolidMaterial # alias to be compatible for FemTest.py
# @}
159 changes: 81 additions & 78 deletions src/Mod/Fem/TaskPanelFemMaterial.ui
View file
Expand Up @@ -7,15 +7,15 @@
<x>0</x>
<y>0</y>
<width>396</width>
<height>790</height>
<height>834</height>
</rect>
</property>
<property name="windowTitle">
<string>FEM material</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="GroupQuantities_2">
<widget class="QGroupBox" name="groupBox_desc">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand All @@ -28,21 +28,14 @@
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>Fluid</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButton_2">
<item row="1" column="1">
<widget class="QLabel" name="label_category">
<property name="text">
<string>Solid</string>
<string/>
</property>
</widget>
</item>
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Category</string>
Expand Down Expand Up @@ -74,7 +67,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_1">
<widget class="QGroupBox" name="groupBox_references">
<property name="title">
<string>References</string>
</property>
Expand Down Expand Up @@ -128,7 +121,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupQuantities_24">
<widget class="QGroupBox" name="groupBox_basic">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand All @@ -144,51 +137,24 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_26">
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Name:</string>
<string>Density</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::InputField" name="input_fd_name">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>20</height>
</size>
</property>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_saveas">
<property name="text">
<string>steel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep" stdset="0">
<double>2.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<double>2000000000.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">Pa</string>
</property>
<property name="decimals" stdset="0">
<number>3</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
<string>save as name</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QLineEdit" name="edit_name"/>
</item>
<item row="3" column="1">
<widget class="Gui::InputField" name="input_fd_density">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
Expand Down Expand Up @@ -225,20 +191,13 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Density</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupQuantities_4">
<widget class="QGroupBox" name="groupBox_mechanical">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand Down Expand Up @@ -342,7 +301,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupQuantities_14">
<widget class="QGroupBox" name="groupBox_fluidic">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand All @@ -361,12 +320,12 @@
<item row="0" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Kinetic viscosity:</string>
<string>Kinematic viscosity:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::InputField" name="input_fd_kinetic_viscosity">
<widget class="Gui::InputField" name="input_fd_kinematic_viscosity">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -380,22 +339,22 @@
</size>
</property>
<property name="text">
<string>0.000001</string>
<string>0.000001 m^2/s</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep" stdset="0">
<double>2.000000000000000</double>
<double>0.000001000000000</double>
</property>
<property name="maximum" stdset="0">
<double>2000000000.000000000000000</double>
<double>1000.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">Pa</string>
<string notr="true">m^2/s</string>
</property>
<property name="decimals" stdset="0">
<number>3</number>
<number>6</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
Expand All @@ -408,7 +367,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupQuantities_5">
<widget class="QGroupBox" name="groupBox_thermal">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand All @@ -431,8 +390,45 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::InputField" name="input_fd_thermal_conductivity">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>50 W/m/K</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep" stdset="0">
<double>2.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<double>2000000000.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">W/m/K</string>
</property>
<property name="decimals" stdset="0">
<number>3</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<widget class="QLabel" name="label_expansion_coefficient">
<property name="text">
<string>Expansion Coefficient:</string>
</property>
Expand Down Expand Up @@ -519,8 +515,15 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::InputField" name="input_fd_thermal_conductivity">
<item row="3" column="0">
<widget class="QLabel" name="label_vol_expansion_coefficient">
<property name="text">
<string>Vol Expansion Coeff</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::InputField" name="input_fd_vol_expansion_coefficient">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -534,22 +537,22 @@
</size>
</property>
<property name="text">
<string>50 W/m/K</string>
<string>0.001 m/m/K</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep" stdset="0">
<double>2.000000000000000</double>
<double>0.001000000000000</double>
</property>
<property name="maximum" stdset="0">
<double>2000000000.000000000000000</double>
<double>1.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">W/m/K</string>
<string notr="true">m/m/K</string>
</property>
<property name="decimals" stdset="0">
<number>3</number>
<number>6</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
Expand All @@ -562,7 +565,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupQuantities_3">
<widget class="QGroupBox" name="groupBox_external">
<property name="maximumSize">
<size>
<width>16777215</width>
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_FemMaterial.py
View file
Expand Up @@ -32,8 +32,8 @@ class _FemMaterial:
"The FEM Material object"
def __init__(self, obj):
obj.addProperty("App::PropertyLinkSubList", "References", "Material", "List of material shapes")
obj.addProperty("App::PropertyEnum", "Category", "Material", "Material type: fluid or solid")
obj.Category = ['Solid', 'Fluid']
obj.addProperty("App::PropertyEnumeration", "Category", "Material", "Material type: fluid or solid")
obj.Category = ['Solid', 'Fluid'] # used in TaskPanel
obj.Proxy = self
self.Type = "FemMaterial"

Expand Down

0 comments on commit a378a16

Please sign in to comment.