개정판 8089da35
bm list line no
Change-Id: I1b536c87e8123c1eb8a83944b00a14eda7bf3236
DTI_PID/DTI_PID/AppDocData.py | ||
---|---|---|
3905 | 3905 |
# Get a cursor object |
3906 | 3906 |
cursor = conn.cursor() |
3907 | 3907 | |
3908 |
sql = "select a.UID,D.Name,E.Name as 'Drawing Name',C.Attribute,B.Value from Components a " \ |
|
3908 |
sql = "select a.UID,D.Name,E.Name as 'Drawing Name',C.Attribute,B.Value,a.[Owner] from Components a " \
|
|
3909 | 3909 |
"join Attributes B on a.UID=B.Components_UID " \ |
3910 | 3910 |
"join SymbolAttribute C on B.SymbolAttribute_UID=C.UID " \ |
3911 | 3911 |
"join Symbol D on a.Symbol_UID=D.UID " \ |
... | ... | |
3924 | 3924 |
matches[0][row['Attribute']] = row['Value'] |
3925 | 3925 |
else: |
3926 | 3926 |
data = {'UID': row['UID'], 'ITEM_NO': row['Name'], 'Drawing Name': row['Drawing Name'], |
3927 |
row['Attribute']: row['Value']} |
|
3927 |
'Owner': row['Owner'], row['Attribute']: row['Value']}
|
|
3928 | 3928 |
result.append(data) |
3929 | 3929 | |
3930 | 3930 |
# Catch the exception |
... | ... | |
3982 | 3982 |
# Get a cursor object |
3983 | 3983 |
cursor = conn.cursor() |
3984 | 3984 | |
3985 |
sql = "select a.UID,D.Name,E.Name as 'Drawing Name',C.Attribute,B.Value,a.Symbol_UID from Components a " \ |
|
3985 |
sql = "select a.UID,D.Name,E.Name as 'Drawing Name',C.Attribute,B.Value,a.Symbol_UID,a.[Owner] from Components a " \
|
|
3986 | 3986 |
"join Attributes B on a.UID=B.Components_UID " \ |
3987 | 3987 |
"join SymbolAttribute C on B.SymbolAttribute_UID=C.UID " \ |
3988 | 3988 |
"join Symbol D on a.Symbol_UID=D.UID " \ |
... | ... | |
4000 | 4000 |
if matches: |
4001 | 4001 |
matches[0][row['Attribute']] = row['Value'] |
4002 | 4002 |
else: |
4003 |
data = {'UID': row['UID'], 'ITEM_NO': row['Name'], 'Drawing Name': row['Drawing Name'], |
|
4003 |
data = {'UID': row['UID'], 'ITEM_NO': row['Name'], 'Drawing Name': row['Drawing Name'], 'Owner': row['Owner'],
|
|
4004 | 4004 |
'Symbol_UID': int(row['Symbol_UID']), row['Attribute']: row['Value']} |
4005 | 4005 |
result.append(data) |
4006 | 4006 |
# Catch the exception |
DTI_PID/DTI_PID/BMSettingDialog.py | ||
---|---|---|
182 | 182 |
self.ui.tableViewSymbolList.selectionModel().setCurrentIndex(self.symbolListModel.index(0, 0), QItemSelectionModel.Select) |
183 | 183 |
|
184 | 184 |
# for test |
185 |
self.on_symbol_changed(self.proxy.index(0, 0)) |
|
186 |
#self.on_symbol_changed(self.symbolListModel.index(0, 0))
|
|
185 |
#self.on_symbol_changed(self.proxy.index(0, 0))
|
|
186 |
self.on_symbol_changed(self.symbolListModel.index(0, 0)) |
|
187 | 187 | |
188 | 188 |
# for test |
189 | 189 |
''' |
DTI_PID/DTI_PID/ItemDataExportDialog.py | ||
---|---|---|
36 | 36 | |
37 | 37 |
self.bmValveData = [] |
38 | 38 |
self.bmInstData = [] |
39 |
self.bmLineData = [] |
|
39 | 40 | |
40 | 41 |
self.lineColumnListAll = [] |
41 | 42 |
self.equipColumnListAll = [] |
... | ... | |
198 | 199 |
wb.create_sheet(self.tr(self.ui.tabWidget.tabText(i))) |
199 | 200 | |
200 | 201 |
for index in range(self.ui.tabWidget.count()): |
201 |
self.qtable_to_sheet(self.viewTables[QItemDataExportDialog.DATA_LIST[index]], wb.worksheets[index], |
|
202 |
index) |
|
202 |
_index = index |
|
203 |
if index > 3: |
|
204 |
_index = index + 2 |
|
205 |
self.qtable_to_sheet(self.viewTables[QItemDataExportDialog.DATA_LIST[_index]], wb.worksheets[index], _index) |
|
203 | 206 | |
204 | 207 |
fileName, ext = os.path.splitext(fileName[0]) |
205 | 208 |
wb.save(fileName + ext if ext.upper() == '.XLSX' else fileName + '.xlsx') |
... | ... | |
370 | 373 |
self.bmColumnListAll = [] |
371 | 374 |
self.bmColumnListAll.extend([prop.Attribute for prop in app_doc_data.get_valve_attributes()]) |
372 | 375 |
self.bmColumnListAll.extend([prop.Attribute for prop in app_doc_data.get_instrument_attributes()]) |
376 |
self.bmColumnListAll.extend([prop.Attribute for prop in app_doc_data.getLineProperties()]) |
|
373 | 377 |
self.bmColumnListAll = list(set(self.bmColumnListAll)) |
374 | 378 |
self.bmColumnListAll = ['UID', 'ITEM_NO', 'Quantity'] + self.bmColumnListAll |
375 | 379 | |
... | ... | |
658 | 662 |
drawings = self.checked_drawings |
659 | 663 | |
660 | 664 |
dataList = docData.get_line_data_list(drawings if drawings else None) |
665 |
self.bmLineData = dataList |
|
661 | 666 |
lineTable.setRowCount(len(dataList)) |
662 | 667 |
row = 0 |
663 | 668 |
for data in dataList: |
... | ... | |
728 | 733 |
bmList = {} |
729 | 734 | |
730 | 735 |
for data in self.bmValveData + self.bmInstData: |
736 |
match = None |
|
737 |
for lineNo in self.bmLineData: |
|
738 |
for lineAttr in lineNo: |
|
739 |
if lineAttr[0] == 'UID' and lineAttr[1] == data['Owner']: |
|
740 |
match = lineNo |
|
741 |
break |
|
742 |
if match: |
|
743 |
break |
|
744 | ||
745 |
if match: |
|
746 |
for key, value in match: |
|
747 |
if key in data: |
|
748 |
continue |
|
749 |
else: |
|
750 |
data[key] = value |
|
751 | ||
752 |
for data in self.bmValveData + self.bmInstData: |
|
731 | 753 |
for key, value in symbol_mapping.items(): |
732 | 754 |
if data['ITEM_NO'] in value: |
733 | 755 |
data['ITEM_NO'] = key |
내보내기 Unified diff