개정판 ae846d6f
issue #563: fix ui and auto determine
Change-Id: Ibcf3df35ce71ce786c1b64f309925e018ca198c9
| DTI_PID/DTI_PID/LineTypeConditions.py | ||
|---|---|---|
| 42 | 42 |
from EngineeringLineItem import QEngineeringLineItem |
| 43 | 43 |
|
| 44 | 44 |
try: |
| 45 |
if len(items) == len([condition for condition in self.conditions if condition[0] and condition[0] != '']): |
|
| 45 |
if (self.conditions[0][0] is None or self.conditions[0][0] == '') and (self.conditions[1][0] is None or self.conditions[1][0] == ''): return False |
|
| 46 |
|
|
| 47 |
if len(items) is not 0 and len(items) == len([condition for condition in self.conditions if condition[0] and condition[0] != '']): |
|
| 46 | 48 |
for condition in self.conditions: |
| 47 | 49 |
if not condition[0]: continue |
| 48 | 50 |
matches = [] |
| DTI_PID/DTI_PID/LineTypeConditionsDialog.py | ||
|---|---|---|
| 24 | 24 |
for row in range(self.ui.tableWidgetLineTypeConditions.rowCount()): |
| 25 | 25 |
""" Type """ |
| 26 | 26 |
combobox = QComboBox() |
| 27 |
combobox.addItems(['Instrument', 'Line', ''])
|
|
| 28 |
combobox.setCurrentText(line_type_conditions._conditions[row][0] if line_type_conditions._conditions[row][0] else 'Instrument')
|
|
| 27 |
combobox.addItems(['', 'Instrument', 'Line'])
|
|
| 28 |
combobox.setCurrentText(line_type_conditions._conditions[row][0] if line_type_conditions._conditions[row][0] else '') |
|
| 29 | 29 |
self.ui.tableWidgetLineTypeConditions.setCellWidget(row, 0, combobox) |
| 30 | 30 |
|
| 31 | 31 |
item = QTableWidgetItem(line_type_conditions._conditions[row][1] if line_type_conditions._conditions[row][1] else '') |
내보내기 Unified diff
