FEM: Split prepare_analysis_objects from check_prerequisites
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
parent
67714c5025
commit
28b0a8bb77
|
@ -393,6 +393,29 @@ class _JobControlTaskPanel:
|
|||
self.Start = time.time()
|
||||
self.femConsoleMessage("Check dependencies...")
|
||||
self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start))
|
||||
if not FemGui.getActiveAnalysis():
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No active Analysis")
|
||||
return False
|
||||
self.prepare_analysis_objects()
|
||||
|
||||
if not self.MeshObject:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No mesh object in the Analysis")
|
||||
return False
|
||||
|
||||
if not self.MaterialObjects:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No material object in the Analysis")
|
||||
return False
|
||||
|
||||
if not self.FixedObjects:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No fixed-constraint nodes defined in the Analysis")
|
||||
return False
|
||||
|
||||
if not (self.ForceObjects or self.PressureObjects):
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No force-constraint or pressure-constraint defined in the Analysis")
|
||||
return False
|
||||
return True
|
||||
|
||||
def prepare_analysis_objects(self):
|
||||
self.MeshObject = None
|
||||
# [{'Object':MaterialObject}, {}, ...]
|
||||
self.MaterialObjects = []
|
||||
|
@ -402,9 +425,6 @@ class _JobControlTaskPanel:
|
|||
self.ForceObjects = []
|
||||
# [{'Object':PressureObject, 'xxxxxxxx':value}, {}, ...]
|
||||
self.PressureObjects = []
|
||||
if not FemGui.getActiveAnalysis():
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No active Analysis")
|
||||
return False
|
||||
|
||||
for i in FemGui.getActiveAnalysis().Member:
|
||||
if i.isDerivedFrom("Fem::FemMeshObject"):
|
||||
|
@ -426,23 +446,6 @@ class _JobControlTaskPanel:
|
|||
PressureObjectDict['Object'] = i
|
||||
self.PressureObjects.append(PressureObjectDict)
|
||||
|
||||
if not self.MeshObject:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No mesh object in the Analysis")
|
||||
return False
|
||||
|
||||
if not self.MaterialObjects:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No material object in the Analysis")
|
||||
return False
|
||||
|
||||
if not self.FixedObjects:
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No fixed-constraint nodes defined in the Analysis")
|
||||
return False
|
||||
|
||||
if not (self.ForceObjects or self.PressureObjects):
|
||||
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No force-constraint or pressure-constraint defined in the Analysis")
|
||||
return False
|
||||
return True
|
||||
|
||||
def start_ext_editor(self, ext_editor_path, filename):
|
||||
if not hasattr(self, "ext_editor_process"):
|
||||
self.ext_editor_process = QtCore.QProcess()
|
||||
|
|
Loading…
Reference in New Issue
Block a user