개정판 1a3f8ccd
issue #000: fix progress bar with xml and loading from db speed on going
Change-Id: Ifeb04ed938e253c12c2d4f9d8f1e4b078fec00a6
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 2587 | 2587 |
root = xml.getroot() |
| 2588 | 2588 |
|
| 2589 | 2589 |
maxValue = 0 |
| 2590 |
maxValue = maxValue + len(list(root.iter('SYMBOL')))
|
|
| 2590 |
maxValue = maxValue + len(list(root.iter('SYMBOL'))) - len(list(root.iterfind('LINENOS/LINE_NO/RUN/SYMBOL'))) - len(list(root.iterfind('TRIMLINENOS/TRIM_LINE_NO/RUN/SYMBOL')))
|
|
| 2591 | 2591 |
maxValue = maxValue + len(list(root.iterfind('TEXTINFOS/ATTRIBUTE')))
|
| 2592 | 2592 |
maxValue = maxValue + len(list(root.iterfind('NOTES/ATTRIBUTE')))
|
| 2593 | 2593 |
maxValue = maxValue + len(list(root.iter('LINE_NO')))
|
| 2594 |
maxValue = maxValue + len(list(root.iter('LINE')))
|
|
| 2594 |
maxValue = maxValue + len(list(root.iter('LINE'))) - len(list(root.iterfind('LINENOS/LINE_NO/RUN/LINE'))) - len(list(root.iterfind('TRIMLINENOS/TRIM_LINE_NO/RUN/LINE')))
|
|
| 2595 | 2595 |
maxValue = maxValue + len(list(root.iter('UNKNOWN')))
|
| 2596 |
maxValue = maxValue + len(list(root.iter('SIZETEXT')))
|
|
| 2596 |
#maxValue = maxValue + len(list(root.iter('SIZETEXT')))
|
|
| 2597 | 2597 |
maxValue = maxValue + len(list(root.iter('TRIM_LINE_NO')))
|
| 2598 | 2598 |
self.progress.setMaximum(maxValue) |
| 2599 | 2599 |
|
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 1273 | 1273 |
baseSymbol = dbData.baseSymbol |
| 1274 | 1274 |
|
| 1275 | 1275 |
childSymbolNode = component['AdditionalSymbol'] |
| 1276 |
childSymbol = childSymbolNode if childSymbolNode is not None else ''
|
|
| 1276 |
childSymbol = dbData.additionalSymbol if childSymbolNode is not None else ''
|
|
| 1277 | 1277 |
|
| 1278 | 1278 |
owner = component['Owner'] if component['Owner'] is not None and component['Owner'] != 'None' else None |
| 1279 | 1279 |
|
| ... | ... | |
| 1289 | 1289 |
item = SymbolSvgItem.createItem(_type, svgFilePath, uid, owner=owner, flip=flipLabel) |
| 1290 | 1290 |
item.setVisible(False) |
| 1291 | 1291 |
|
| 1292 |
# if additional symbol was changed, change symbol info |
|
| 1293 |
symbolInfo = None |
|
| 1294 |
if dbUid is None: |
|
| 1295 |
symbolInfo = app_doc_data.getSymbolByQuery('name', name)
|
|
| 1296 |
else: |
|
| 1297 |
symbolInfo = app_doc_data.getSymbolByQuery('UID', dbUid)
|
|
| 1298 |
if symbolInfo: |
|
| 1299 |
childSymbol = symbolInfo.additionalSymbol |
|
| 1300 |
|
|
| 1301 | 1292 |
if item.buildItem(name, _type, angle, pt, size, origin, connPts, baseSymbol, childSymbol, hasInstrumentLabel, dbUid=dbUid): |
| 1302 | 1293 |
pass |
| 1303 | 1294 |
else: |
내보내기 Unified diff
