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

FEM: Ignore unicode conversion errors

Browse Source 
Solution suggested by shoogen
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-04-21 21:37:13 +01:00 committed by wmayer
parent c5850e510a
commit 129cc88b0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ class _JobControlTaskPanel:
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', 'replace'))
self.form.textEdit_Output.setText(self.fem_console_message) self.form.textEdit_Output.setText(self.fem_console_message)
def printCalculiXstdout(self): def printCalculiXstdout(self):
@ -262,7 +262,7 @@ class _JobControlTaskPanel:
self.femConsoleMessage("CalculiX stdout is empty", "#FF0000") self.femConsoleMessage("CalculiX stdout is empty", "#FF0000")
else: else:
try: try:
out = unicode(out, 'utf-8') out = unicode(out, 'utf-8', 'replace')
rx = QtCore.QRegExp("\\*ERROR.*\\n\\n") rx = QtCore.QRegExp("\\*ERROR.*\\n\\n")
rx.setMinimal(True) rx.setMinimal(True)
pos = rx.indexIn(out) pos = rx.indexIn(out)