개정판 991b9d10
issue #000: fix dictionary and prepare nozzle insertion
Change-Id: I24551c3bcaa5d1eff439582d07b969dc9ab6cfab
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 936 | 936 |
rows = cursor.fetchall() |
| 937 | 937 |
for row in rows: |
| 938 | 938 |
attr = [] |
| 939 |
attr.append(row[0]) # uid
|
|
| 940 |
attr.append(row[1]) # name
|
|
| 941 |
attr.append(row[2]) # area
|
|
| 942 |
attr.append(row[3]) # text
|
|
| 939 |
attr.append('UID') # uid
|
|
| 940 |
attr.append('Name') # name
|
|
| 941 |
attr.append('AREA') # area
|
|
| 942 |
attr.append('TEXT') # text
|
|
| 943 | 943 |
self._titleBlockProperties.append(attr) |
| 944 | 944 |
|
| 945 | 945 |
res = self._titleBlockProperties |
| ... | ... | |
| 1013 | 1013 |
rows = cursor.fetchall() |
| 1014 | 1014 |
for row in rows: |
| 1015 | 1015 |
attr = SymbolAttr() |
| 1016 |
attr.Attribute = row[0]
|
|
| 1016 |
attr.Attribute = row['Attribute']
|
|
| 1017 | 1017 |
self._equipment_attributes.append(attr) |
| 1018 | 1018 |
|
| 1019 | 1019 |
res = self._equipment_attributes |
| ... | ... | |
| 2104 | 2104 |
rows = cursor.fetchall() |
| 2105 | 2105 |
for row in rows: |
| 2106 | 2106 |
table = [] |
| 2107 |
table.append(uuid.UUID(row[0]))
|
|
| 2108 |
table.append(row[1])
|
|
| 2109 |
table.append(row[2])
|
|
| 2110 |
table.append(CodeTable.instance('CustomCodes', custom_table_uid=row[0]))
|
|
| 2107 |
table.append(uuid.UUID(row['UID']))
|
|
| 2108 |
table.append(row['Name'])
|
|
| 2109 |
table.append(row['Description'])
|
|
| 2110 |
table.append(CodeTable.instance('CustomCodes', custom_table_uid=row['UID']))
|
|
| 2111 | 2111 |
result.append(table) |
| 2112 | 2112 |
# Catch the exception |
| 2113 | 2113 |
except Exception as ex: |
| ... | ... | |
| 3084 | 3084 |
doc_names = "','".join(drawings) |
| 3085 | 3085 |
sql += f" where Drawings_UID in (select UID from Drawings where Name in ('{doc_names}'))"
|
| 3086 | 3086 |
cursor.execute(sql) |
| 3087 |
comps = [(row[0], row[1]) for row in cursor.fetchall()]
|
|
| 3087 |
comps = [(row['UID'], row['Name']) for row in cursor.fetchall()]
|
|
| 3088 | 3088 |
for comp in comps: |
| 3089 | 3089 |
sql = f"select b.Name,a.Value from LineNoAttributes a left join LineProperties b " \ |
| 3090 | 3090 |
f"on a.LineProperties_UID=b.UID where a.Components_UID='{comp[0]}'"
|
| ... | ... | |
| 3125 | 3125 |
sql += f" and A.Drawings_UID in (select UID from Drawings where Name in ('{doc_names}'))"
|
| 3126 | 3126 |
|
| 3127 | 3127 |
cursor.execute(sql) |
| 3128 |
comps = [(row[0], row[1], row[2], row[3], row[4]) for row in cursor.fetchall()]
|
|
| 3128 |
comps = [(row['UID'], row['NAME'], row['SymbolType_UID'], row['Type'], row['symbol']) for row in cursor.fetchall()]
|
|
| 3129 | 3129 |
for comp in comps: |
| 3130 | 3130 |
sql = f"select distinct B.Attribute,A.Value from Attributes A left join SymbolAttribute B on " \ |
| 3131 | 3131 |
f"A.SymbolAttribute_UID=B.UID where A.Components_UID='{comp[0]}'"
|
| ... | ... | |
| 3918 | 3918 |
cursor.execute(sql) |
| 3919 | 3919 |
rows = cursor.fetchall() |
| 3920 | 3920 |
for row in rows: |
| 3921 |
res.append(row[0])
|
|
| 3921 |
res.append(row['Attribute'])
|
|
| 3922 | 3922 |
# Catch the exception |
| 3923 | 3923 |
except Exception as ex: |
| 3924 | 3924 |
print('error occurred({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename,
|
| DTI_PID/DTI_PID/ReplaceSymbolDialog.py | ||
|---|---|---|
| 33 | 33 |
app_doc_data = AppDocData.instance() |
| 34 | 34 |
symbol_list = app_doc_data.getTargetSymbolList(all=True) |
| 35 | 35 |
|
| 36 |
# for nozzle and equipment package |
|
| 37 |
self.ui.comboBoxFind.addItem('Equipment Package')
|
|
| 36 | 38 |
for symbol in symbol_list: |
| 37 | 39 |
self.ui.comboBoxFind.addItem(symbol.getName()) |
| 38 | 40 |
self.ui.comboBoxReplace.addItem(symbol.getName()) |
내보내기 Unified diff
