Commit 83f44008 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix minor issues

parent 6576108e
......@@ -29,11 +29,16 @@ def errCode():
errCodes = {}
# Lines: #define ERR_FCE_SIT_4_rc 1015 /*(1 .. 5)*/
for line in f.readlines():
if line.startswith('#define ERR'):
errName=re.search('(ERR_)(?P<A>\w*)',line).group('A')
errValue=int(re.search('[0-9]+',line).group(0))
const=re.search('(/\*\s*)(?P<A>[\S\s]*)(\*/)',line).group('A').strip()
content = line.split()[1:]
errName = content[0][4:]
errValue = int(content[1])
const = ''.join(content[2:])[slice(2, -2)]
# errName=re.search('(ERR_)(?P<A>\w*)',line).group('A')
# errValue=int(re.search('[0-9]+',line).group(0))
# const=re.search('(/\*\s*)(?P<A>[\S\s]*)(\*/)',line).group('A').strip()
errCodes[errValue]={'name':errName, 'constraint':const}
print errCodes
......
......@@ -251,7 +251,7 @@ endmscdocument;
''')
msc_name = self.fv_name + '_trace_' + strftime("%Y%m%d%H%S") + '.msc'
msc_file = open(msc_name, 'w')
msc_file.write('\n'.join(self.msc))
msc_file.write('\n'.join(self.msc).encode('latin1'))
msc_file.close()
def run(self, script=None):
......
......@@ -830,7 +830,7 @@ class sdlHandler(QObject):
question = QMessageBox(self.parent,
'Evaluate Continuous States', '')
question.setText('Do you want to send a new message or evaluate '
'evaluate continuous signals (default in 3 sec)?')
'continuous signals (default in 3 seconds!)?')
question.addButton('Send message', QMessageBox.AcceptRole)
question.addButton('Evaluate continuous signals',
QMessageBox.RejectRole)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment