From 95c8769ed22c1f7864ffff3e5e919c95904a0446 Mon Sep 17 00:00:00 2001 From: makkemal Date: Sun, 25 Sep 2016 19:37:15 +0100 Subject: [PATCH] FEM: User defined result object added --- src/Mod/Fem/App/FemResultObject.cpp | 2 ++ src/Mod/Fem/App/FemResultObject.h | 2 ++ src/Mod/Fem/_TaskPanelShowResult.py | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp index c0291c87d..20915c414 100644 --- a/src/Mod/Fem/App/FemResultObject.cpp +++ b/src/Mod/Fem/App/FemResultObject.cpp @@ -52,6 +52,7 @@ FemResultObject::FemResultObject() ADD_PROPERTY_TYPE(Eigenmode,(0), "Fem",Prop_None,"Number of the eigenmode"); ADD_PROPERTY_TYPE(EigenmodeFrequency,(0), "Fem",Prop_None,"Frequency of the eigenmode"); ADD_PROPERTY_TYPE(Time,(0), "Fem",Prop_None,"Time of analysis incement"); + ADD_PROPERTY_TYPE(UserDefined,(0), "Fem",Prop_None,"User Defined Results"); // make read-only for property editor NodeNumbers.setStatus(App::Property::ReadOnly, true); @@ -67,6 +68,7 @@ FemResultObject::FemResultObject() Eigenmode.setStatus(App::Property::ReadOnly, true); EigenmodeFrequency.setStatus(App::Property::ReadOnly, true); Time.setStatus(App::Property::ReadOnly, true); + UserDefined.setStatus(App::Property::ReadOnly, false); } FemResultObject::~FemResultObject() diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index 07c763a46..a6202024f 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -69,6 +69,8 @@ public: App::PropertyFloat EigenmodeFrequency; /// Increment time App::PropertyFloat Time; + /// User defined results + App::PropertyFloatList UserDefined; /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { diff --git a/src/Mod/Fem/_TaskPanelShowResult.py b/src/Mod/Fem/_TaskPanelShowResult.py index ff6f2c4c2..8167ee53d 100644 --- a/src/Mod/Fem/_TaskPanelShowResult.py +++ b/src/Mod/Fem/_TaskPanelShowResult.py @@ -233,8 +233,9 @@ class _TaskPanelShowResult: userdefined_eq = x + y + z + T + Von + P1 + P2 + P3 # 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 minm = min(UserDefinedFormula) - avg = sum(UserDefinedFormula) / len(UserDefinedFormula) + avg = sum(UserDefinedFormula)/len(UserDefinedFormula) maxm = max(UserDefinedFormula) QApplication.setOverrideCursor(Qt.WaitCursor)