개정판 0b2e4877
issue #486: line save on going
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 106 | 106 |
self.symbols = [] |
| 107 | 107 |
self.unknowns = [] |
| 108 | 108 |
self.allItems = [] |
| 109 |
self.tracerLineNos = [] |
|
| 109 | 110 |
self._colors = None |
| 110 | 111 |
self._lineNoProperties = None |
| 111 | 112 |
self._lineTypes = None |
| ... | ... | |
| 116 | 117 |
self.needReOpening = None |
| 117 | 118 |
|
| 118 | 119 |
|
| 119 |
def clearItemList(self): |
|
| 120 |
def clearItemList(self, trim):
|
|
| 120 | 121 |
''' |
| 121 | 122 |
@brief clear item list |
| 122 | 123 |
@author euisung |
| ... | ... | |
| 129 | 130 |
self.lines.clear() |
| 130 | 131 |
self.unknowns.clear() |
| 131 | 132 |
self.allItems.clear() |
| 133 |
if trim: |
|
| 134 |
self.tracerLineNos.clear() |
|
| 132 | 135 |
|
| 133 | 136 |
''' |
| 134 | 137 |
@brief clear |
| ... | ... | |
| 149 | 152 |
self.texts.clear() |
| 150 | 153 |
self.symbols.clear() |
| 151 | 154 |
self.unknowns.clear() |
| 155 |
self.allItems.clear() |
|
| 156 |
self.tracerLineNos.clear() |
|
| 152 | 157 |
self._colors = None |
| 153 | 158 |
self._lineNoProperties = None |
| 154 | 159 |
self._lineTypes = None |
| DTI_PID/DTI_PID/Commands/SelectAttributeCommand.py | ||
|---|---|---|
| 78 | 78 |
self._item.conns.append(item) |
| 79 | 79 |
|
| 80 | 80 |
self.onSuccess.emit() |
| 81 |
elif item is not None and self._attr.AttributeType == 'Line Conn' and issubclass(type(item), QEngineeringLineItem): |
|
| 82 |
self._item.connectors[self._attr.ConnNum - 1].connectedItem = item |
|
| 83 |
|
|
| 84 |
self.onSuccess.emit() |
|
| 81 | 85 |
|
| 82 | 86 |
self.isTreated = True |
| 83 | 87 |
|
| DTI_PID/DTI_PID/ItemPropertyTableWidget.py | ||
|---|---|---|
| 621 | 621 |
elif keyCell.text() == 'CONN' and type(items[0]) is QEngineeringLineNoTextItem: |
| 622 | 622 |
from SymbolAttr import SymbolAttr |
| 623 | 623 |
attr = SymbolAttr() |
| 624 |
attr.AttributeType == "Line Item" |
|
| 624 |
attr.AttributeType = "Line Item" |
|
| 625 |
cmd = SelectAttributeCommand.SelectAttributeCommand(items[0], attr, self.mainWindow.graphicsView) |
|
| 626 |
cmd.onSuccess.connect(self.onSuccessSelectAttribute) |
|
| 627 |
self.mainWindow.graphicsView.command = cmd |
|
| 628 |
elif keyCell.text().find('CONN') is 0 and type(items[0]) is QEngineeringLineItem:
|
|
| 629 |
from SymbolAttr import SymbolAttr |
|
| 630 |
attr = SymbolAttr() |
|
| 631 |
attr.AttributeType = "Line Conn" |
|
| 632 |
attr.ConnNum = int(keyCell.text().replace('CONN', ''))
|
|
| 625 | 633 |
cmd = SelectAttributeCommand.SelectAttributeCommand(items[0], attr, self.mainWindow.graphicsView) |
| 626 | 634 |
cmd.onSuccess.connect(self.onSuccessSelectAttribute) |
| 627 | 635 |
self.mainWindow.graphicsView.command = cmd |
| 628 | 636 |
#elif Qt.ItemIsEnabled is not self.item(row, column).flags(): |
| 629 | 637 |
# self.editItem(self.item(row, column)) |
| 638 |
|
|
| 630 | 639 |
|
| 631 | 640 |
''' |
| 632 | 641 |
@brief success select attribute |
| DTI_PID/DTI_PID/LineNoTracer.py | ||
|---|---|---|
| 122 | 122 |
delimiter = configs[0].value |
| 123 | 123 |
configs = docData.getConfigs('Line No', 'Configuration')
|
| 124 | 124 |
|
| 125 |
docData.lineNos.clear()
|
|
| 125 |
docData.tracerLineNos.clear()
|
|
| 126 | 126 |
|
| 127 | 127 |
## 기존에 찾은 것 유지 |
| 128 | 128 |
#for lineNo in self._lineNos: |
| 129 | 129 |
# lineNo.conns.clear() |
| 130 | 130 |
|
| 131 |
docData.lineNos = self._lineNos
|
|
| 132 |
for lineno in docData.lineNos:
|
|
| 131 |
docData.tracerLineNos = self._lineNos
|
|
| 132 |
for lineno in docData.tracerLineNos:
|
|
| 133 | 133 |
## CONN은 유지 |
| 134 | 134 |
if lineno.conns: |
| 135 | 135 |
continue |
| ... | ... | |
| 145 | 145 |
lineno.conns.append(startLine) |
| 146 | 146 |
|
| 147 | 147 |
# set start line's owner |
| 148 |
for lineno in docData.lineNos:
|
|
| 148 |
for lineno in docData.tracerLineNos:
|
|
| 149 | 149 |
if lineno.conns: |
| 150 | 150 |
lineno.conns[0].owner = lineno |
| 151 | 151 |
lineno.conns[0].linkedItem = lineno |
| ... | ... | |
| 153 | 153 |
maxValue = len(self._lineNos) + 1 ## line no's count + secondary line |
| 154 | 154 |
|
| 155 | 155 |
# find primary lines |
| 156 |
for lineno in docData.lineNos:
|
|
| 156 |
for lineno in docData.tracerLineNos:
|
|
| 157 | 157 |
displayMessage.emit('{} 토폴로지 구성'.format(lineno.text()))
|
| 158 | 158 |
self.findPrimaryLines(lineno) |
| 159 | 159 |
updateProgress.emit(maxValue) |
| ... | ... | |
| 188 | 188 |
orphanLines.remove(item) |
| 189 | 189 |
updateProgress.emit(maxValue) |
| 190 | 190 |
|
| 191 |
docData.lineNos.append(trimLineNo)
|
|
| 191 |
docData.tracerLineNos.append(trimLineNo)
|
|
| 192 | 192 |
|
| 193 | 193 |
updateProgress.emit(maxValue) |
| 194 | 194 |
except Exception as ex: |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 426 | 426 |
self.showImageSelectionMessageBox() |
| 427 | 427 |
return |
| 428 | 428 |
|
| 429 |
appDocData.clearItemList() |
|
| 429 |
appDocData.clearItemList(False)
|
|
| 430 | 430 |
|
| 431 | 431 |
items = self.graphicsView.scene.items() |
| 432 | 432 |
for item in items: |
| ... | ... | |
| 1292 | 1292 |
|
| 1293 | 1293 |
# construct line no item |
| 1294 | 1294 |
docData = AppDocData.instance() |
| 1295 |
for lineno in docData.lineNos:
|
|
| 1295 |
for lineno in docData.tracerLineNos:
|
|
| 1296 | 1296 |
item = self.resultTreeWidget.addTreeItem(self.resultTreeWidget.root, lineno) |
| 1297 | 1297 |
connectedItems = lineno.getConnectedItems() |
| 1298 | 1298 |
for connectedItem in connectedItems: |
| ... | ... | |
| 1872 | 1872 |
treeItem = self.resultTreeWidget.addTreeItem(self.resultTreeWidget.root, item) |
| 1873 | 1873 |
for connectedItem in lineRunItem.items: |
| 1874 | 1874 |
if issubclass(type(connectedItem), SymbolSvgItem): self.resultTreeWidget.addTreeItem(treeItem, connectedItem) |
| 1875 |
docData.lineNos.append(item)
|
|
| 1875 |
docData.tracerLineNos.append(item)
|
|
| 1876 | 1876 |
|
| 1877 | 1877 |
self.progress.setValue(self.progress.value() + 1) |
| 1878 | 1878 |
QApplication.processEvents() |
| ... | ... | |
| 1896 | 1896 |
treeItem = self.resultTreeWidget.addTreeItem(self.resultTreeWidget.root, item) |
| 1897 | 1897 |
for connectedItem in lineRunItem.items: |
| 1898 | 1898 |
if issubclass(type(connectedItem), SymbolSvgItem): self.resultTreeWidget.addTreeItem(treeItem, connectedItem) |
| 1899 |
docData.lineNos.append(item)
|
|
| 1899 |
docData.tracerLineNos.append(item)
|
|
| 1900 | 1900 |
# up to here |
| 1901 | 1901 |
|
| 1902 | 1902 |
# set symbol's connectItem |
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 228 | 228 |
listWidget.addItem(item) |
| 229 | 229 |
continue |
| 230 | 230 |
|
| 231 |
appDocData.clearItemList() |
|
| 231 |
appDocData.clearItemList(True)
|
|
| 232 | 232 |
|
| 233 | 233 |
appDocData.setImgFilePath(mainRes) |
| 234 | 234 |
appDocData.imgSrc = None |
| DTI_PID/DTI_PID/XmlGenerator.py | ||
|---|---|---|
| 454 | 454 |
resultDic["Size Item"][0] += 1 |
| 455 | 455 |
sizeItemListNode.append(sizeNode) |
| 456 | 456 |
|
| 457 |
|
|
| 458 |
docData = AppDocData.instance() |
|
| 459 |
for line in docData.lineNos: |
|
| 457 |
for line in appDocData.tracerLineNos: |
|
| 460 | 458 |
if type(line) is QEngineeringTrimLineNoTextItem: |
| 461 | 459 |
trimNode = line.toXml() |
| 462 | 460 |
if type(trimNode) is str: |
내보내기 Unified diff
