Skip to content

Commit

Permalink
FEM: Rename label_Time to l_time
Browse files Browse the repository at this point in the history
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
  • Loading branch information
PrzemoF authored and wwmayer committed Oct 19, 2015
1 parent cf7f82c commit 50bcdaa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Fem/MechanicalAnalysis.ui
Expand Up @@ -73,7 +73,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="label_Time">
<widget class="QLabel" name="l_time">
<property name="font">
<font>
<pointsize>12</pointsize>
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Fem/_JobControlTaskPanel.py
Expand Up @@ -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))
Expand Down Expand Up @@ -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'
Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 50bcdaa

Please sign in to comment.