개정판 be6cf6c6
dev issue #482: connected item 유지하면서 merge
| DTI_PID/DTI_PID/Shapes/EngineeringRunItem.py | ||
|---|---|---|
| 143 | 143 |
for list in itemLists: |
| 144 | 144 |
startPoint = [] |
| 145 | 145 |
endPoint = [] |
| 146 |
connectedItem1 = None |
|
| 147 |
connectedItem2 = None |
|
| 148 | 146 |
# direction의 0 = 낮은 값 -> 높은 값 (좌표 값 기준) |
| 149 | 147 |
direction = 0 |
| 150 | 148 |
for line in list[0]: |
| ... | ... | |
| 217 | 215 |
for line in list[0]: |
| 218 | 216 |
if type(line) is QEngineeringLineItem: |
| 219 | 217 |
if startPoint[0] == line.startPoint()[0] and startPoint[1] == line.startPoint()[1]: |
| 220 |
allLine.connectors[0].connectedItem = line.connectors[0].connectedItem |
|
| 218 |
if line.connectors[0].connectedItem is None: |
|
| 219 |
allLine.connectors[0].connectedItem = None |
|
| 220 |
elif issubclass(type(line.connectors[0].connectedItem), SymbolSvgItem): |
|
| 221 |
allLine.connectors[0].connectedItem = line.connectors[0].connectedItem |
|
| 222 |
|
|
| 221 | 223 |
elif startPoint[0] == line.endPoint()[0] and startPoint[1] == line.endPoint()[1]: |
| 222 |
allLine.connectors[0].connectedItem = line.connectors[1].connectedItem |
|
| 224 |
if line.connectors[1].connectedItem is None: |
|
| 225 |
allLine.connectors[0].connectedItem = None |
|
| 226 |
elif issubclass(type(line.connectors[1].connectedItem), SymbolSvgItem): |
|
| 227 |
allLine.connectors[0].connectedItem = line.connectors[1].connectedItem |
|
| 228 |
|
|
| 223 | 229 |
elif endPoint[0] == line.startPoint()[0] and endPoint[1] == line.startPoint()[1]: |
| 224 |
allLine.connectors[1].connectedItem = line.connectors[0].connectedItem |
|
| 225 |
elif endPoint[0] == line.endPoint()[0] and endPoint[1] == line.endPoint()[1]: |
|
| 226 |
allLine.connectors[1].connectedItem = line.connectors[1].connectedItem |
|
| 230 |
if line.connectors[0].connectedItem is None: |
|
| 231 |
allLine.connectors[1].connectedItem = None |
|
| 232 |
elif issubclass(type(line.connectors[0].connectedItem), SymbolSvgItem): |
|
| 233 |
allLine.connectors[1].connectedItem = line.connectors[0].connectedItem |
|
| 227 | 234 |
|
| 235 |
elif endPoint[0] == line.endPoint()[0] and endPoint[1] == line.endPoint()[1]: |
|
| 236 |
if line.connectors[1].connectedItem is None: |
|
| 237 |
allLine.connectors[1].connectedItem = None |
|
| 238 |
elif issubclass(type(line.connectors[1].connectedItem), SymbolSvgItem): |
|
| 239 |
allLine.connectors[1].connectedItem = line.connectors[1].connectedItem |
|
| 240 |
allLine.uid = '-' |
|
| 228 | 241 |
mergedLines.append(allLine) |
| 229 | 242 |
|
| 230 | 243 |
node = Element('RUN')
|
내보내기 Unified diff
