From 57a94af0e104b9ffa26bfcbed1bef221ecc74695 Mon Sep 17 00:00:00 2001
From: makkemal <makkemal@gmail.com>
Date: Sat, 7 Jan 2017 16:06:45 +0100
Subject: [PATCH] FEM: result task panel, add stress and strain vectors to
 possible user defined results

---
 src/Mod/Fem/TaskPanelShowResult.ui  | 32 ++++++++++++++++++++++++++++-
 src/Mod/Fem/_TaskPanelShowResult.py | 12 +++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Fem/TaskPanelShowResult.ui b/src/Mod/Fem/TaskPanelShowResult.ui
index af2b547d0..4b74bd91e 100644
--- a/src/Mod/Fem/TaskPanelShowResult.ui
+++ b/src/Mod/Fem/TaskPanelShowResult.ui
@@ -270,8 +270,38 @@
           </item>
           <item>
            <widget class="QLabel" name="user_def_text">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>17</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
             <property name="text">
-             <string>Available: Disp(x,y,z) Principal stresses (P1,P2,P3)</string>
+             <string>Available: Disp(x,y,z) Principal stresses(P1,P2,P3) Stress(sx,sy,sz) Strain (ex,ey,ez)</string>
+            </property>
+            <property name="scaledContents">
+             <bool>false</bool>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+            <property name="indent">
+             <number>-1</number>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::NoTextInteraction</set>
             </property>
            </widget>
           </item>
diff --git a/src/Mod/Fem/_TaskPanelShowResult.py b/src/Mod/Fem/_TaskPanelShowResult.py
index 5c713eb97..8392df24d 100644
--- a/src/Mod/Fem/_TaskPanelShowResult.py
+++ b/src/Mod/Fem/_TaskPanelShowResult.py
@@ -21,7 +21,7 @@
 # ***************************************************************************
 
 __title__ = "Result Control Task Panel"
-__author__ = "Juergen Riegel"
+__author__ = "Juergen Riegel, Michael Hindley"
 __url__ = "http://www.freecadweb.org"
 
 ## @package TaskPanelShowResult
@@ -231,7 +231,15 @@ class _TaskPanelShowResult:
         x = np.array(dispvectors[:, 0])
         y = np.array(dispvectors[:, 1])
         z = np.array(dispvectors[:, 2])
-        userdefined_eq = x + y + z + T + Von + P1 + P2 + P3  # Dummy equation to get around flake8, varibles not being used
+        stressvectors = np.array(self.result_object.StressVectors) 
+        sx = np.array(stressvectors[:, 0])
+        sy = np.array(stressvectors[:, 1])
+        sz = np.array(stressvectors[:, 2])
+        strainvectors = np.array(self.result_object.StrainVectors) 
+        ex = np.array(strainvectors[:, 0])
+        ey = np.array(strainvectors[:, 1])
+        ez = np.array(strainvectors[:, 2])
+        userdefined_eq = x + y + z + T + Von + P1 + P2 + P3 + sx + sy + sz + ex + ey + ez # Dummy equation to get around flake8, varibles not being used
         userdefined_eq = self.form.user_def_eq.toPlainText()  # Get equation to be used
         UserDefinedFormula = eval(userdefined_eq).tolist()
         self.result_object.UserDefined = UserDefinedFormula