개정판 878d0b2d
issue #563: inst add conditions test
Change-Id: I9feced616e2a194da37ad7cd97dd4fb580fdfb0f
DTI_PID/DTI_PID/CodeTableDialog.py | ||
---|---|---|
500 | 500 |
if not self.inst: |
501 | 501 |
code = table.item(row, 1).text() |
502 | 502 |
else: |
503 |
texts = [table.item(row, 1).text(), table.item(row, 2).text(), table.item(row, 3).text()] |
|
504 |
code = False if len([text for text in texts if text == '']) >= 2 else True |
|
503 |
texts = [[table.item(row, 1).text(), table.item(row, 2).text(), table.item(row, 3).text()], \ |
|
504 |
[table.item(row, 4).text(), table.item(row, 5).text()]] |
|
505 |
code = True if len([text for text in texts[0] if text == '']) <= 2 and len([text for text in texts[1] if text == '']) <= 1 else False |
|
505 | 506 |
if not code: |
506 | 507 |
result = False |
507 | 508 |
if result: |
... | ... | |
511 | 512 |
table.setItem(rowCount, 1, QTableWidgetItem('')) |
512 | 513 |
table.setItem(rowCount, 2, QTableWidgetItem('')) |
513 | 514 |
table.setItem(rowCount, 3, QTableWidgetItem('')) |
515 |
if self.inst: |
|
516 |
table.setItem(rowCount, 4, QTableWidgetItem('')) |
|
517 |
table.setItem(rowCount, 5, QTableWidgetItem('')) |
|
518 |
table.setItem(rowCount, 6, QTableWidgetItem('')) |
|
514 | 519 |
table.cellChanged.connect(self.cellValueChanged) |
515 | 520 |
else: |
516 | 521 |
columnCount = table.columnCount() |
... | ... | |
597 | 602 |
else: |
598 | 603 |
table.resizeColumnToContents(3) |
599 | 604 |
elif self.inst: |
600 |
item1 = table.item(row, 1) |
|
601 |
item2 = table.item(row, 2) |
|
602 |
item3 = table.item(row, 3) |
|
603 |
if not item1 or not item2 or not item3: |
|
604 |
return |
|
605 |
|
|
606 | 605 |
self.checkRowAndAddRow(tabText, table) |
607 | 606 |
self.setCurrentCode(table, tabText) |
608 | 607 |
else: |
... | ... | |
905 | 904 |
@author kyouho |
906 | 905 |
@date 2018.07.12 |
907 | 906 |
''' |
908 |
|
|
909 | 907 |
def saveCommonCodeData(self, tableName): |
910 | 908 |
datas = [] |
911 | 909 |
try: |
내보내기 Unified diff