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

FEM: Clean white spaces in MechanicalAnalysis.py

Browse Source 
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-04-20 21:36:32 +01:00 committed by wmayer
parent f482dc2383
commit d548490a2b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ class _JobControlTaskPanel:
# the panel has a tree widget that contains categories # the panel has a tree widget that contains categories
# for the subcomponents, such as additions, subtractions. # for the subcomponents, such as additions, subtractions.
# the categories are shown only if they are not empty. # the categories are shown only if they are not empty.
self.form=FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui") self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem") self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
ccx_binary = self.fem_prefs.GetString("ccxBinaryPath","") ccx_binary = self.fem_prefs.GetString("ccxBinaryPath","")
if ccx_binary: if ccx_binary:
@ -222,7 +222,7 @@ class _JobControlTaskPanel:
self.CalculixBinary = FreeCAD.getHomePath() + 'bin/ccx.exe' self.CalculixBinary = FreeCAD.getHomePath() + 'bin/ccx.exe'
else: else:
self.CalculixBinary = 'ccx' self.CalculixBinary = 'ccx'
self.TempDir = FreeCAD.ActiveDocument.TransientDir.replace('\\','/') + '/FemAnl_'+ object.Uid[-4:] self.TempDir = FreeCAD.ActiveDocument.TransientDir.replace('\\','/') + '/FemAnl_' + object.Uid[-4:]
if not os.path.isdir(self.TempDir): if not os.path.isdir(self.TempDir):
os.mkdir(self.TempDir) os.mkdir(self.TempDir)
@ -231,9 +231,9 @@ class _JobControlTaskPanel:
self.Calculix = QtCore.QProcess() self.Calculix = QtCore.QProcess()
self.Timer = QtCore.QTimer() self.Timer = QtCore.QTimer()
self.Timer.start(300) self.Timer.start(300)
self.fem_console_message = '' self.fem_console_message = ''
#Connect Signals and Slots #Connect Signals and Slots
QtCore.QObject.connect(self.form.toolButton_chooseOutputDir, QtCore.SIGNAL("clicked()"), self.chooseOutputDir) QtCore.QObject.connect(self.form.toolButton_chooseOutputDir, QtCore.SIGNAL("clicked()"), self.chooseOutputDir)
QtCore.QObject.connect(self.form.pushButton_write, QtCore.SIGNAL("clicked()"), self.write_input_file_handler) QtCore.QObject.connect(self.form.pushButton_write, QtCore.SIGNAL("clicked()"), self.write_input_file_handler)
@ -248,10 +248,10 @@ class _JobControlTaskPanel:
QtCore.QObject.connect(self.Timer, QtCore.SIGNAL("timeout()"), self.UpdateText) QtCore.QObject.connect(self.Timer, QtCore.SIGNAL("timeout()"), self.UpdateText)
self.update() self.update()
def femConsoleMessage(self, message="", color="#000000"): def femConsoleMessage(self, message="", color="#000000"):
self.fem_console_message = self.fem_console_message + '<font color="#0000FF">{0:4.1f}:</font> <font color="{1}">{2}</font><br>'.\ self.fem_console_message = self.fem_console_message + '<font color="#0000FF">{0:4.1f}:</font> <font color="{1}">{2}</font><br>'.\
format(time.time() - self.Start, color, message.encode('utf-8')) format(time.time() - self.Start, color, message.encode('utf-8'))
self.form.textEdit_Output.setText(self.fem_console_message) self.form.textEdit_Output.setText(self.fem_console_message)
def printCalculiXstdout(self): def printCalculiXstdout(self):
@ -596,7 +596,7 @@ class _JobControlTaskPanel:
def start_ext_editor(self, ext_editor_path, filename): def start_ext_editor(self, ext_editor_path, filename):
if not hasattr(self, "ext_editor_process"): if not hasattr(self, "ext_editor_process"):
self.ext_editor_process = QtCore.QProcess() self.ext_editor_process = QtCore.QProcess()
if self.ext_editor_process.state() != QtCore.QProcess.Running: if self.ext_editor_process.state() != QtCore.QProcess.Running:
self.ext_editor_process.start(ext_editor_path, [filename]) self.ext_editor_process.start(ext_editor_path, [filename])
def editCalculixInputFile(self): def editCalculixInputFile(self):
@ -620,7 +620,7 @@ class _JobControlTaskPanel:
self.femConsoleMessage("Run Calculix...") self.femConsoleMessage("Run Calculix...")
# run Calculix # run Calculix
print 'run Calculix at: ', self.CalculixBinary , ' with: ', self.Basename print 'run Calculix at: ', self.CalculixBinary, ' with: ', self.Basename
# 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()