From 6116231e32ad274766f9629d088487bf4aa0b3fd Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Sun, 18 Oct 2015 14:19:49 +0100 Subject: [PATCH] FEM: Rename pushButton_generate to pb_run_ccx Signed-off-by: Przemo Firszt --- src/Mod/Fem/MechanicalAnalysis.ui | 2 +- src/Mod/Fem/_JobControlTaskPanel.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/MechanicalAnalysis.ui b/src/Mod/Fem/MechanicalAnalysis.ui index d9e3eda3b504..924b4f309b1b 100644 --- a/src/Mod/Fem/MechanicalAnalysis.ui +++ b/src/Mod/Fem/MechanicalAnalysis.ui @@ -56,7 +56,7 @@ - + false diff --git a/src/Mod/Fem/_JobControlTaskPanel.py b/src/Mod/Fem/_JobControlTaskPanel.py index dc0966aaea04..7b7ca249275e 100644 --- a/src/Mod/Fem/_JobControlTaskPanel.py +++ b/src/Mod/Fem/_JobControlTaskPanel.py @@ -68,7 +68,7 @@ def __init__(self, analysis_object): QtCore.QObject.connect(self.form.tb_choose_working_dir, QtCore.SIGNAL("clicked()"), self.choose_working_dir) QtCore.QObject.connect(self.form.pb_write_inp, QtCore.SIGNAL("clicked()"), self.write_input_file_handler) QtCore.QObject.connect(self.form.pb_edit_inp, QtCore.SIGNAL("clicked()"), self.editCalculixInputFile) - QtCore.QObject.connect(self.form.pushButton_generate, QtCore.SIGNAL("clicked()"), self.runCalculix) + QtCore.QObject.connect(self.form.pb_run_ccx, QtCore.SIGNAL("clicked()"), self.runCalculix) QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("started()"), self.calculixStarted) QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("stateChanged(QProcess::ProcessState)"), self.calculixStateChanged) @@ -113,7 +113,7 @@ def calculixError(self, error): self.femConsoleMessage("CalculiX execute error: {}".format(error), "#FF0000") def calculixStarted(self): - self.form.pushButton_generate.setText("Break Calculix") + self.form.pb_run_ccx.setText("Break Calculix") print ("calculixStarted()") print (self.Calculix.state()) @@ -137,7 +137,7 @@ def calculixFinished(self, exitCode): self.femConsoleMessage("Calculix done!", "#00AA00") - self.form.pushButton_generate.setText("Re-run Calculix") + self.form.pb_run_ccx.setText("Re-run Calculix") self.femConsoleMessage("Loading result sets...") self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) fea = FemTools() @@ -187,7 +187,7 @@ def write_input_file_handler(self): self.inp_file_name = fea.inp_file_name self.femConsoleMessage("Write completed.") self.form.pb_edit_inp.setEnabled(True) - self.form.pushButton_generate.setEnabled(True) + self.form.pb_run_ccx.setEnabled(True) else: self.femConsoleMessage("Write .inp file failed!", "#FF0000") QApplication.restoreOverrideCursor()