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

+ fix crash of ccx, use darker green for ccx output, fix typos

Browse Source
This commit is contained in:
wmayer 2015-04-09 23:26:06 +02:00
parent 4024f46677
commit e18796efc5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Fem/MechanicalAnalysis.py
View File

@ -283,10 +283,13 @@ class _JobControlTaskPanel:
print "calculixFinished()",exitCode
print self.Calculix.state()
# Restore previous cwd
QtCore.QDir.setCurrent(self.cwd)
self.printCalculiXstdout()
self.Timer.stop()
self.femConsoleMessage("Calculix done!", "#00FF00")
self.femConsoleMessage("Calculix done!", "#00AA00")
self.form.pushButton_generate.setText("Re-run Calculix")
print "Loading results...."
@ -297,7 +300,7 @@ class _JobControlTaskPanel:
QApplication.setOverrideCursor(Qt.WaitCursor)
CalculixLib.importFrd(self.Basename + '.frd',FemGui.getActiveAnalysis())
QApplication.restoreOverrideCursor()
self.femConsoleMessage("Loading results done!", "#00FF00")
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))
@ -561,8 +564,11 @@ class _JobControlTaskPanel:
self.femConsoleMessage("CalculiX binary: {}".format(self.CalculixBinary))
self.femConsoleMessage("Run Calculix...")
# run Claculix
print 'run Calclulix at: ', self.CalculixBinary , ' with: ', self.Basename
# run Calculix
print 'run Calculix at: ', self.CalculixBinary , ' with: ', self.Basename
# change cwd because ccx may crash if directory has no write permission
self.cwd = QtCore.QDir.currentPath()
QtCore.QDir.setCurrent(QtCore.QDir.homePath())
self.Calculix.start(self.CalculixBinary, ['-i',self.Basename])