개정판 90a0edd7
issue #49: fix allowable
Change-Id: Ifb9f71c83ccdd387472cde2914ce8c6565f75532
| DTI_PID/DTI_PID/CodeTables.py | ||
|---|---|---|
| 17 | 17 |
def __init__(self, name, values): |
| 18 | 18 |
self.name = name |
| 19 | 19 |
if self.name != "NOMINALDIAMETER": |
| 20 |
self.values = [(x[0], x[1], x[2], sorted(x[3].replace(' ', '').split(','), key=lambda param:len(param), reverse=True)) for x in values]
|
|
| 20 |
self.values = [] |
|
| 21 |
for x in values: |
|
| 22 |
allowable = x[3].replace(' ', '').split(',')
|
|
| 23 |
if len(allowable) == 1 or len(allowable) == 0: |
|
| 24 |
self.values.append((x[0], x[1], x[2], allowable)) |
|
| 25 |
else: |
|
| 26 |
self.values.append((x[0], x[1], x[2], [allowable[0]] + sorted(allowable[1:], key=lambda param:len(param), reverse=True))) |
|
| 21 | 27 |
else: |
| 22 | 28 |
self.values = values |
| 23 | 29 |
|
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 1193 | 1193 |
item.area = area.name |
| 1194 | 1194 |
break |
| 1195 | 1195 |
else: |
| 1196 |
message = 'error occurred({}) in {}:{}'.format(self.tr('Fail to create text.'),
|
|
| 1197 |
sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno) |
|
| 1198 |
self.addMessage.emit(MessageType.Normal, message) |
|
| 1196 |
self.addMessage.emit(MessageType.Normal, self.tr('Fail to create text.'))
|
|
| 1199 | 1197 |
elif QDialog.Accepted == res and not textInfoList: |
| 1200 | 1198 |
QMessageBox.about(self.graphicsView, self.tr("Notice"), self.tr("Fail to recognize text"))
|
| 1201 | 1199 |
except Exception as ex: |
내보내기 Unified diff
