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

FEM: User defined result object added

Browse Source
This commit is contained in:
makkemal 2016-09-25 19:37:15 +01:00 committed by Yorik van Havre
parent 12e66a16d0
commit 95c8769ed2
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/App/FemResultObject.cpp
View File

@ -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()

2
src/Mod/Fem/App/FemResultObject.h
View File

@ -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 {

3
src/Mod/Fem/_TaskPanelShowResult.py
View File

@ -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)