개정판 18ed0f23
issue #1124: fix title block
Change-Id: Ib36def089ec55c946193a200d94e880f3588d8f9
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 845 | 845 |
@date 2018.11.09 |
| 846 | 846 |
''' |
| 847 | 847 |
try: |
| 848 |
for titleBlockProp in titleBlockProps: |
|
| 849 |
titleBlockProp[1] = self.imgName + '!@!' + titleBlockProp[1] |
|
| 850 | 848 |
originTitleBlockProps = self.getTitleBlockProperties() |
| 851 | 849 |
deletedTitleBlockProps = [] |
| 852 | 850 |
for originTitleBlockProp in originTitleBlockProps: |
| ... | ... | |
| 906 | 904 |
cursor.execute(sql) |
| 907 | 905 |
rows = cursor.fetchall() |
| 908 | 906 |
for row in rows: |
| 909 |
if row[1].split('!@!')[0] != self.imgName:
|
|
| 910 |
continue |
|
| 911 |
else: |
|
| 912 |
attr = [] |
|
| 913 |
attr.append(row[0]) # uid |
|
| 914 |
attr.append(row[1].split('!@!')[1]) # name
|
|
| 915 |
attr.append(row[2]) # area |
|
| 916 |
self._titleBlockProperties.append(attr) |
|
| 907 |
attr = [] |
|
| 908 |
attr.append(row[0]) # uid |
|
| 909 |
attr.append(row[1]) # name |
|
| 910 |
attr.append(row[2]) # area |
|
| 911 |
self._titleBlockProperties.append(attr) |
|
| 917 | 912 |
|
| 918 | 913 |
res = self._titleBlockProperties |
| 919 | 914 |
# Catch the exception |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 631 | 631 |
item) is not QEngineeringLineNoTextItem and type(item) is not QEngineeringUnknownItem] |
| 632 | 632 |
db_items.extend([item for item in items if type(item) is QEngineeringLineNoTextItem]) |
| 633 | 633 |
db_items.extend([line for line in appDocData.tracerLineNos if type(line) is QEngineeringTrimLineNoTextItem]) |
| 634 |
db_items.extend(titleBlockItems) |
|
| 634 |
#db_items.extend(titleBlockItems)
|
|
| 635 | 635 |
configs = appDocData.getConfigs('Data Load', 'Xml First')
|
| 636 | 636 |
if configs and int(configs[0].value) is 1: |
| 637 | 637 |
db_items.extend([item for item in items if type(item) is QEngineeringUnknownItem]) |
내보내기 Unified diff
