개정판 9ea02c5c
issue #563: inst table test
Change-Id: I95c3868538af6a930defc99bee4037533f3a5996
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 2560 | 2560 |
|
| 2561 | 2561 |
for code in table[3]: |
| 2562 | 2562 |
sql = self.project.database.to_sql( \ |
| 2563 |
"insert into CustomCodes(UID, Code, Symbols, New Code, Table_UID) VALUES(?,?,?,?,?)")
|
|
| 2563 |
"insert into InstCodes(UID, Code, Symbols, NewCode, Table_UID) VALUES(?,?,?,?,?)")
|
|
| 2564 | 2564 |
param = (code[0], code[1], ','.join(code[2]), code[3], table[0]) |
| 2565 | 2565 |
cursor.execute(sql, param) |
| 2566 | 2566 |
# up to here |
| ... | ... | |
| 2681 | 2681 |
sql = "select uid, code, description, Allowables from [{}] where Table_UID='{}' " \
|
| 2682 | 2682 |
"order by code DESC".format(property, custom_table_uid) |
| 2683 | 2683 |
elif not symbol_attribute_uid and not custom_table_uid and inst_table_uid: |
| 2684 |
sql = "select uid, code, symbol, newcode from [{}] where Table_UID='{}' " \
|
|
| 2684 |
sql = "select uid, code, symbols, newcode from [{}] where Table_UID='{}' " \
|
|
| 2685 | 2685 |
"order by code DESC".format(property, inst_table_uid) |
| 2686 | 2686 |
elif custom: |
| 2687 | 2687 |
sql = "select uid, code, description, Allowables from CustomCodes \ |
| 2688 | 2688 |
where table_uid = (select uid from CustomTables where upper(name) like upper('{}'))".format(property)
|
| 2689 |
elif isnt:
|
|
| 2690 |
sql = "select uid, code, description, Allowables from InstCodes \
|
|
| 2689 |
elif inst:
|
|
| 2690 |
sql = "select uid, code, symbols, newcode from InstCodes \
|
|
| 2691 | 2691 |
where table_uid = (select uid from InstTables where upper(name) like upper('{}'))".format(property)
|
| 2692 | 2692 |
cursor.execute(sql) |
| 2693 | 2693 |
rows = cursor.fetchall() |
| 2694 |
if not isnt:
|
|
| 2694 |
if not inst:
|
|
| 2695 | 2695 |
for row in rows: |
| 2696 | 2696 |
if forCheckLineNumber: |
| 2697 | 2697 |
data = row['code'] |
| ... | ... | |
| 2702 | 2702 |
# result = None |
| 2703 | 2703 |
else: |
| 2704 | 2704 |
for row in rows: |
| 2705 |
data = (row['uid'], row['code'], row['symbol'], row['newcode']) |
|
| 2705 |
data = (row['uid'], row['code'], row['symbols'], row['newcode'])
|
|
| 2706 | 2706 |
result.append(data) |
| 2707 | 2707 |
# Catch the exception |
| 2708 | 2708 |
except Exception as ex: |
| DTI_PID/DTI_PID/CodeTableDialog.py | ||
|---|---|---|
| 261 | 261 |
tableDatas = docData.getCodeTable(tableName, forCheckLineNumber=False, custom_table_uid=attribute_uid) |
| 262 | 262 |
else: |
| 263 | 263 |
pass |
| 264 |
elif tableName == 'InstCodes' |
|
| 264 |
elif tableName == 'InstCodes':
|
|
| 265 | 265 |
if tableDatas is None: |
| 266 | 266 |
tableDatas = docData.getCodeTable(tableName, forCheckLineNumber=False, inst_table_uid=attribute_uid) |
| 267 | 267 |
else: |
| ... | ... | |
| 274 | 274 |
|
| 275 | 275 |
table.cellChanged.connect(self.cellValueChanged) |
| 276 | 276 |
self.checkRowAndAddRow(tableName, table) |
| 277 |
elif not self.inst: |
|
| 278 |
table.setColumnCount(4) |
|
| 279 |
table.setHorizontalHeaderLabels(['UID', 'Code', 'Desc.', 'Allowables']) |
|
| 280 |
table.hideColumn(0) |
|
| 281 |
|
|
| 282 |
self.fill_codes(table, tableDatas) |
|
| 283 |
|
|
| 284 |
table.horizontalHeaderItem(1).setSizeHint(QSize(30, 30)) |
|
| 285 |
table.cellChanged.connect(self.cellValueChanged) |
|
| 286 |
self.checkRowAndAddRow(tableName, table) |
|
| 287 |
self.setCurrentCode(table, tableName) |
|
| 288 | 277 |
else: |
| 289 | 278 |
table.setColumnCount(4) |
| 290 |
table.setHorizontalHeaderLabels(['UID', 'Code', 'Symbols.', 'New Code']) |
|
| 279 |
if not self.inst: |
|
| 280 |
table.setHorizontalHeaderLabels(['UID', 'Code', 'Desc.', 'Allowables']) |
|
| 281 |
else: |
|
| 282 |
table.setHorizontalHeaderLabels(['UID', 'Code', 'Symbols', 'New Code']) |
|
| 291 | 283 |
table.hideColumn(0) |
| 292 | 284 |
|
| 293 | 285 |
self.fill_codes(table, tableDatas) |
| 294 | 286 |
|
| 295 |
table.horizontalHeaderItem(1).setSizeHint(QSize(30, 30)) |
|
| 287 |
#table.horizontalHeaderItem(1).setSizeHint(QSize(30, 30))
|
|
| 296 | 288 |
table.cellChanged.connect(self.cellValueChanged) |
| 297 | 289 |
self.checkRowAndAddRow(tableName, table) |
| 298 | 290 |
self.setCurrentCode(table, tableName) |
| ... | ... | |
| 364 | 356 |
else: |
| 365 | 357 |
table.setItem(row, 0, QTableWidgetItem(tableData[0])) # UID |
| 366 | 358 |
table.setItem(row, 1, QTableWidgetItem(tableData[1])) # Code |
| 367 |
table.setItem(row, 2, QTableWidgetItem(','.join(tableData[3]))) # Symbols
|
|
| 359 |
table.setItem(row, 2, QTableWidgetItem(','.join(tableData[2]))) # Symbols
|
|
| 368 | 360 |
table.setItem(row, 3, QTableWidgetItem(tableData[3])) # New Code |
| 369 | 361 |
|
| 370 | 362 |
row += 1 |
| ... | ... | |
| 501 | 493 |
if tableName != "NominalDiameter": |
| 502 | 494 |
for row in range(rowCount): |
| 503 | 495 |
if table.isRowHidden(row): continue |
| 504 |
code = table.item(row, 1).text() |
|
| 496 |
if not self.inst: |
|
| 497 |
code = table.item(row, 1).text() |
|
| 498 |
else: |
|
| 499 |
code = table.item(row, 2).text() |
|
| 505 | 500 |
if not code: |
| 506 | 501 |
result = False |
| 507 | 502 |
if result: |
| DTI_PID/DTI_PID/SymbolAttrCodeTableDialog.py | ||
|---|---|---|
| 32 | 32 |
self.ui.buttonBox.rejected.connect(self.reject) |
| 33 | 33 |
|
| 34 | 34 |
# for custom code table |
| 35 |
if Table_Name != 'CustomCodes':
|
|
| 35 |
if Table_Name == 'CustomCodes':
|
|
| 36 | 36 |
self.setWindowTitle('Custom Code Table')
|
| 37 | 37 |
self.ui.tableWidgetSymbolAttributeCodeTable.setObjectName('tableWidget' + Table_Name)
|
| 38 |
elif Table_Name != 'InstCodes':
|
|
| 38 |
elif Table_Name == 'InstCodes':
|
|
| 39 | 39 |
self.setWindowTitle('Replace Code Table')
|
| 40 | 40 |
self.ui.tableWidgetSymbolAttributeCodeTable.setObjectName('tableWidget' + Table_Name)
|
| 41 | 41 |
self.inst = True |
| ... | ... | |
| 44 | 44 |
self.ui.label.setHidden(True) |
| 45 | 45 |
self.ui.spinBoxHeight.setHidden(True) |
| 46 | 46 |
self.ui.pushButtonRead.setHidden(True) |
| 47 |
self.ui.line.setHidden(True) |
|
| 47 | 48 |
|
| 48 | 49 |
self.settingTable(Table_Name, attribute_uid=attribute_uid, tableDatas=tableDatas) |
| 49 | 50 |
|
| ... | ... | |
| 64 | 65 |
if table.isRowHidden(row): |
| 65 | 66 |
continue |
| 66 | 67 |
else: |
| 67 |
uid = table.item(row, 0).text() if table.item(row, 0).text() else str(uuid.uuid4()) |
|
| 68 |
code = table.item(row, 1).text() if table.item(row, 1) else '' |
|
| 69 |
description = table.item(row, 2).text() if table.item(row, 2) is not None else '' |
|
| 70 |
allowables = table.item(row, 3).text().split(',') if table.item(row, 3) is not None else []
|
|
| 71 |
|
|
| 72 |
if code: |
|
| 73 |
self.code_data.append((uid, code, description, allowables)) |
|
| 68 |
if not self.inst: |
|
| 69 |
uid = table.item(row, 0).text() if table.item(row, 0).text() else str(uuid.uuid4()) |
|
| 70 |
code = table.item(row, 1).text() if table.item(row, 1) else '' |
|
| 71 |
description = table.item(row, 2).text() if table.item(row, 2) is not None else '' |
|
| 72 |
allowables = table.item(row, 3).text().split(',') if table.item(row, 3) is not None else []
|
|
| 73 |
|
|
| 74 |
if code: |
|
| 75 |
self.code_data.append((uid, code, description, allowables)) |
|
| 76 |
else: |
|
| 77 |
uid = table.item(row, 0).text() if table.item(row, 0).text() else str(uuid.uuid4()) |
|
| 78 |
code = table.item(row, 1).text() if table.item(row, 1) else '' |
|
| 79 |
symbols = table.item(row, 2).text().split(',') if table.item(row, 3) is not None else []
|
|
| 80 |
newCode = table.item(row, 3).text() if table.item(row, 1) else '' |
|
| 81 |
|
|
| 82 |
if symbols: |
|
| 83 |
self.code_data.append((uid, code, symbols, newCode)) |
|
| 74 | 84 |
|
| 75 | 85 |
self.isAccepted = True |
| 76 | 86 |
QDialog.accept(self) |
내보내기 Unified diff
