[FEM] result dialog: handle max shear stress

- max shear stress is supported but could not use in the Calculate section
- also sort the UI file with our sorting script
This commit is contained in:
Uwe
2022-06-05 00:12:51 +02:00
parent 23d65cc9f2
commit b5b5375fe4
2 changed files with 95 additions and 84 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>354</width>
<height>199</height>
<width>346</width>
<height>218</height>
</rect>
</property>
<property name="windowTitle">
@@ -142,76 +142,6 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="user_def_head_8">
<property name="text">
<string>Mohr Coulomb: mc</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="user_def_head_16">
<property name="text">
<string>max. principal stress: P1</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="user_def_head_17">
<property name="text">
<string>med. principal stress: P2</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="user_def_head_18">
<property name="text">
<string>min. principal stress: P3</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="user_def_head_10">
<property name="text">
<string>med. princ. stress vector: s2x, s2y, s2z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="user_def_head_11">
<property name="text">
<string>max. princ. stress vector: s3x, s3y, s3z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="user_def_head_9">
<property name="text">
<string>min. princ. stress vector: s1x, s1y, s1z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="user_def_head_5">
<property name="text">
@@ -222,16 +152,6 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="user_def_head_7">
<property name="text">
<string>equivalent plastic strain: Peeq</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="user_def_head_13">
<property name="text">
@@ -242,7 +162,97 @@
</property>
</widget>
</item>
</layout>
<item row="4" column="0">
<widget class="QLabel" name="user_def_head_7">
<property name="text">
<string>equivalent plastic strain: Peeq</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="user_def_head_19">
<property name="text">
<string>max shear stress: MS</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="user_def_head_11">
<property name="text">
<string>max princ. stress vector: s3x, s3y, s3z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="user_def_head_16">
<property name="text">
<string>max principal stress: P1</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="user_def_head_10">
<property name="text">
<string>med princ. stress vector: s2x, s2y, s2z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="user_def_head_17">
<property name="text">
<string>med principal stress: P2</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="user_def_head_9">
<property name="text">
<string>min princ. stress vector: s1x, s1y, s1z</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="user_def_head_18">
<property name="text">
<string>min principal stress: P3</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="user_def_head_8">
<property name="text">
<string>Mohr Coulomb: mc</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

View File

@@ -399,6 +399,7 @@ class _TaskPanel:
P1 = np.array(self.result_obj.PrincipalMax)
P2 = np.array(self.result_obj.PrincipalMed)
P3 = np.array(self.result_obj.PrincipalMin)
MS = np.array(self.result_obj.MaxShear)
vM = np.array(self.result_obj.vonMises)
Peeq = np.array(self.result_obj.Peeq)
T = np.array(self.result_obj.Temperature)
@@ -459,7 +460,7 @@ class _TaskPanel:
"x", "y", "z", "T", "vM", "Peeq", "P1", "P2", "P3",
"sxx", "syy", "szz", "sxy", "sxz", "syz",
"exx", "eyy", "ezz", "exy", "exz", "eyz",
"MF", "NP", "rx", "ry", "rz", "mc",
"MS", "MF", "NP", "rx", "ry", "rz", "mc",
"s1x", "s1y", "s1z", "s2x", "s2y", "s2z", "s3x", "s3y", "s3z"
]
tokrules.names = {}