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

FEM: Add reset_all funcion to FemTools

Browse Source 
reset_all groups purge_results, reset_mesh_color and reset_mesh_deformation

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-09-08 10:19:14 +01:00 committed by wmayer
parent 0ba28a5ba6
commit 25b501e215
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Fem/FemTools.py
View File

@ -73,6 +73,13 @@ class FemTools(QtCore.QRunnable, QtCore.QObject):
self.mesh.ViewObject.ElementColor = {}
self.mesh.ViewObject.setNodeColorByScalars()
## Resets mesh color, deformation and removes all result objects
# @param self The python object self
def reset_all(self):
self.purge_results()
self.reset_mesh_color()
self.reset_mesh_deformation()
def show_result(self, result_type="Sabs", limit=None):
self.update_objects()
if result_type == "None":

16
src/Mod/Fem/MechanicalAnalysis.py
View File

@ -135,9 +135,7 @@ class _CommandPurgeFemResults:
def Activated(self):
fea = FemTools()
fea.purge_results()
fea.reset_mesh_color()
fea.reset_mesh_deformation()
fea.reset_all()
def IsActive(self):
return FreeCADGui.ActiveDocument is not None and results_present()
@ -159,9 +157,7 @@ class _CommandQuickAnalysis:
print "CalculiX failed ccx finished with error {}".format(ret_code)
self.fea = FemTools()
self.fea.purge_results()
self.fea.reset_mesh_color()
self.fea.reset_mesh_deformation()
self.fea.reset_all()
message = self.fea.check_prerequisites()
if message:
QtGui.QMessageBox.critical(None, "Missing prerequisite", message)
@ -194,9 +190,7 @@ class _CommandFrequencyAnalysis:
print "CalculiX failed ccx finished with error {}".format(ret_code)
self.fea = FemTools()
self.fea.purge_results()
self.fea.reset_mesh_color()
self.fea.reset_mesh_deformation()
self.fea.reset_all()
self.fea.set_analysis_type('frequency')
message = self.fea.check_prerequisites()
if message:
@ -397,9 +391,7 @@ class _JobControlTaskPanel:
self.femConsoleMessage("Loading result sets...")
self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start))
fea = FemTools()
fea.purge_results()
fea.reset_mesh_color()
fea.reset_mesh_deformation()
fea.reset_all()
if os.path.isfile(self.base_name + '.frd'):
QApplication.setOverrideCursor(Qt.WaitCursor)
ccxFrdReader.importFrd(self.base_name + '.frd', FemGui.getActiveAnalysis())