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

FEM: print should use brackets for python3 compatibility

Browse Source 
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-10-15 15:16:16 +01:00 committed by wmayer
parent cfc2a4d1f2
commit f0951065c9
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/_CommandQuickAnalysis.py
View File

@ -48,7 +48,7 @@ class _CommandQuickAnalysis(FemCommands):
self.fea.load_results() self.fea.load_results()
self.show_results_on_mesh() self.show_results_on_mesh()
else: else:
print "CalculiX failed ccx finished with error {}".format(ret_code) print ("CalculiX failed ccx finished with error {}".format(ret_code))
self.fea = FemTools() self.fea = FemTools()
self.fea.reset_all() self.fea.reset_all()

21
src/Mod/Fem/_JobControlTaskPanel.py
View File

@ -45,7 +45,7 @@ class _JobControlTaskPanel:
ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "") ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "")
if ccx_binary: if ccx_binary:
self.CalculixBinary = ccx_binary self.CalculixBinary = ccx_binary
print "Using ccx binary path from FEM preferences: {}".format(ccx_binary) print ("Using ccx binary path from FEM preferences: {}".format(ccx_binary))
else: else:
from platform import system from platform import system
if system() == 'Linux': if system() == 'Linux':
@ -109,13 +109,13 @@ class _JobControlTaskPanel:
self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start))
def calculixError(self, error): def calculixError(self, error):
print "Error()", error print ("Error() {}".format(error))
self.femConsoleMessage("CalculiX execute error: {}".format(error), "#FF0000") self.femConsoleMessage("CalculiX execute error: {}".format(error), "#FF0000")
def calculixStarted(self): def calculixStarted(self):
print "calculixStarted()"
print self.Calculix.state()
self.form.pushButton_generate.setText("Break Calculix") self.form.pushButton_generate.setText("Break Calculix")
print ("calculixStarted()")
print (self.Calculix.state())
def calculixStateChanged(self, newState): def calculixStateChanged(self, newState):
if (newState == QtCore.QProcess.ProcessState.Starting): if (newState == QtCore.QProcess.ProcessState.Starting):
@ -126,8 +126,8 @@ class _JobControlTaskPanel:
self.femConsoleMessage("CalculiX stopped.") self.femConsoleMessage("CalculiX stopped.")
def calculixFinished(self, exitCode): def calculixFinished(self, exitCode):
print "calculixFinished()", exitCode print ("calculixFinished() {}".format(exitCode))
print self.Calculix.state() print (self.Calculix.state())
# Restore previous cwd # Restore previous cwd
QtCore.QDir.setCurrent(self.cwd) QtCore.QDir.setCurrent(self.cwd)
@ -138,7 +138,6 @@ class _JobControlTaskPanel:
self.femConsoleMessage("Calculix done!", "#00AA00") self.femConsoleMessage("Calculix done!", "#00AA00")
self.form.pushButton_generate.setText("Re-run Calculix") self.form.pushButton_generate.setText("Re-run Calculix")
print "Loading results...."
self.femConsoleMessage("Loading result sets...") self.femConsoleMessage("Loading result sets...")
self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start)) self.form.label_Time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start))
fea = FemTools() fea = FemTools()
@ -213,7 +212,7 @@ class _JobControlTaskPanel:
self.ext_editor_process.start(ext_editor_path, [filename]) self.ext_editor_process.start(ext_editor_path, [filename])
def editCalculixInputFile(self): def editCalculixInputFile(self):
print 'editCalculixInputFile {}'.format(self.inp_file_name) print ('editCalculixInputFile {}'.format(self.inp_file_name))
if self.fem_prefs.GetBool("UseInternalEditor", True): if self.fem_prefs.GetBool("UseInternalEditor", True):
FemGui.open(self.inp_file_name) FemGui.open(self.inp_file_name)
else: else:
@ -221,18 +220,18 @@ class _JobControlTaskPanel:
if ext_editor_path: if ext_editor_path:
self.start_ext_editor(ext_editor_path, self.inp_file_name) self.start_ext_editor(ext_editor_path, self.inp_file_name)
else: else:
print "External editor is not defined in FEM preferences. Falling back to internal editor" print ("External editor is not defined in FEM preferences. Falling back to internal editor")
FemGui.open(self.inp_file_name) FemGui.open(self.inp_file_name)
def runCalculix(self): def runCalculix(self):
print 'runCalculix' print ('runCalculix')
self.Start = time.time() self.Start = time.time()
self.femConsoleMessage("CalculiX binary: {}".format(self.CalculixBinary)) self.femConsoleMessage("CalculiX binary: {}".format(self.CalculixBinary))
self.femConsoleMessage("Run Calculix...") self.femConsoleMessage("Run Calculix...")
# run Calculix # run Calculix
print 'run Calculix at: ', self.CalculixBinary, ' with: ', os.path.splitext(self.inp_file_name)[0] print ('run Calculix at: {} with: {}'.format(self.CalculixBinary, os.path.splitext(self.inp_file_name)[0]))
# change cwd because ccx may crash if directory has no write permission # change cwd because ccx may crash if directory has no write permission
# there is also a limit of the length of file names so jump to the document directory # there is also a limit of the length of file names so jump to the document directory
self.cwd = QtCore.QDir.currentPath() self.cwd = QtCore.QDir.currentPath()