From 50bcdaa90f9bd9df15cdc459f7283617eae36df6 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Sun, 18 Oct 2015 14:02:50 +0100 Subject: [PATCH] FEM: Rename label_Time to l_time 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 cb23c4cacd6f..8c22f69fc314 100644 --- a/src/Mod/Fem/MechanicalAnalysis.ui +++ b/src/Mod/Fem/MechanicalAnalysis.ui @@ -73,7 +73,7 @@ - + 12 diff --git a/src/Mod/Fem/_JobControlTaskPanel.py b/src/Mod/Fem/_JobControlTaskPanel.py index 7496051e8af3..5782abb458b2 100644 --- a/src/Mod/Fem/_JobControlTaskPanel.py +++ b/src/Mod/Fem/_JobControlTaskPanel.py @@ -106,7 +106,7 @@ def printCalculiXstdout(self): def UpdateText(self): if(self.Calculix.state() == QtCore.QProcess.ProcessState.Running): - self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) + self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) def calculixError(self, error): print ("Error() {}".format(error)) @@ -139,7 +139,7 @@ def calculixFinished(self, exitCode): self.form.pushButton_generate.setText("Re-run Calculix") self.femConsoleMessage("Loading result sets...") - self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) + self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) fea = FemTools() fea.reset_all() frd_result_file = os.path.splitext(self.inp_file_name)[0] + '.frd' @@ -150,7 +150,7 @@ def calculixFinished(self, exitCode): self.femConsoleMessage("Loading results done!", "#00AA00") else: self.femConsoleMessage("Loading results failed! Results file doesn\'t exist", "#FF0000") - self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) + self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Close) @@ -195,7 +195,7 @@ def write_input_file_handler(self): def check_prerequisites_helper(self): self.Start = time.time() self.femConsoleMessage("Check dependencies...") - self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) + self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) fea = FemTools() fea.update_objects()