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

FEM: Move prepare_analysis_objects out of _JobControlTaskPanel class

Browse Source 
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-06-05 11:55:55 +01:00 committed by wmayer
parent 81ff338236
commit 5816bf1871
1 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,7 +399,16 @@ class _JobControlTaskPanel:
if not FemGui.getActiveAnalysis(): if not FemGui.getActiveAnalysis():
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No active Analysis") QtGui.QMessageBox.critical(None, "Missing prerequisite", "No active Analysis")
return False return False
self.prepare_analysis_objects() self.MeshObject = None
# [{'Object':MaterialObject}, {}, ...]
self.MaterialObjects = []
# [{'Object':FixedObject, 'NodeSupports':bool}, {}, ...]
self.FixedObjects = []
# [{'Object':ForceObject, 'NodeLoad':value}, {}, ...
self.ForceObjects = []
# [{'Object':PressureObject, 'xxxxxxxx':value}, {}, ...]
self.PressureObjects = []
(self.MeshObject, self.MaterialObjects, self.FixedObjects, self.ForceObjects, self.PressureObjects) = prepare_analysis_objects()
if not self.MeshObject: if not self.MeshObject:
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No mesh object in the Analysis") QtGui.QMessageBox.critical(None, "Missing prerequisite", "No mesh object in the Analysis")
@ -418,37 +427,6 @@ class _JobControlTaskPanel:
return False return False
return True return True
def prepare_analysis_objects(self):
self.MeshObject = None
# [{'Object':MaterialObject}, {}, ...]
self.MaterialObjects = []
# [{'Object':FixedObject, 'NodeSupports':bool}, {}, ...]
self.FixedObjects = []
# [{'Object':ForceObject, 'NodeLoad':value}, {}, ...
self.ForceObjects = []
# [{'Object':PressureObject, 'xxxxxxxx':value}, {}, ...]
self.PressureObjects = []
for i in FemGui.getActiveAnalysis().Member:
if i.isDerivedFrom("Fem::FemMeshObject"):
self.MeshObject = i
elif i.isDerivedFrom("App::MaterialObjectPython"):
MaterialObjectDict = {}
MaterialObjectDict['Object'] = i
self.MaterialObjects.append(MaterialObjectDict)
elif i.isDerivedFrom("Fem::ConstraintFixed"):
FixedObjectDict = {}
FixedObjectDict['Object'] = i
self.FixedObjects.append(FixedObjectDict)
elif i.isDerivedFrom("Fem::ConstraintForce"):
ForceObjectDict = {}
ForceObjectDict['Object'] = i
self.ForceObjects.append(ForceObjectDict)
elif i.isDerivedFrom("Fem::ConstraintPressure"):
PressureObjectDict = {}
PressureObjectDict['Object'] = i
self.PressureObjects.append(PressureObjectDict)
def start_ext_editor(self, ext_editor_path, filename): def start_ext_editor(self, ext_editor_path, filename):
if not hasattr(self, "ext_editor_process"): if not hasattr(self, "ext_editor_process"):
self.ext_editor_process = QtCore.QProcess() self.ext_editor_process = QtCore.QProcess()
@ -688,6 +666,35 @@ def reset_mesh_deformation(mesh=None):
mesh = i mesh = i
mesh.ViewObject.applyDisplacement(0.0) mesh.ViewObject.applyDisplacement(0.0)
def prepare_analysis_objects():
MeshObject = None
MaterialObjects = []
FixedObjects = []
ForceObjects = []
PressureObjects = []
for i in FemGui.getActiveAnalysis().Member:
if i.isDerivedFrom("Fem::FemMeshObject"):
MeshObject = i
elif i.isDerivedFrom("App::MaterialObjectPython"):
MaterialObjectDict = {}
MaterialObjectDict['Object'] = i
MaterialObjects.append(MaterialObjectDict)
elif i.isDerivedFrom("Fem::ConstraintFixed"):
FixedObjectDict = {}
FixedObjectDict['Object'] = i
FixedObjects.append(FixedObjectDict)
elif i.isDerivedFrom("Fem::ConstraintForce"):
ForceObjectDict = {}
ForceObjectDict['Object'] = i
ForceObjects.append(ForceObjectDict)
elif i.isDerivedFrom("Fem::ConstraintPressure"):
PressureObjectDict = {}
PressureObjectDict['Object'] = i
PressureObjects.append(PressureObjectDict)
return (MeshObject, MaterialObjects, FixedObjects, ForceObjects, PressureObjects)
FreeCADGui.addCommand('Fem_NewMechanicalAnalysis', _CommandNewMechanicalAnalysis()) FreeCADGui.addCommand('Fem_NewMechanicalAnalysis', _CommandNewMechanicalAnalysis())
FreeCADGui.addCommand('Fem_CreateFromShape', _CommandFemFromShape()) FreeCADGui.addCommand('Fem_CreateFromShape', _CommandFemFromShape())
FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl()) FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl())